commit f7c1a51d

Poul Sander · 2016-09-07 21:12
f7c1a51dd713ae888f36217bbcd587e68cbb59da patch · browse files
parent 7d43dc599d9bb5a9b77a527c9294cfa7a3c00738

Started on fixing more exsotic problems

Changed files

M	CMakeLists.txt before
M	source/code/BlockGame.hpp before
M	source/code/main.cpp before

diff --git a/CMakeLists.txt b/CMakeLists.txt index ab41ea2..c4bcfb9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt

@@ -42,7 +42,7 @@ add_definitions(-DLOCALEDIR=\"${CMAKE_INSTALL_PREFIX}/${INSTALL_LOCALE_DIR}\")

endif()

#Compiler options

-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -std=c++11")

+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -std=c++11")

set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_DEBUG} -g -DDEBUG")

set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELEASE} -O2")

diff --git a/source/code/BlockGame.hpp b/source/code/BlockGame.hpp index 5436780..2c233e4 100644 --- a/source/code/BlockGame.hpp +++ b/source/code/BlockGame.hpp

@@ -219,9 +219,9 @@ public:

int getAIlevel() const;

- virtual void AddText(int x, int y, const std::string& text, int time) const {}

- virtual void AddBall(int x, int y, bool right, int color) const {}

- virtual void AddExplosion(int x, int y) const {}

+ virtual void AddText(int, int, const std::string&, int) const {}

+ virtual void AddBall(int, int, bool, int) const {}

+ virtual void AddExplosion(int, int) const {}

virtual void PlayerWonEvent() const {}

virtual void DrawEvent() const {}

virtual void BlockPopEvent() const {}

diff --git a/source/code/main.cpp b/source/code/main.cpp index c8a8318..0e675a8 100644 --- a/source/code/main.cpp +++ b/source/code/main.cpp

@@ -1054,7 +1054,7 @@ static void StartSinglePlayerTimeTrial() {

saveReplay = true;

}

-static int StartSinglePlayerPuzzle(int level) {

+static int StartSinglePlayerPuzzle() {

BlockGameStartInfo startInfo;

startInfo.ticks = SDL_GetTicks();

startInfo.puzzleMode = true;

@@ -1565,7 +1565,7 @@ int runGame(Gametype gametype, int level) {

}

break;

case Gametype::Puzzle:

- if (StartSinglePlayerPuzzle(level)) {

+ if (StartSinglePlayerPuzzle()) {

return 1;

}

break;