diff --git a/code/explosions.cpp b/code/explosions.cpp index f748eff..92fde1a 100644 --- a/code/explosions.cpp +++ b/code/explosions.cpp @@ -112,7 +112,7 @@ void doExplosions() { prevExplosion->next = explosion->next; delete explosion; - explosion = prevExplosion; + explosion = prevExplosion; } } } diff --git a/code/globals.cpp b/code/globals.cpp index 1b41a06..2edf8c1 100644 --- a/code/globals.cpp +++ b/code/globals.cpp @@ -28,12 +28,12 @@ void defineGlobals() engine.musicVolume = 100; engine.useAudio = true; - engine.maxAliens = 9; + engine.maxAliens = 9; - engine.ssx = 0; + engine.ssx = 0; engine.ssy = 0; - engine.bulletHead = new object; + engine.bulletHead = new object; engine.bulletHead->next = NULL; engine.bulletTail = engine.bulletHead; @@ -51,10 +51,10 @@ void defineGlobals() engine.commsSection = 0; - for (int i = 0 ; i < 350 ; i++) - engine.keyState[i] = 0; + for (int i = 0 ; i < 350 ; i++) + engine.keyState[i] = 0; - engine.eventTimer = 0; + engine.eventTimer = 0; engine.counter2 = 0; engine.timeTaken = 0; engine.timeMission = 0; @@ -72,7 +72,7 @@ void defineGlobals() engine.cheatAmmo = false; engine.cheatCash = false; - // All Development Stuff... + // All Development Stuff... dev.moveAliens = 1; dev.fireAliens = 1; } diff --git a/code/graphics.cpp b/code/graphics.cpp index 450f977..8260b00 100644 --- a/code/graphics.cpp +++ b/code/graphics.cpp @@ -666,29 +666,29 @@ void freeGraphics() SDL_Surface *loadImage(const char *filename) { - SDL_Surface *image, *newImage; + SDL_Surface *image, *newImage; - #if USEPACK - unpack(filename, PAK_IMG); - image = IMG_Load_RW(engine.sdlrw, 1); - #else - image = IMG_Load(filename); - #endif + #if USEPACK + unpack(filename, PAK_IMG); + image = IMG_Load_RW(engine.sdlrw, 1); + #else + image = IMG_Load(filename); + #endif - if (image == NULL) { - printf("Couldn't load %s: %s\n", filename, SDL_GetError()); - showErrorAndExit(0, filename); - } + if (image == NULL) { + printf("Couldn't load %s: %s\n", filename, SDL_GetError()); + showErrorAndExit(0, filename); + } - newImage = SDL_DisplayFormat(image); - if ( newImage ) { - SDL_FreeSurface(image); - } else { - // This happens when we are loading the window icon image - newImage = image; - } + newImage = SDL_DisplayFormat(image); + if ( newImage ) { + SDL_FreeSurface(image); + } else { + // This happens when we are loading the window icon image + newImage = image; + } - return setTransparent(newImage); + return setTransparent(newImage); } /* @@ -702,9 +702,7 @@ void doStarfield() if (SDL_MUSTLOCK(screen)) { if (SDL_LockSurface(screen) < 0 ) - { showErrorAndExit(2, ""); - } } int color = 0; diff --git a/code/missions.cpp b/code/missions.cpp index 3440896..6b92779 100644 --- a/code/missions.cpp +++ b/code/missions.cpp @@ -1038,7 +1038,7 @@ void initMissions() int NORMAL = 15 * 60; int FREQUENT = 5 * 60; int ALWAYS = 1 * 60; - int NEVER = -1; + int NEVER = -1; // Mission 0 sprintf(missions[0].primaryObjective[0], "Escape from WEAPCO Persuit"); diff --git a/code/resources.cpp b/code/resources.cpp index e964871..63578ac 100644 --- a/code/resources.cpp +++ b/code/resources.cpp @@ -236,7 +236,7 @@ void loadFont() newImage = SDL_DisplayFormat(image); - fontShape[i] = setTransparent(newImage); + fontShape[i] = setTransparent(newImage); SDL_FreeSurface(image); }