zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-28 20:40:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Duke: Rename cloudtotalclock to cloudclock.

Browse source 
* Mostly so it doesn't come up on searches for `totalclock`.
This commit is contained in:
Mitchell Richters 2020-08-26 09:11:27 +10:00
parent d358c71f82
commit c207437a57
5 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/games/duke/src/global.cpp
View file

@ -110,7 +110,7 @@ int animatevel[MAXANIMATES];
int16_t clouds[256]; int16_t clouds[256];
int16_t cloudx; int16_t cloudx;
int16_t cloudy; int16_t cloudy;
ClockTicks cloudtotalclock; ClockTicks cloudclock;
int16_t spriteq[1024]; int16_t spriteq[1024];
int16_t cyclers[MAXCYCLERS][6]; int16_t cyclers[MAXCYCLERS][6];

2
source/games/duke/src/global.h
View file

@ -103,7 +103,7 @@ extern int animatevel[MAXANIMATES];
extern int16_t clouds[256]; extern int16_t clouds[256];
extern int16_t cloudx; extern int16_t cloudx;
extern int16_t cloudy; extern int16_t cloudy;
extern ClockTicks cloudtotalclock; extern ClockTicks cloudclock;
extern int16_t spriteq[1024]; extern int16_t spriteq[1024];
extern int16_t cyclers[MAXCYCLERS][6]; extern int16_t cyclers[MAXCYCLERS][6];

2
source/games/duke/src/premap.cpp
View file

@ -759,7 +759,7 @@ void resettimevars(void)
I_ResetTime(); I_ResetTime();
lastTic = -1; lastTic = -1;
gameclock = 0; gameclock = 0;
cloudtotalclock = 0; cloudclock = 0;
levelTextTime = 85; levelTextTime = 85;
lockclock = 0; lockclock = 0;
ready2send = 1; ready2send = 1;

2
source/games/duke/src/savegame.cpp
View file

@ -434,7 +434,7 @@ void GameInterface::SerializeGameState(FSerializer& arc)
("numclouds", numclouds) ("numclouds", numclouds)
("cloudx", cloudx) ("cloudx", cloudx)
("cloudy", cloudy) ("cloudy", cloudy)
("cloudtotalclock", cloudtotalclock) ("cloudclock", cloudclock)
.Array("clouds", clouds, numclouds) .Array("clouds", clouds, numclouds)
.Array("spriteq", spriteq, 1024) .Array("spriteq", spriteq, 1024)

4
source/games/duke/src/sectors.cpp
View file

@ -1142,9 +1142,9 @@ void allignwarpelevators(void)
void moveclouds(void) void moveclouds(void)
{ {
if (gameclock > cloudtotalclock || gameclock < (cloudtotalclock - 7)) if (gameclock > cloudclock || gameclock < (cloudclock - 7))
{ {
cloudtotalclock = gameclock + 6; cloudclock = gameclock + 6;
// cloudx/y were an array, but all entries were always having the same value so a single pair is enough. // cloudx/y were an array, but all entries were always having the same value so a single pair is enough.
cloudx += (sintable[(ps[screenpeek].getang() + 512) & 2047] >> 9); cloudx += (sintable[(ps[screenpeek].getang() + 512) & 2047] >> 9);