commit 14e13624

sago007 · 2011-07-20 17:14
14e136243adc95893c49647bea5a4c0c25e5279c patch · browse files
parent 69d650b4c7a76d623f34f6a17bf7c4241110b93e

Removed more unused code


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@128 9d7177f8-192b-0410-8f35-a16a89829b06

Changed files

M	source/code/main.cpp before
M	source/code/mainVars.hpp before

diff --git a/source/code/main.cpp b/source/code/main.cpp index 8f6d5db..d7fd026 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -458,10 +458,10 @@ static int InitImages()

&& (iDraw = IMG_Load2((char*)"gfx/iDraw.png"))

&& (iLoser = IMG_Load2((char*)"gfx/iLoser.png"))

&& (iChainBack = IMG_Load2((char*)"gfx/chainFrame.png"))

- && (optionsBack = IMG_Load2((char*)"gfx/options.png"))

+// && (optionsBack = IMG_Load2((char*)"gfx/options.png"))

&& (bOn = IMG_Load2((char*)"gfx/bOn.png"))

&& (bOff = IMG_Load2((char*)"gfx/bOff.png"))

- && (bChange = IMG_Load2((char*)"gfx/bChange.png"))

+// && (bChange = IMG_Load2((char*)"gfx/bChange.png"))

&& (b1024 = IMG_Load2((char*)"gfx/b1024.png"))

&& (dialogBox = IMG_Load2((char*)"gfx/dialogbox.png"))

// && (fileDialogBox = IMG_Load2("gfx/fileDialogbox.png"))

@@ -566,11 +566,11 @@ static int InitImages()

CONVERTA(counter[0]);

CONVERTA(counter[1]);

CONVERTA(counter[2]);

- CONVERTA(optionsBack);

+// CONVERTA(optionsBack);

// CONVERT(bExit);

CONVERT(bOn);

CONVERT(bOff);

- CONVERT(bChange);

+// CONVERT(bChange);

CONVERT(b1024);

CONVERTA(dialogBox);

// CONVERTA(fileDialogBox);

@@ -739,10 +739,10 @@ void UnloadImages()

SDL_FreeSurface(iDraw);

SDL_FreeSurface(iLoser);

SDL_FreeSurface(iChainBack);

- SDL_FreeSurface(optionsBack);

+// SDL_FreeSurface(optionsBack);

SDL_FreeSurface(bOn);

SDL_FreeSurface(bOff);

- SDL_FreeSurface(bChange);

+// SDL_FreeSurface(bChange);

SDL_FreeSurface(b1024);

SDL_FreeSurface(dialogBox);

//SDL_FreeSurface(fileDialogBox);

@@ -1640,7 +1640,7 @@ static string getKeyName(SDLKey key)

void MakeBackground(int xsize,int ysize,BlockGame &theGame, BlockGame &theGame2);

-int OpenControlsBox(int x, int y, int player)

+/*int OpenControlsBox(int x, int y, int player)

{

int mousex, mousey;

Uint8 *keys;

@@ -1838,7 +1838,7 @@ int OpenControlsBox(int x, int y, int player)

} //while !done

DrawIMG(background, screen, 0, 0);

return 0;

+}**/

//Dialogbox

diff --git a/source/code/mainVars.hpp b/source/code/mainVars.hpp index 664ec32..68a7a91 100644 --- a/source/code/mainVars.hpp +++ b/source/code/mainVars.hpp

@@ -89,13 +89,13 @@ static SDL_Surface *crossover; //Cross the bricks that will be cleared soon

static SDL_Surface *balls[7]; //The balls (the small ones that jump around)

//static SDL_Surface *iBlueFont; //Contains the blue font used

//static SDL_Surface *iSmallFont; //Small font used for the chain text

-static SDL_Surface *optionsBack;

+//static SDL_Surface *optionsBack;

static SDL_Surface *changeButtonsBack;

static SDL_Surface *dialogBox;

//SDL_Surface *fileDialogBox; //Manual entering of filename, new in 1.1.1, obsolute in 1.1.2

static SDL_Surface *bOn;

static SDL_Surface *bOff;

-static SDL_Surface *bChange;

+//static SDL_Surface *bChange;

static SDL_Surface *b1024;

static SDL_Surface *iLevelCheck; //To the level select screen

static SDL_Surface *iLevelCheckBox;