diff --git a/config.yml b/config.yml index c11844d..17bc482 100644 --- a/config.yml +++ b/config.yml @@ -4,10 +4,10 @@ general: # Players config players: - width: 250 + width: 100 startXPosition: 50 fireCooldown: 10 - speed: 10 + speed: 20 user1: color: red keys: diff --git a/scores.kus b/scores.kus index d89cc97..fa7fe15 100644 --- a/scores.kus +++ b/scores.kus @@ -1,6 +1,6 @@ -10912949710723305374 -Thomas,2000 +6613206509173847490 +Thomas,2500 +Thomas,1200 Thomas,1000 Thomas,300 Thomas,0 -Thomas,0 diff --git a/src/pixelManager.cpp b/src/entityDraw.cpp similarity index 97% rename from src/pixelManager.cpp rename to src/entityDraw.cpp index 1f102ba..7c660ad 100644 --- a/src/pixelManager.cpp +++ b/src/entityDraw.cpp @@ -3,9 +3,9 @@ #include "utils.h" #include "god.h" - using namespace nsShape; + PixelManager::PixelManager(MinGL& a) : window(a) { window.initGlut(); window.initGraphic(); @@ -72,14 +72,6 @@ void PixelManager::drawBackground() const { background.draw(window); } -PlayMode PixelManager::showInitialMenu() const { - return PlayMode::SINGLE; -} - -bool PixelManager::showDeathMenu() const { - return true; -} - unsigned PixelManager::getScreenHeight() const { return window.getWindowSize().getY(); } @@ -131,4 +123,4 @@ PixelManager::mirrorData(const vector& inPixels, unsigned } } return std::move(outPixels); -} +} \ No newline at end of file diff --git a/src/main.cpp b/src/main.cpp index cfcedcc..1b586b6 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -5,6 +5,7 @@ using namespace std; // TODO changer tout les unsigned par des size_t dans les boucles int main(){ srand(time(NULL)); + Game g; g.managedGames(); diff --git a/src/menuDraw.cpp b/src/menuDraw.cpp new file mode 100644 index 0000000..730d35a --- /dev/null +++ b/src/menuDraw.cpp @@ -0,0 +1,15 @@ +#include +#include "pixelManager.h" +#include "utils.h" +#include "god.h" + +PlayMode PixelManager::showInitialMenu() const { + return PlayMode::SINGLE; +} + +bool PixelManager::showDeathMenu() const { + return true; +} + + +