commit ac4a9268

sago007 · 2012-04-14 21:29
ac4a926810dd07aa900918e342813e34cba7130e patch · browse files
parent 605138b3a447cf5f8104ede46f67e0bbc8186a45

Fixed some problems with scons and made RETURN return to the new menu system


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

Changed files

M	source/code/SConscript before
M	source/code/main.cpp before

diff --git a/source/code/SConscript b/source/code/SConscript index 8ec1095..3819904 100644 --- a/source/code/SConscript +++ b/source/code/SConscript

@@ -6,20 +6,22 @@ Import('*')

# Sources #

src = Split("""main.cpp

highscore.cpp

-Libs/NFont.c

+Libs/NFont.cpp

ReadKeyboard.cpp

joypad.cpp

listFiles.cpp

replay.cpp

stats.cc

common.cc

-CppSdl/CppSdlImageHolder.cpp

-CppSdl/CppSdlException.cpp""")

+MenuSystem.cc

+menudef.cpp

+CppSdlImageHolder.cpp

+CppSdlException.cpp""")

# Modify Build Environment #

env.ParseConfig('sdl-config --cflags --libs')

env.Append(CPPDEFINES = [('SHAREDIR', '\\"$sharedir\\"')])

-env.Append(LIBS = ['SDL', 'enet','SDL_image','SDL_mixer','physfs'])

+env.Append(LIBS = ['SDL', 'enet','SDL_image','SDL_mixer','SDL_ttf','physfs'])

env.Append(LIBPATH = ['/usr/lib'])

# Compile Executable #

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

@@ -4018,7 +4018,7 @@ void runGame(int gametype) {

if ( event.type == SDL_KEYDOWN )

{

- if ( event.key.keysym.sym == SDLK_ESCAPE )

+ if ( event.key.keysym.sym == SDLK_ESCAPE || ( event.key.keysym.sym == SDLK_RETURN && theGame.isGameOver() ) )

{

if (showOptions)

{