commit 91886cae

sago007 · 2008-09-12 16:28
91886cae76524b1d92d3b5585a6d0a6a1e4c8049 patch · browse files
parent 1572de2b5981ae8579f83da4b91fe78e88cbc7c3

Some small changes


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

Changed files

M	source/code/BlockGame.hpp before
M	source/code/block.make before
M	source/code/main.cpp before
M	source/code/mainVars.hpp before

diff --git a/source/code/BlockGame.hpp b/source/code/BlockGame.hpp index e1714b9..5a8f208 100644 --- a/source/code/BlockGame.hpp +++ b/source/code/BlockGame.hpp

@@ -189,7 +189,7 @@ public:

AI_MoveSpeed=120-(20*(aiLevel-3));

};

-#ifdef NETWORK

+#if NETWORK

#define garbageStackSize 10

Uint8 garbageStack[garbageStackSize][3]; //A garbage stack with space for 10 garbage blocks. 0=x,1=y,2=type

int garbageStackUsed;

@@ -381,7 +381,7 @@ public:

bNetworkPlayer = false; //Take input from replay file

}

-#ifdef NETWORK

+#if NETWORK

//network play

void playNetwork(int tx, int ty) {

NewGame(tx, ty);

@@ -732,7 +732,7 @@ public:

//Creates garbage using a given wide and height

bool CreateGarbage(int wide, int height) {

-#ifdef NETWORK

+#if NETWORK

if (bNetworkPlayer) {

pushGarbage(wide, height, 0);

}

@@ -770,7 +770,7 @@ public:

//Creates garbage using a given wide and height

bool CreateGreyGarbage() {

-#ifdef NETWORK

+#if NETWORK

if (bNetworkPlayer) {

pushGarbage(6, 1, 1);

}

diff --git a/source/code/block.make b/source/code/block.make index 8af73d9..ddcc331 100644 --- a/source/code/block.make +++ b/source/code/block.make

@@ -1,5 +1,6 @@

../../Game/blockattack: main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o uploadReplay.o

g++ -O -o ../../Game/blockattack main.o highscore.o SFont.o ReadKeyboard.o joypad.o listFiles.o replay.o common.o stats.o `sdl-config --cflags --libs` -lSDL_image -lSDL_mixer -lenet

+#-lphysfs

main.o: main.cpp BlockGame.hpp mainVars.hpp common.h

g++ -g -c main.cpp `sdl-config --cflags`

diff --git a/source/code/main.cpp b/source/code/main.cpp index 0d2f785..d1bbccd 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

http://blockattack.sf.net

-#include <string>

#ifndef VERSION_NUMBER

#define NETWORK 1

#endif

+#ifndef USE_ABSTRACT_FS

+ #define USE_ABSTRACT_FS 0

+#endif

//Build-in level editor is still experimental!

#ifndef LEVELEDITOR

#define LEVELEDITOR 0

#include "SDL.h" //The SDL libary, used for most things

#include <SDL_mixer.h> //Used for sound & music

#include <SDL_image.h> //To load PNG images!

+#if USE_ABSTRACT_FS

+ #include <physfs.h> //Abstract file system. To use containers

+#endif

#include "ttfont.h" //To use True Type Fonts in SDL

//#include "config.h"

#include <vector>

@@ -489,7 +496,6 @@ int InitImages()

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

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

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

- //&& (iBlueFont = IMG_Load2("gfx/24P_Copperplate_Blue.png"))

&& (iBlueFont = IMG_Load2((char*)"gfx/24P_Arial_Blue.png"))

&& (iSmallFont = IMG_Load2((char*)"gfx/14P_Arial_Angle_Red.png"))

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

@@ -826,12 +832,8 @@ int LoadPuzzleStages()

if (singlePuzzle)

filename0 = singlePuzzleFile;

#endif //__unix__

-#ifdef SHAREDIR

string filename = (string)SHAREDIR+(string)"/res/";

filename = filename+puzzleName;

-#else

- string filename = "res/"+puzzleName;

-#endif

#ifdef __unix__

ifstream inFile(filename0.c_str());

if (!inFile)

@@ -1143,14 +1145,12 @@ public:

//constructor:

textMessage(int X, int Y,const char* Text,unsigned int Time)

{

- //cout << "Running constructor" << endl;

placeTime = currentTime;

x = X;

y = Y;

strncpy(textt,Text,10);

textt[9]=0;

time = Time;

- //cout << "Constructor runned" << endl;

} //constructor

//true if the text has expired

@@ -1161,19 +1161,16 @@ public:

int getX()

{

- //cout << "Gets X" << endl;

return x;

}

int getY()

{

- //cout << "Gets Y" << endl;

return y;

}

char* getText()

{

- //cout << "Gets text" << endl;

return textt;

}

}; //text popup

@@ -1206,11 +1203,8 @@ public:

return -1;

//cout << "adding to: " << textNumber << ":" << textUsed[textNumber] << ":" << &textArray[textNumber] << endl;

currentTime = SDL_GetTicks();

- //if(&textArray[textNumber]!=NULL)

- //*textArray[textNumber]=0;

textArray[textNumber] = textMessage(x,y,Text.c_str(),Time);

textUsed[textNumber] = true;

- //cout << "Text added" << endl;

return 1;

} //addText

@@ -1259,9 +1253,12 @@ void writeScreenShot()

#if defined(__unix__)

char buf[514];

sprintf( buf, "%s/.gamesaves/blockattack/screenshots/screenshot%i.bmp", getenv("HOME"), rightNow );

-#else

+#elif defined(__win32__)

char buf[MAX_PATH];

sprintf( buf, "%s\\My Games\\blockattack\\screenshots\\screenshot%i.bmp", (getMyDocumentsPath()).c_str(), rightNow );

+#else

+ char buf[MAX_PATH];

+ sprintf( buf, "screenshot%i.bmp", rightNow );

#endif

SDL_SaveBMP( screen, buf );

if (!NoSound)

@@ -1278,10 +1275,22 @@ inline void DrawHighscores(int x, int y)

{

char playerScore[32];

char playerName[32];

- if (showEndless) sprintf(playerScore, "%i", theTopScoresEndless.getScoreNumber(i));

- else sprintf(playerScore, "%i", theTopScoresTimeTrial.getScoreNumber(i));

- if (showEndless) strcpy(playerName,theTopScoresEndless.getScoreName(i));

- else strcpy(playerName,theTopScoresTimeTrial.getScoreName(i));

+ if (showEndless)

+ {

+ sprintf(playerScore, "%i", theTopScoresEndless.getScoreNumber(i));

+ }

+ else

+ {

+ sprintf(playerScore, "%i", theTopScoresTimeTrial.getScoreNumber(i));

+ }

+ if (showEndless)

+ {

+ strcpy(playerName,theTopScoresEndless.getScoreName(i));

+ }

+ else

+ {

+ strcpy(playerName,theTopScoresTimeTrial.getScoreName(i));

+ }

SFont_Write(screen,fBlueFont,x+420,y+150+i*35,playerScore);

SFont_Write(screen,fBlueFont,x+60,y+150+i*35,playerName);

}

@@ -1818,7 +1827,6 @@ bool OpenDialogbox(int x, int y, char *name)

DrawIMG(dialogBox,screen,x,y);

SFont_Write(screen,fBlueFont,x+40,y+72,rk.GetString());

strHolder = rk.GetString();

- //cout << "hej\n" << (int)rk.CharsBeforeCursor() << endl;

strHolder.erase((int)rk.CharsBeforeCursor());

if (((SDL_GetTicks()/600)%2)==1)

@@ -1883,13 +1891,9 @@ bool OpenFileDialogbox(int x, int y, char *name)

bool done = false; //We are done!

int mousex, mousey;

ListFiles lf = ListFiles();

-#ifdef SHAREDIR

string folder = (string)SHAREDIR+(string)"/res";

cout << "Looking in " << folder << endl;

lf.setDirectory(folder.c_str());

-#else

- lf.setDirectory("./res");

-#endif

#ifdef __unix__

string homeFolder = (string)getenv("HOME")+(string)"/.gamesaves/blockattack/puzzles";

lf.setDirectory2(homeFolder.c_str());

@@ -1983,13 +1987,9 @@ bool SelectThemeDialogbox(int x, int y, char *name)

bool done = false; //We are done!

int mousex, mousey;

ListFiles lf = ListFiles();

-#ifdef SHAREDIR

string folder = (string)SHAREDIR+(string)"/themes";

cout << "Looking in " << folder << endl;

lf.setDirectory(folder.c_str());

-#else

- lf.setDirectory("./themes");

-#endif

#ifdef __unix__

string homeFolder = (string)getenv("HOME")+(string)"/.gamesaves/blockattack/themes";

lf.setDirectory2(homeFolder.c_str());

@@ -3195,6 +3195,13 @@ int main(int argc, char *argv[])

Uint8 *keys;

+#if USE_ABSTRACT_FS

+ //Init the file system abstraction layer

+ PHYSFS_init(argv[0]);

+ PHYSFS_AddToSearchPath("blockattack.data", 1);

+#endif

//Init SDL

if ( SDL_Init(SDL_INIT_VIDEO) < 0 )

{

@@ -3228,7 +3235,7 @@ int main(int argc, char *argv[])

//SDL_FreeSurface(icon);

//Copyright notice:

"A SDL based game (see www.libsdl.org)" << endl <<

"The game is availeble under the GPL, see COPYING for details." << endl;

#if defined(_WIN32)

@@ -4587,6 +4594,9 @@ int main(int argc, char *argv[])

ct = addTotalTime(ct);

cout << "Total run time is now: " << ct.days << " days " << ct.hours << " hours " << ct.minutes << " mins and " << ct.seconds << " secs" << endl;

+#if USE_ABSTRACT_FS

+ //Close file system Apstraction layer!

+ PHYSFS_deinit();

+#endif

return 0;

}

diff --git a/source/code/mainVars.hpp b/source/code/mainVars.hpp index 2db879b..03fbc19 100644 --- a/source/code/mainVars.hpp +++ b/source/code/mainVars.hpp

using namespace std; //remove it if you dare...

-#ifdef SHAREDIR

char sharedir[] = SHAREDIR;

-#endif

//All graphic in the game (as pointers):

SDL_Surface *background; //Stores background