From 68d26f149c2bf49222ff33f761eed40982a37d29 Mon Sep 17 00:00:00 2001 From: Anselme Date: Mon, 25 Sep 2017 18:10:12 +0200 Subject: [PATCH] bug fixes --- .qmake.conf | 2 +- app/janken.cpp | 2 +- app/mmokobanmodule.cpp | 6 +++--- app/mmokobanmodule.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.qmake.conf b/.qmake.conf index 269489e..97fa57d 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ bin_dir=$$PWD/deploy lib_dir=$$PWD/lib mmokoban_lib_dir=$$PWD/../mmokoban/lib include_dir=$$PWD/../mmokoban/src -include_dir=$$PWD/../mmokoban/include +sfml_dir=$$PWD/../mmokoban/include diff --git a/app/janken.cpp b/app/janken.cpp index 0b99d1d..1ba9bba 100644 --- a/app/janken.cpp +++ b/app/janken.cpp @@ -58,7 +58,7 @@ bool Janken::hasUniqueSolution(){ } int Janken::getSolution(){ - int solution; + int solution = 0; float ratio, best_ratio = 0; for(int i = 0;i < NB_COUPS; i++){ if ((ratio = played[i]/nb_played) > best_ratio){ diff --git a/app/mmokobanmodule.cpp b/app/mmokobanmodule.cpp index 28029a2..880332d 100644 --- a/app/mmokobanmodule.cpp +++ b/app/mmokobanmodule.cpp @@ -61,12 +61,12 @@ void MMOkobanModule::start() m_mmokoban_server = new Server(TCP_PORT); m_mmokoban_server->initMap(); - new std::thread(startUpdateLoop, m_mmokoban_server, m_running); + new std::thread(MMOkobanModule::startUpdateLoop, m_mmokoban_server, &m_running); } -void MMOkobanModule::startUpdateLoop(Server* server, bool &running) +void MMOkobanModule::startUpdateLoop(Server* server, bool *running) { - while(running) + while(*running) server->update(); delete server; } diff --git a/app/mmokobanmodule.h b/app/mmokobanmodule.h index 9eafbff..d26fb0b 100644 --- a/app/mmokobanmodule.h +++ b/app/mmokobanmodule.h @@ -13,7 +13,7 @@ class MMOkobanModule : public Module void start(); void stop(); - static void startUpdateLoop(Server* server, bool &running); + static void startUpdateLoop(Server* server, bool *running); public: MMOkobanModule();