Skip to content

Commit 6f66e57

Browse files
committed
Fix swirling flats not swirling in automap in some instances
1 parent 5c248b5 commit 6f66e57

3 files changed

Lines changed: 6 additions & 6 deletions

File tree

src/d_main.c

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ int fadecount = 0;
175175
bool splashscreen = true;
176176

177177
bool realframe;
178+
bool updateswirl;
179+
178180
static bool error;
179181

180182
//
@@ -339,6 +341,9 @@ void D_Display(void)
339341
{
340342
HU_Erase();
341343

344+
updateswirl = (r_liquid_swirl && !(consoleactive || helpscreen || paused || (viewplayer->cheats & CF_FREEZE)));
345+
346+
342347
// draw the view directly
343348
R_RenderPlayerView();
344349

src/doomstat.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ extern gamestate_t gamestate;
242242
extern int gametime;
243243

244244
extern bool realframe;
245+
extern bool updateswirl;
245246

246247
// Intermission stats.
247248
// Parameters for world map/intermission.

src/r_plane.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ fixed_t yslopes[PITCHES][MAXHEIGHT];
8181

8282
static fixed_t cachedheight[MAXHEIGHT];
8383

84-
static bool updateswirl;
85-
8684
static angle_t *xtoskyangle;
8785

8886
//
@@ -487,10 +485,6 @@ static void DrawSkyTex(visplane_t *pl, skytex_t *skytex, void func(void))
487485
void R_DrawPlanes(void)
488486
{
489487
xtoskyangle = (r_linearskies ? linearskyangle : xtoviewangle);
490-
491-
if (r_liquid_swirl)
492-
updateswirl = !(consoleactive || helpscreen || paused || (viewplayer->cheats & CF_FREEZE));
493-
494488
dc_colormap[0] = (fixedcolormap && r_textures ? fixedcolormap : fullcolormap);
495489
dc_sectorcolormap = fullcolormap;
496490

0 commit comments

Comments
 (0)