Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Kill yet another sequence of magic numbers to replace them with the constant MAX_STARS 

Modified patch by Buginator
 * Make function initStars be static


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2899 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-11-28 21:02:20 +00:00
parent b54b19c0cd
commit f9ae505dec
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wrappers.c
View File

@ -70,7 +70,8 @@ typedef struct _star
SDWORD speed; SDWORD speed;
} STAR; } STAR;
static STAR stars[30]; // quick hack for loading stuff #define MAX_STARS 20
static STAR stars[MAX_STARS]; // quick hack for loading stuff
static BOOL firstcall = FALSE; static BOOL firstcall = FALSE;
static UDWORD loadScreenCallNo=0; static UDWORD loadScreenCallNo=0;
@ -85,10 +86,11 @@ static UDWORD lastTick = 0;
static UDWORD lastChange = 0; static UDWORD lastChange = 0;
void initStars( void ) static void initStars(void)
{ {
UDWORD i; unsigned int i;
for(i=0; i<20; i++)
for(i = 0; i < MAX_STARS; ++i)
{ {
stars[i].xPos = (UWORD)(rand()%598); // scatter them stars[i].xPos = (UWORD)(rand()%598); // scatter them
stars[i].speed = rand()%10+2; // always move stars[i].speed = rand()%10+2; // always move
@ -257,7 +259,7 @@ TITLECODE titleLoop(void)
//loadbar update //loadbar update
void loadingScreenCallback(void) void loadingScreenCallback(void)
{ {
UDWORD i; unsigned int i;
UDWORD topX,topY,botX,botY; UDWORD topX,topY,botX,botY;
UDWORD currTick; UDWORD currTick;
PIELIGHT colour; PIELIGHT colour;
@ -286,7 +288,7 @@ void loadingScreenCallback(void)
colour.byte.a = 24; colour.byte.a = 24;
pie_UniTransBoxFill(topX, topY, botX, botY, colour); pie_UniTransBoxFill(topX, topY, botX, botY, colour);
for(i=1; i<19; i++) for(i = 1; i < MAX_STARS; ++i)
{ {
if(stars[i].xPos + stars[i].speed >=598) if(stars[i].xPos + stars[i].speed >=598)
{ {
@ -296,12 +298,12 @@ void loadingScreenCallback(void)
{ {
stars[i].xPos = (UWORD)(stars[i].xPos + stars[i].speed); stars[i].xPos = (UWORD)(stars[i].xPos + stars[i].speed);
} }
colour.byte.r = 0;
colour.byte.g = 255; colour.byte.r = 200;
colour.byte.b = 255; colour.byte.g = 200;
colour.byte.b = 200;
colour.byte.a = 255; colour.byte.a = 255;
pie_UniTransBoxFill(10 + stars[i].xPos+D_W, 450 + i + D_H, 10 + stars[i].xPos + (2 * stars[i].speed) + D_W, 450 + i + 2 + D_H, colour); pie_UniTransBoxFill(10 + stars[i].xPos+D_W, 450 + i + D_H, 10 + stars[i].xPos + (2 * stars[i].speed) + D_W, 450 + i + 2 + D_H, colour);
} }
pie_ScreenFlip(CLEAR_OFF_AND_NO_BUFFER_DOWNLOAD);//loading callback // dont clear. pie_ScreenFlip(CLEAR_OFF_AND_NO_BUFFER_DOWNLOAD);//loading callback // dont clear.