Commit 184e64e7 authored by Richard Gobeille's avatar Richard Gobeille
Browse files

Duke3d: make MenuAnimation_t start member uint32_t, remove menu animation...

Duke3d: make MenuAnimation_t start member uint32_t, remove menu animation reset hacks from demo playback
parent 065284b2
...@@ -74,10 +74,6 @@ void Demo_PrepareWarp(void) ...@@ -74,10 +74,6 @@ void Demo_PrepareWarp(void)
static void Demo_SetAllClocks(int32_t clocktime) static void Demo_SetAllClocks(int32_t clocktime)
{ {
totalclock = ototalclock = lockclock = clocktime; totalclock = ototalclock = lockclock = clocktime;
// reset menu transition
m_animation.start = 0;
m_animation.length = 0;
} }
static int32_t G_OpenDemoRead(int32_t g_whichDemo) // 0 = mine static int32_t G_OpenDemoRead(int32_t g_whichDemo) // 0 = mine
...@@ -767,15 +763,8 @@ nextdemo_nomenu: ...@@ -767,15 +763,8 @@ nextdemo_nomenu:
} }
} }
else if (foundemo && g_demo_paused) else if (foundemo && g_demo_paused)
{
// problem: this locks menu animations as well, should probably be overhauled
totalclock = lockclock; totalclock = lockclock;
// bandaid fix for menu lockup
m_animation.start = 0;
m_animation.length = 0;
}
if (Demo_IsProfiling()) if (Demo_IsProfiling())
totalclock += TICSPERFRAME; totalclock += TICSPERFRAME;
......
...@@ -461,7 +461,7 @@ typedef struct MenuAnimation_t ...@@ -461,7 +461,7 @@ typedef struct MenuAnimation_t
Menu_t *previous; Menu_t *previous;
Menu_t *current; Menu_t *current;
int32_t start; uint32_t start;
int32_t length; int32_t length;
} MenuAnimation_t; } MenuAnimation_t;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment