From fbaab4a9d877a1002f384fd66af5f2ba09a6b8dd Mon Sep 17 00:00:00 2001 From: SIMAILA Djalim Date: Mon, 10 Jan 2022 17:21:24 +0100 Subject: [PATCH] minor stuff all should be good .w. --- config.yml | 8 ++++---- headers/utils.h | 2 +- src/pixelManager/drawMenus.cpp | 5 ++++- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/config.yml b/config.yml index 460e3f9..1d44b7a 100644 --- a/config.yml +++ b/config.yml @@ -68,7 +68,7 @@ players: startXPosition: 600 fireCooldown: 10 speed: 10 - lives: 100 + lives: 3 user1: color: red keys: @@ -78,9 +78,9 @@ players: user2: color: blue keys: - left: 4 - right: 6 - shoot: 5 + left: k + right: m + shoot: là ############################# diff --git a/headers/utils.h b/headers/utils.h index eaf54b6..d194ff0 100644 --- a/headers/utils.h +++ b/headers/utils.h @@ -25,7 +25,7 @@ // Syntax : DEBUG(cout << "hey" << endl) // The debug flag defintion has been set here, but normally we would add it to the MakeFile -#define DEBUG_FLAG +//#define DEBUG_FLAG #ifdef DEBUG_FLAG #define DEBUG_MSG(X) cerr << "DEBUG: " << X << endl; diff --git a/src/pixelManager/drawMenus.cpp b/src/pixelManager/drawMenus.cpp index e5784d0..c23aff7 100644 --- a/src/pixelManager/drawMenus.cpp +++ b/src/pixelManager/drawMenus.cpp @@ -29,7 +29,10 @@ void PixelManager::displayMenu(const Position& pos, Menu& currentMenu){ startFrame(); drawSprite(menuBackground); drawSprite(logo,Position(100,50)); - drawText(Position(1150, 700), "version 1.0.0"); + drawText(Position(10, 692), "tips:",nsGraphics::KWhite,Font::BITMAP_8_BY_13); + drawText(Position(10, 702), "use 'z','s','q','d' and 'enter' to navigate the menus",nsGraphics::KWhite,Font::BITMAP_8_BY_13); + drawText(Position(10, 712), "see the configuration file for player specific key bindings",nsGraphics::KWhite,Font::BITMAP_8_BY_13); + drawText(Position(1150, 712), "version 1.0.0"); unsigned margin = 0; unsigned cpt = 0; for(string& value : currentMenu.entries ){