commit 2f0e6dd7

sago007 · 2012-05-19 19:54
2f0e6dd75c904d6eb39627e40c3af34feb3521ef patch · browse files
parent 610d0b15858d275dade76ba83502d69ad3857836

Also replaced the back button


git-svn-id: https://blockattack.svn.sourceforge.net/svnroot/blockattack/trunk@154 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 a3458a1..98fb977 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -422,7 +422,7 @@ static int InitImages()

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

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

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

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

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

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

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

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

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

#endif

//end new in 1.3.2

//new in 1.4.0

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

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

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

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

@@ -561,7 +560,6 @@ static int InitImages()

// CONVERTA(bReplay);

// CONVERTA(bSave);

// CONVERTA(bLoad);

- CONVERTA(bTheme);

CONVERTA(bSkip);

CONVERTA(bRetry);

CONVERTA(bNext);

@@ -677,7 +675,9 @@ static int InitImages()

nf_button_font.drawCenter(60,10,_("Next"));

nf_button_font.setDest(bSkip);

nf_button_font.drawCenter(60,10,_("Skip"));

- nf_button_font.setDest(screen);

+ nf_button_font.setDest(bBack);

+ nf_button_font.drawCenter(60,10,_("Back"));

+ nf_button_font.setDest(screen);

//Loads the sound if sound present

diff --git a/source/code/mainVars.hpp b/source/code/mainVars.hpp index 90525f3..1b61538 100644 --- a/source/code/mainVars.hpp +++ b/source/code/mainVars.hpp

@@ -138,7 +138,6 @@ static SDL_Surface *bSavePuzzle;

static SDL_Surface *bSaveToFile;

static SDL_Surface *bTestPuzzle;

#endif

-static SDL_Surface *bTheme;

static SDL_Surface *bSkip;

static SDL_Surface *bRetry;

static SDL_Surface *bNext;