commit cc6724c9

sago007 · 2012-04-16 21:11
cc6724c91f725c23a80f536f5ccabf5a3f6470e8 patch · browse files
parent ac4a926810dd07aa900918e342813e34cba7130e

Now includes Makefile.local. Also added CheckBoxMarked image and basic selecting for Puizzle levels


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

Changed files

A	Game/gfx/iLevelCheckBoxMarked.png
M	Makefile before
M	source/AUTH before
M	source/code/main.cpp before
M	source/code/mainVars.hpp before

diff --git a/Game/gfx/iLevelCheckBoxMarked.png b/Game/gfx/iLevelCheckBoxMarked.png new file mode 100755 index 0000000..afa580a

Binary files /dev/null and b/Game/gfx/iLevelCheckBoxMarked.png differ

diff --git a/Makefile b/Makefile index 165423c..dc67ba6 100644 --- a/Makefile +++ b/Makefile

@@ -3,6 +3,8 @@

#EXECUTEPATH=/usr/local/bin

#INST=/games/blockattack

+-include Makefile.local

standard:

@echo "Now compiling..."

export CC=gcc

diff --git a/source/AUTH b/source/AUTH index c719471..2b2032a 100644 --- a/source/AUTH +++ b/source/AUTH

@@ -51,6 +51,7 @@ iDraw.png Poul Sander

changeButtonsBack.png Poul Sander

iGameOver.png Poul Sander

iLevelCheckBox.png Poul Sander

+iLevelCheckBoxMarked.png Poul Sander

topscores.png Poul Sander

crossover.png Poul Sander

iLevelCheck.png Poul Sander

diff --git a/source/code/main.cpp b/source/code/main.cpp index 27bccf4..d3e9032 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

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

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

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

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

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

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

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

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

@@ -582,6 +583,7 @@ static int InitImages()

// CONVERTA(fileDialogBox);

CONVERTA(iLevelCheck);

CONVERT(iLevelCheckBox);

+ CONVERT(iLevelCheckBoxMarked);

CONVERTA(iCheckBoxArea);

for (int i = 0;i<4;i++)

{

@@ -754,6 +756,7 @@ void UnloadImages()

//SDL_FreeSurface(fileDialogBox);

SDL_FreeSurface(iLevelCheck);

SDL_FreeSurface(iLevelCheckBox);

+ SDL_FreeSurface(iLevelCheckBoxMarked);

SDL_FreeSurface(iCheckBoxArea);

SDL_FreeSurface(boardBackBack);

SDL_FreeSurface(changeButtonsBack);

@@ -2758,6 +2761,7 @@ int PuzzleLevelSelect()

int levelNr, mousex, mousey;

bool levelSelected = false;

bool tempBool;

+ int selected = 0;

//Loads the levels, if they havn't been loaded:

LoadPuzzleStages();

@@ -2795,6 +2799,7 @@ int PuzzleLevelSelect()

for (int i = 0; i < nrOfPuzzles;i++)

{

DrawIMG(iLevelCheckBox,screen,xplace+10+(i%10)*50, yplace+60+(i/10)*50);

+ if(i==selected) DrawIMG(iLevelCheckBoxMarked,screen,xplace+10+(i%10)*50, yplace+60+(i/10)*50);

if (puzzleCleared[i]==true) DrawIMG(iLevelCheck,screen,xplace+10+(i%10)*50, yplace+60+(i/10)*50);

}

@@ -2806,6 +2811,12 @@ int PuzzleLevelSelect()

levelNr = -1;

levelSelected = true;

}

+ if ( event.key.keysym.sym == SDLK_RIGHT ) {

+ ++selected;

+ if(selected >= nrOfPuzzles)

+ selected = 0;

+ cout << "Selected: "<< selected << endl;

+ }

}

keys = SDL_GetKeyState(NULL);

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

@@ -99,6 +99,7 @@ static SDL_Surface *bOff;

static SDL_Surface *b1024;

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

static SDL_Surface *iLevelCheckBox;

+static SDL_Surface *iLevelCheckBoxMarked;

static SDL_Surface *iCheckBoxArea;

static SDL_Surface *boardBackBack;

static SDL_Surface *garbageTL; //the Garbage Blocks