mirror of
https://github.com/TerryCavanagh/VVVVVV.git
synced 2024-12-23 01:59:43 +01:00
Move temp/temp2 off of UtilityClass, remove globaltemp
There's no reason for the temp variables to be on the class itself.
This commit is contained in:
parent
6b23244366
commit
118008d824
2 changed files with 2 additions and 8 deletions
|
@ -91,9 +91,6 @@ glow(0),
|
|||
}
|
||||
|
||||
slowsine = 0;
|
||||
globaltemp = 0;
|
||||
temp = 0;
|
||||
temp2 = 0;
|
||||
}
|
||||
|
||||
std::string UtilityClass::String( int _v )
|
||||
|
@ -134,7 +131,7 @@ std::string UtilityClass::timestring( int t )
|
|||
{
|
||||
//given a time t in frames, return a time in seconds
|
||||
std::string tempstring = "";
|
||||
temp = (t - (t % 30)) / 30;
|
||||
int temp = (t - (t % 30)) / 30;
|
||||
if (temp < 60) //less than one minute
|
||||
{
|
||||
t = t % 30;
|
||||
|
@ -142,7 +139,7 @@ std::string UtilityClass::timestring( int t )
|
|||
}
|
||||
else
|
||||
{
|
||||
temp2 = (temp - (temp % 60)) / 60;
|
||||
int temp2 = (temp - (temp % 60)) / 60;
|
||||
temp = temp % 60;
|
||||
t = t % 30;
|
||||
tempstring = String(temp2) + ":" + twodigits(temp) + ":" + twodigits(splitseconds[t]);
|
||||
|
|
|
@ -51,9 +51,6 @@ public:
|
|||
int glow;
|
||||
int slowsine;
|
||||
int glowdir;
|
||||
int globaltemp;
|
||||
int temp;
|
||||
int temp2;
|
||||
std::vector<int> splitseconds;
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue