From 05a0b15aa86dffd1921f9feb6fb2fbe5da08904b Mon Sep 17 00:00:00 2001
From: Tamir Atias <engine.games@gmail.com>
Date: Thu, 19 Apr 2012 17:30:59 +0300
Subject: [PATCH] [Fix] Lotsa things.

---
 src/Main/Game.cpp | 19 +++++++++++++------
 src/Main/main.cpp |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/Main/Game.cpp b/src/Main/Game.cpp
index 4187c67..458f0a2 100644
--- a/src/Main/Game.cpp
+++ b/src/Main/Game.cpp
@@ -33,6 +33,7 @@ Game::Game(void) {
   _titleScreen = new TitleScreen();
   _inTitleScreen = true;
   
+  _inGameMenu = NULL;
   _inGameMenuShown = false;
 
   _running = true;
@@ -74,7 +75,10 @@ void Game::Shutdown(void) {
   delete _NPC;
   delete _player;
   delete _level;
-  delete _inGameMenu;
+  if(_inGameMenu) {
+    delete _inGameMenu;
+    _inGameMenu = NULL;
+  }
 }
 
 void Game::ProcessEvents(float dt) {
@@ -120,7 +124,7 @@ void Game::UpdateTitle(float dt) {
 }
 
 void Game::UpdateGame(float dt) {
-  if(KeyDown(SDLK_ESCAPE)) {
+  if(KeyDown(SDLK_F1)) {
     _inGameMenuShown = !_inGameMenuShown;
   }
   if(_inGameMenuShown) {
@@ -182,11 +186,15 @@ void Game::RenderGame(void) {
   _level->Draw(xOffset, yOffset);
   _player->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(
     _player->GetX() - 50,
-    _player->GetY() - _testFont->GetLineSkip() - 2,
-    "<Mistress of Magic>");
-
+    _player->GetY() - _testFont->GetLineSkip() - 20,
+    "<Misteress of Magic>");
   if(_inGameMenuShown) {
     glLoadIdentity();
 
@@ -195,7 +203,6 @@ void Game::RenderGame(void) {
 
     _inGameMenu->Render();
   }
-  
 }
 
 void Game::NewGame(void) {
diff --git a/src/Main/main.cpp b/src/Main/main.cpp
index 32e85fc..3a01324 100644
--- a/src/Main/main.cpp
+++ b/src/Main/main.cpp
@@ -102,7 +102,7 @@ int main(int argc, char** argv) {
   while(game.IsRunning()) {
 
     while(SDL_PollEvent(&event)) {
-      if((event.type == SDL_QUIT)) {
+      if((event.type == SDL_QUIT) || KeyStillDown(SDLK_ESCAPE)) {
         game.SetRunning(false);
         break;
       }