Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Cleaned up some of KonoM's Unit tests and GUI.

Browse Source
This commit is contained in:
Rtch90 2012-02-01 23:59:23 +00:00
parent 76517a7a5f
commit f7ae1af267
1 changed files with 253 additions and 261 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Unuk/Game.cpp
View File

@ -39,20 +39,24 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
Timer renderTimer; Timer renderTimer;
Timer updateTimer; Timer updateTimer;
_gameRenderTime.SetXY(10, 70); stringstream playerHealth;
_playerHealth.SetXY(15, 27);
_playerHealth.SetTextBlended("Player Health - XX", vsmall, COLOUR_WHITE);
stringstream playerExp;
_playerExp.SetXY(15, 57);
_playerExp.SetTextBlended("Player Level XX (XX/XX)", vsmall, COLOUR_WHITE);
_gameRenderTime.SetXY(10, 90);
_gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK); _gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK);
_gameUpdateTime.SetXY(10, 90); _gameUpdateTime.SetXY(10, 110);
_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK); _gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
stringstream playerXYString; stringstream playerXYString;
_playerXY.SetXY(10, 110); _playerXY.SetXY(10, 130);
_playerXY.SetTextBlended("Player coords - XX XX", vsmall, COLOUR_BLACK); _playerXY.SetTextBlended("Player coords - XX XX", vsmall, COLOUR_BLACK);
stringstream npcHealth;
_npcHealth.SetXY(10, 130);
_npcHealth.SetTextBlended("NPC X Health - XX", vsmall, COLOUR_BLACK);
_playerHealthBar.SetBackgroundRGB(0, 0, 0); _playerHealthBar.SetBackgroundRGB(0, 0, 0);
_playerHealthBar.SetForegroundRGB(255, 0, 0); _playerHealthBar.SetForegroundRGB(255, 0, 0);
_playerHealthBar.SetXY(10, 20); _playerHealthBar.SetXY(10, 20);
@ -64,14 +68,6 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
_playerExpBar.SetWidthHeight(200, 25); _playerExpBar.SetWidthHeight(200, 25);
_playerExpBar.SetProgress(0.0f); _playerExpBar.SetProgress(0.0f);
stringstream playerHealth;
_playerHealth.SetXY(15, 27);
_playerHealth.SetTextBlended("Player Health - XX", vsmall, COLOUR_WHITE);
stringstream playerExp;
_playerExp.SetXY(15, 57);
_playerExp.SetTextBlended("Player Level XX (XX/XX)", vsmall, COLOUR_WHITE);
eventHistory = new EventHistory(); eventHistory = new EventHistory();
_gameRunning = true; _gameRunning = true;
@ -140,10 +136,6 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
else { else {
npc0Health = _map.GetWorld().GetNPC(0)->GetHealth(); npc0Health = _map.GetWorld().GetNPC(0)->GetHealth();
} }
npcHealth.str("");
npcHealth << "NPC 0 Health: " << npc0Health;
_npcHealth.SetTextBlended(npcHealth.str(), vsmall, COLOUR_BLACK);
} }
} }
// Restrict the fps. // Restrict the fps.