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

[Fix] Lotsa things.

Browse Source
This commit is contained in:
Tamir Atias 2012-04-19 17:30:59 +03:00
parent 24fab57d2a
commit 05a0b15aa8
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/Main/Game.cpp
View File

@ -33,6 +33,7 @@ Game::Game(void) {
_titleScreen = new TitleScreen(); _titleScreen = new TitleScreen();
_inTitleScreen = true; _inTitleScreen = true;
_inGameMenu = NULL;
_inGameMenuShown = false; _inGameMenuShown = false;
_running = true; _running = true;
@ -74,7 +75,10 @@ void Game::Shutdown(void) {
delete _NPC; delete _NPC;
delete _player; delete _player;
delete _level; delete _level;
delete _inGameMenu; if(_inGameMenu) {
delete _inGameMenu;
_inGameMenu = NULL;
}
} }
void Game::ProcessEvents(float dt) { void Game::ProcessEvents(float dt) {
@ -120,7 +124,7 @@ void Game::UpdateTitle(float dt) {
} }
void Game::UpdateGame(float dt) { void Game::UpdateGame(float dt) {
if(KeyDown(SDLK_ESCAPE)) { if(KeyDown(SDLK_F1)) {
_inGameMenuShown = !_inGameMenuShown; _inGameMenuShown = !_inGameMenuShown;
} }
if(_inGameMenuShown) { if(_inGameMenuShown) {
@ -182,11 +186,15 @@ void Game::RenderGame(void) {
_level->Draw(xOffset, yOffset); _level->Draw(xOffset, yOffset);
_player->Render(); _player->Render();
_NPC->Render(); _NPC->Render();
_testFont->SetColor(0.0f, 1.0f, 1.0f, 1.0f);
_testFont->RenderText(
_player->GetX() - 5,
_player->GetY() - _testFont->GetLineSkip() - 2,
"Miss D");
_testFont->RenderText( _testFont->RenderText(
_player->GetX() - 50, _player->GetX() - 50,
_player->GetY() - _testFont->GetLineSkip() - 2, _player->GetY() - _testFont->GetLineSkip() - 20,
"<Mistress of Magic>"); "<Misteress of Magic>");
if(_inGameMenuShown) { if(_inGameMenuShown) {
glLoadIdentity(); glLoadIdentity();
@ -195,7 +203,6 @@ void Game::RenderGame(void) {
_inGameMenu->Render(); _inGameMenu->Render();
} }
} }
void Game::NewGame(void) { void Game::NewGame(void) {

2
src/Main/main.cpp
View File

@ -102,7 +102,7 @@ int main(int argc, char** argv) {
while(game.IsRunning()) { while(game.IsRunning()) {
while(SDL_PollEvent(&event)) { while(SDL_PollEvent(&event)) {
if((event.type == SDL_QUIT)) { if((event.type == SDL_QUIT) || KeyStillDown(SDLK_ESCAPE)) {
game.SetRunning(false); game.SetRunning(false);
break; break;
} }