From 850206ef620d6a477986976899d573f80e5a752d Mon Sep 17 00:00:00 2001 From: helixhorned Date: Thu, 19 Feb 2015 22:19:05 +0000 Subject: [PATCH] Stick update of 'totalclocklock' at beginning of G_DrawRooms() instead of drawrooms(). This fixes engine-side sprite animation in the following scenario: CON code wants to draw a scene from EVENT_DISPLAYREST, but since it covers the whole screen, disables the drawing of the 3D scene beforehand (RETURN set to 1 from EVENT_DISPLAYROOMS). DONT_BUILD. git-svn-id: https://svn.eduke32.com/eduke32@5020 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/src/engine.c | 1 - polymer/eduke32/source/game.c | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/polymer/eduke32/build/src/engine.c b/polymer/eduke32/build/src/engine.c index 3e09d0d5c..411b64b16 100644 --- a/polymer/eduke32/build/src/engine.c +++ b/polymer/eduke32/build/src/engine.c @@ -9408,7 +9408,6 @@ int32_t drawrooms(int32_t daposx, int32_t daposy, int32_t daposz, globalcisibility = mulscale8(globalhisibility,320); globalcursectnum = dacursectnum; - totalclocklock = totalclock; if ((xyaspect != oxyaspect) || (xdimen != oxdimen) || (viewingrange != oviewingrange)) dosetaspect(); diff --git a/polymer/eduke32/source/game.c b/polymer/eduke32/source/game.c index 8a5b17c68..cdd212809 100644 --- a/polymer/eduke32/source/game.c +++ b/polymer/eduke32/source/game.c @@ -4434,6 +4434,8 @@ void G_DrawRooms(int32_t snum, int32_t smoothratio) if (g_networkMode == NET_DEDICATED_SERVER) return; + totalclocklock = totalclock; + if (pub > 0 || getrendermode() >= REND_POLYMOST) // JBF 20040101: redraw background always { #ifdef __ANDROID__