dsda: condense the 2 hooks

Author: vadosnaprimer

src/BizHawk.Client.Common/lua/INamedLuaFunction.cs

@@ -13,13 +13,10 @@ public interface INamedLuaFunction
 		MemoryCallbackDelegate MemCallback { get; }
 
 		/// <summary>for <c>doom.on_prandom</c>; single param: caller of RNG, per categories <see href="https://github.com/TASEmulators/dsda-doom/blob/7f03360ce0e9000c394fb99869d78adf4603ade5/prboom2/src/m_random.h#L63-L133">in source</see></summary>
-		Action<int> RandomCallback { get; }
-
-		/// <summary>for <c>doom.on_use</c>; two params: pointers to activated line and to mobj that triggered it</summary>
-		Action<long, long> UseCallback { get; }
-
-		/// <summary>for <c>doom.on_cross</c>; two params: pointers to activated line and to mobj that</summary>
-		Action<long, long> CrossCallback { get; }
+		Action<int> RandomCallback { get; }
+
+		/// <summary>for <c>doom.on_use and doom.on_cross</c>; two params: pointers to activated line and to mobj that triggered it</summary>
+		Action<long, long> LineCallback { get; }
 
 		string Name { get; }
 

src/BizHawk.Client.Common/lua/LuaHelperLibs/DoomLuaLibrary.cs

@@ -69,8 +69,8 @@ public string OnUse(LuaFunction luaf, string name = null)
 
 			var callbacks = dsda.UseCallbacks;
 			var nlf = CreateAndRegisterNamedFunction(luaf, "OnUse", LogOutputCallback, CurrentFile, name: name);
-			callbacks.Add(nlf.UseCallback);
-			nlf.OnRemove += () => callbacks.Remove(nlf.UseCallback);
+			callbacks.Add(nlf.LineCallback);
+			nlf.OnRemove += () => callbacks.Remove(nlf.LineCallback);
 			return nlf.GuidStr;
 		}
 
@@ -94,8 +94,8 @@ public string OnCross(LuaFunction luaf, string name = null)
 
 			var callbacks = dsda.CrossCallbacks;
 			var nlf = CreateAndRegisterNamedFunction(luaf, "OnCross", LogOutputCallback, CurrentFile, name: name);
-			callbacks.Add(nlf.CrossCallback);
-			nlf.OnRemove += () => callbacks.Remove(nlf.CrossCallback);
+			callbacks.Add(nlf.LineCallback);
+			nlf.OnRemove += () => callbacks.Remove(nlf.LineCallback);
 			return nlf.GuidStr;
 		}
 	}

src/BizHawk.Client.Common/lua/NamedLuaFunction.cs

@@ -105,19 +105,7 @@ public NamedLuaFunction(LuaFunction function, string theEvent, Action<string> lo
 					luaLibraries.IsInInputOrMemoryCallback = false;
 				}
 			};
-			UseCallback = (line, thing) =>
-			{
-				luaLibraries.IsInInputOrMemoryCallback = true;
-				try
-				{
-					Callback([ line, thing ]);
-				}
-				finally
-				{
-					luaLibraries.IsInInputOrMemoryCallback = false;
-				}
-			};
-			CrossCallback = (line, thing) =>
+			LineCallback = (line, thing) =>
 			{
 				luaLibraries.IsInInputOrMemoryCallback = true;
 				try
@@ -163,9 +151,7 @@ public string GuidStr
 
 		public Action<int> RandomCallback { get; }
 
-		public Action<long, long> UseCallback { get; }
-
-		public Action<long, long> CrossCallback { get; }
+		public Action<long, long> LineCallback { get; }
 
 		public void Call(string name = null)
 		{

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs

@@ -398,8 +398,8 @@ private static bool PlayerPresent(DoomSyncSettings syncSettings, int port) =>
 		private List<IRomAsset> _pwadFiles;
 		private LibDSDA.GameMode _gameMode;
 		private LibDSDA.random_cb _randomCallback;
-		private LibDSDA.use_cb _useCallback;
-		private LibDSDA.cross_cb _crossCallback;
+		private LibDSDA.line_cb _useCallback;
+		private LibDSDA.line_cb _crossCallback;
 		private LibDSDA.error_cb _errorCallback;
 
 		public List<Action<int>> RandomCallbacks = [ ];

src/BizHawk.Emulation.Cores/Computers/Doom/LibDSDA.cs

@@ -154,14 +154,11 @@ public abstract bool dsda_frame_advance(
 		public abstract void dsda_set_random_callback(random_cb cb);
 
 		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void use_cb(long line, long thing);
+		public delegate void line_cb(long line, long thing);
 		[BizImport(CallingConvention.Cdecl)]
-		public abstract void dsda_set_use_callback(use_cb cb);
-
-		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
-		public delegate void cross_cb(long line, long thing);
+		public abstract void dsda_set_use_callback(line_cb cb);
 		[BizImport(CallingConvention.Cdecl)]
-		public abstract void dsda_set_cross_callback(cross_cb cb);
+		public abstract void dsda_set_cross_callback(line_cb cb);
 
 		[UnmanagedFunctionPointer(CallingConvention.Cdecl)]
 		public delegate void error_cb(string error);