commit 43611709

sago007 · 2011-04-23 17:18
4361170909c0b95a5fff843b568eef8b501143bb patch · browse files
parent 467a485387ba7ce9ddcea437ccd5b3eb2981d783

bNewGame is now using an imageholder


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@113 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 770e9fd..2dd7b72 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -368,7 +368,6 @@ static int InitImages()

{

if (!((backgroundImage = IMG_Load2("gfx/background.png"))

&& (background = IMG_Load2("gfx/blackBackGround.png"))

- && (bNewGame = IMG_Load2("gfx/bNewGame.png"))

&& (b1player = IMG_Load2("gfx/bOnePlayer.png"))

&& (b2players = IMG_Load2("gfx/bTwoPlayers.png"))

&& (bVsMode = IMG_Load2("gfx/bVsGame.png"))

@@ -496,6 +495,7 @@ static int InitImages()

exit(1);

}

try{

+ bNewGame = IMG_Load3("gfx/bNewGame.png");

mouse = IMG_Load3("gfx/mouse.png");

} catch (exception e) {

cout << e.what() << endl;

@@ -505,7 +505,6 @@ static int InitImages()

//Prepare for fast blittering!

CONVERT(background);

- CONVERT(bNewGame);

CONVERT(backgroundImage);

CONVERT(b1player);

CONVERT(b2players);

@@ -591,6 +590,7 @@ static int InitImages()

CONVERTA(iGameOver);

// CONVERTA(mouse);

mouse.OptimizeForBlit(true);

+ bNewGame.OptimizeForBlit(true);

CONVERTA(stageBobble);

CONVERTA(transCover);

//Editor:

@@ -663,7 +663,7 @@ void UnloadImages()

//Chrashes no more. Caused by an undocumented double free

SDL_FreeSurface(backgroundImage);

SDL_FreeSurface(background);

- SDL_FreeSurface(bNewGame);

+ //SDL_FreeSurface(bNewGame);

SDL_FreeSurface(b1player);

SDL_FreeSurface(b2players);

SDL_FreeSurface(bVsMode);

@@ -746,7 +746,7 @@ void UnloadImages()

SDL_FreeSurface(transCover);

//SDL_FreeSurface(mouse);

mouse.MakeNull();

+ bNewGame.MakeNull();

}

//Function to convert numbers to string

@@ -2504,7 +2504,7 @@ void DrawEverything(int xsize, int ysize,BlockGameSdl *theGame, BlockGameSdl *th

#endif

{

//Here we draw the menu

- DrawIMG(bNewGame, screen, 0, 0);

+ bNewGame.PaintTo(screen,0,0);

DrawIMG(bOptions, screen, buttonXsize,0);

DrawIMG(bHighScore, screen, 2*buttonXsize,0);

DrawIMG(bReplay,screen,3*buttonXsize,0);

diff --git a/source/code/mainVars.hpp b/source/code/mainVars.hpp index 95addc7..25a1a11 100644 --- a/source/code/mainVars.hpp +++ b/source/code/mainVars.hpp

@@ -50,7 +50,7 @@ static SDL_Surface *bVsMode;

static SDL_Surface *bVsModeConfig; //Added in 1.4.0

static SDL_Surface *bStageClear;

static SDL_Surface *bPuzzle;

-static SDL_Surface *bNewGame; //The New Game botton

+static CppSdl::CppSdlImageHolder bNewGame; //The New Game botton

static SDL_Surface *bEndless; //Endless button (sub to new)

static SDL_Surface *bTimeTrial; //Time trial button (sub to new)

static SDL_Surface *bOptions; //The Options botton