mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-06-18 10:38:31 +02:00
Code Issues Releases Wiki Activity

Move check/cmode temporary vars off of mapclass

Browse Source 
Yet another set of temporary variables is on a global class when they
shouldn't be. These two are only used in tower background functions and
are never used anywhere else, so they're clearly temporaries.
This commit is contained in:
Misa 2020-11-02 16:27:03 -08:00 committed by Ethan Lee
parent 8d8a5d8f57
commit d9e3e523b7
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
desktop_version/src/Map.cpp
View File

@ -89,8 +89,6 @@ mapclass::mapclass()
cameraseek = 0; cameraseek = 0;
minitowermode = false; minitowermode = false;
scrolldir = 0; scrolldir = 0;
check = 0;
cmode = 0;
tdrawback = false; tdrawback = false;
bscroll = 0; bscroll = 0;
roomtexton = false; roomtexton = false;
@ -590,8 +588,8 @@ void mapclass::updatetowerglow()
if (colsuperstate > 0) colstate--; if (colsuperstate > 0) colstate--;
colstate++; colstate++;
if (colstate >= 30) colstate = 0; if (colstate >= 30) colstate = 0;
check = colstate % 5; //current state of phase int check = colstate % 5; //current state of phase
cmode = (colstate - check) / 5; // current colour transition int cmode = (colstate - check) / 5; // current colour transition
switch(cmode) switch(cmode)
{ {
@ -637,8 +635,8 @@ void mapclass::nexttowercolour()
{ {
colstate+=5; colstate+=5;
if (colstate >= 30) colstate = 0; if (colstate >= 30) colstate = 0;
check = colstate % 5; //current state of phase int check = colstate % 5; //current state of phase
cmode = (colstate - check) / 5; // current colour transition int cmode = (colstate - check) / 5; // current colour transition
switch(cmode) switch(cmode)
{ {
@ -669,8 +667,8 @@ void mapclass::settowercolour(int t)
{ {
colstate=t*5; colstate=t*5;
if (colstate >= 30) colstate = 0; if (colstate >= 30) colstate = 0;
check = colstate % 5; //current state of phase int check = colstate % 5; //current state of phase
cmode = (colstate - check) / 5; // current colour transition int cmode = (colstate - check) / 5; // current colour transition
switch(cmode) switch(cmode)
{ {

1
desktop_version/src/Map.h
View File

@ -111,7 +111,6 @@ public:
//This is the old colour cycle //This is the old colour cycle
int r, g,b; int r, g,b;
int check, cmode;
int colstate, colstatedelay; int colstate, colstatedelay;
int colsuperstate; int colsuperstate;
int spikeleveltop, spikelevelbottom; int spikeleveltop, spikelevelbottom;