maddog: Allow a simplified Lua tick() during laserdisc seeks.

This lets the crosshair remain responsive, lets gunflashes only last one frame
no matter what, and lets the user fire and reload during the lag time.

Other games should at least move coinslot input handling to a similar
function, even if that isn't as significant as the maddog changes.

Author: icculus

data/games/maddog/game.lua

@@ -441,6 +441,26 @@ local function draw_available_credits()
     end
 end
 
+local function draw_ui(inputs)
+    if (scene_manager ~= nil) and (scene_manager.current_sequence ~= nil) then
+        if scene_manager.current_sequence.overlay ~= nil then
+            scene_manager.current_sequence.overlay()
+        end
+        if not scene_manager.current_sequence.hud_disabled then
+            draw_hud()
+        end
+        if scene_manager.current_sequence.show_credits then
+            draw_available_credits()
+        end
+        if show_hitboxes then
+            draw_hitboxes()
+        end
+        if not scene_manager.current_sequence.crosshairs_disabled then
+            draw_crosshair(inputs)
+        end
+    end
+end
+
 local function setup_scene_manager()
     -- save off existing credits value, since we reinit when starting a game and would lose this.
     -- (this is part of the serialized state, though, so we need it to be in scene_manager and not a global).
@@ -564,14 +584,19 @@ local function crosshairs_in_area(area)
     return (x >= (area[1] / 360.0)) and (y >= (area[2] / 240.0)) and (x < (area[3] / 360.0)) and (y < (area[4] / 240.0))
 end
 
-local function check_actions(inputs)
+-- called during both tick and seek_tick.
+local function check_actions_always(inputs)
     -- we don't care about inserting coins, but we'll play the sound if you
     -- hit the coinslot button and keep track of "credits"
     if inputs.pressed["coinslot"] then
         scene_manager.credits = scene_manager.credits + 1
         DirkSimple.play_sound("arcadecoin")
     end
 
+    if (scene_manager == nil) or (scene_manager.current_sequence == nil) then
+        return
+    end
+
     if not scene_manager.current_sequence.crosshairs_disabled and not scene_manager.current_sequence.gunfire_disabled and not god_mode then
         --DirkSimple.log("x=" .. tostring(inputs.pointerx) .. " y=" .. tostring(inputs.pointery) .. " pressed=" .. tostring(inputs.pressed["action"] or false) .. " held=" .. tostring(inputs.held["action"] or false).. " released=" .. tostring(inputs.held["released"] or false))
         if inputs.pressed["action"] then
@@ -617,6 +642,10 @@ local function check_actions(inputs)
             end
         end
     end
+end
+
+local function check_actions(inputs)
+    check_actions_always(inputs)
 
     if accepted_input ~= nil then
         return true  -- ignore all input until end of sequence.
@@ -707,6 +736,7 @@ local function check_timeout()
     end
 end
 
+
 DirkSimple.serialize = function()
     if not scene_manager.initialized then
         setup_scene_manager()   -- just so we can serialize a default state.
@@ -787,6 +817,11 @@ DirkSimple.unserialize = function(state)
     return true
 end
 
+DirkSimple.seek_tick = function(ticks, inputs)
+    check_actions_always(inputs)
+    draw_ui(inputs)
+end
+
 DirkSimple.tick = function(ticks, sequenceticks, inputs)
     xscale = DirkSimple.video_width / 1440.0
     yscale = DirkSimple.video_height / 1080.0
@@ -825,27 +860,11 @@ DirkSimple.tick = function(ticks, sequenceticks, inputs)
         start_attract_mode()
     end
 
-    if scene_manager.current_sequence ~= nil then
-        if scene_manager.current_sequence.overlay ~= nil then
-            scene_manager.current_sequence.overlay()
-        end
-        if not scene_manager.current_sequence.hud_disabled then
-            draw_hud()
-        end
-        if scene_manager.current_sequence.show_credits then
-            draw_available_credits()
-        end
-        if show_hitboxes then
-            draw_hitboxes()
-        end
-        if not scene_manager.current_sequence.crosshairs_disabled then
-            draw_crosshair(inputs)
-        end
-    end
-
     check_actions(inputs)   -- check inputs before timeout, in case an input came through at the last possible moment, even if we're over time.
     check_timeout()
 
+    draw_ui(inputs)
+
     previous_sequence_ticks = scene_manager.current_sequence_ticks
 end
 

dirksimple.c

@@ -1687,6 +1687,33 @@ static void call_lua_tick(lua_State *L, uint64_t ticks, uint64_t clipstartticks,
     collect_lua_garbage(L);  // we can move this to start_clip if it turns out to be too heavy.
 }
 
+static void call_lua_seektick(lua_State *L, uint64_t ticks, uint64_t inputbits, float pointerx, float pointery, int *already_called)
+{
+    if (*already_called) {
+        return;
+    }
+
+    lua_getglobal(L, DIRKSIMPLE_LUA_NAMESPACE);
+    if (!lua_istable(L, -1)) {  // namespace is sane?
+        DirkSimple_panic("DirkSimple Lua namespace is not a table!");
+    }
+    lua_getfield(L, -1, "seek_tick");
+    if (!lua_isfunction(L, -1)) {
+        lua_pop(L, 2);  // pop the namespace and not-function object.
+    } else {
+        *already_called = 1;  // function actually exists, count it as the tick for this frame.
+
+        GNumRenderCommands = 0;  // clear rendering commands from previous frame, Lua code will replace them.
+        lua_pushnumber(L, (lua_Number) ticks);
+        push_inputs_table(L, inputbits, pointerx, pointery);
+        lua_call(L, 2, 0);  // this will pop the function and args
+        lua_pop(L, 1);  // pop the namespace
+
+        // Clean up any Lua tick waste.
+        collect_lua_garbage(L);  // we can move this to start_clip if it turns out to be too heavy.
+    }
+}
+
 static const char *pixfmtstr(const THEORAPLAY_VideoFormat pixfmt)
 {
     switch (pixfmt) {
@@ -1885,22 +1912,26 @@ static void DirkSimple_tick_impl(uint64_t monotonic_ms, uint64_t inputbits, floa
 
     if (GDiscLagUntilTicks) {
         if (GDiscLagUntilTicks > GTicks) {
+            call_lua_seektick(L, GTicks, inputbits, pointerx, pointery, &called_lua_tick);
             return;  // we're faking the stall while the laserdisc player seeks to a new position. Done for now.
         }
         GDiscLagUntilTicks = 0;
     }
 
-    // has seek completed? Sync us back up.
-    if (GPendingVideoFrame && (GClipStartTicks == 0)) {
-        GClipStartTicks = GTicks;
-        GSeekToTicksOffset = ((int64_t) GTicks) - ((int64_t) GClipStartMs);
-        if (GShowingSingleFrame) {
-            DirkSimple_discvideo(GPendingVideoFrame->pixels);
-            THEORAPLAY_freeVideo(GPendingVideoFrame);
-            GPendingVideoFrame = NULL;
+    if (!GClipStartTicks) {  // seek still pending?
+        if (!GPendingVideoFrame) {  // not ready yet, call Lua seek_tick.
+            call_lua_seektick(L, GTicks, inputbits, pointerx, pointery, &called_lua_tick);
+        } else {  // seek completed? Sync us back up.
+            GClipStartTicks = GTicks;
+            GSeekToTicksOffset = ((int64_t) GTicks) - ((int64_t) GClipStartMs);
+            if (GShowingSingleFrame) {
+                DirkSimple_discvideo(GPendingVideoFrame->pixels);
+                THEORAPLAY_freeVideo(GPendingVideoFrame);
+                GPendingVideoFrame = NULL;
+            }
+            // we didn't call the tick earlier in this function because we were still waiting; do it now that the seek is resolved.
+            call_lua_tick(L, GTicks, (GTicks - GClipStartTicks), inputbits, pointerx, pointery, &called_lua_tick);
         }
-        // we didn't call the tick earlier in this function because we were still waiting; do it now that the seek is resolved.
-        call_lua_tick(L, GTicks, (GTicks - GClipStartTicks), inputbits, pointerx, pointery, &called_lua_tick);
     }
 
     if (!GShowingSingleFrame) {