revert back to previous build, iterator i in loops must be ints since some comparisons are to negative numbers, and unsigned goes back to maxint, which breaks the screen (glenn, whats the warning you get?)

This commit is contained in:
Andrew Wong
2003-07-27 04:25:06 +00:00
parent a1fac17d55
commit 153bfd3758
+5 -5
View File
@@ -60,8 +60,8 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
CString IconCommand = ICON_COMMAND;
unsigned i;
for(i=1; i <= (unsigned) NUM_UNLOCKS; i++)
int i;
for(i=1; i <= NUM_UNLOCKS; i++)
{
Sprite* entry = new Sprite;
@@ -100,7 +100,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
// scrolling text
if (UNLOCK_TEXT_SCROLL != 0)
{
unsigned NumberUnlocks = NUM_UNLOCKS;
int NumberUnlocks = NUM_UNLOCKS;
float ScrollingTextX = UNLOCK_TEXT_SCROLL_X;
float ScrollingTextStartY = UNLOCK_TEXT_SCROLL_START_Y;
float ScrollingTextEndY = UNLOCK_TEXT_SCROLL_END_Y;
@@ -232,7 +232,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
if (UNLOCK_TEXT_SCROLL == 3)
{
unsigned NumberUnlocks = NUM_UNLOCKS;
int NumberUnlocks = NUM_UNLOCKS;
float ScrollingTextX = UNLOCK_TEXT_SCROLL_X;
float ScrollingTextStartY = UNLOCK_TEXT_SCROLL_START_Y;
float ScrollingTextEndY = UNLOCK_TEXT_SCROLL_END_Y;
@@ -248,7 +248,7 @@ ScreenUnlock::ScreenUnlock() : ScreenAttract("ScreenUnlock")
if (i > (int) LastUnlocks.size())
continue;
unsigned NextIcon = LastUnlocks[LastUnlocks.size() - i];
int NextIcon = LastUnlocks[LastUnlocks.size() - i];
Sprite* NewIcon = new Sprite;
BitmapText* NewText = new BitmapText;