From c55b71e07fc9d11bbb8ace131ccba21d2b5dd113 Mon Sep 17 00:00:00 2001
From: Tamir Atias <engine.games@gmail.com>
Date: Thu, 19 Apr 2012 10:15:20 +0300
Subject: [PATCH] [Fix] Player caption font being too big. [Change] Level and
 actors only loading on new game.

---
 src/Main/Game.cpp        | 40 ++++++++++++++++++++++++++++------------
 src/Main/Game.h          |  4 ++++
 src/Main/TitleScreen.cpp |  2 +-
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/src/Main/Game.cpp b/src/Main/Game.cpp
index 80e95a5..c967953 100644
--- a/src/Main/Game.cpp
+++ b/src/Main/Game.cpp
@@ -25,8 +25,6 @@ Game::Game(void) {
   _NPC->SetXY(30.0f, 30.0f);
 
   _testFont = new Font();
-  _testFont->Load("../Data/Font/Fairydust.ttf", 24);
-  _testFont->SetColor(0.0f, 1.0f, 1.0f, 1.0f);
 
   _titleScreen = new TitleScreen();
   _inTitleScreen = true;
@@ -47,12 +45,6 @@ bool Game::Init(void) {
   glEnable(GL_ALPHA_TEST);
   glAlphaFunc(GL_GREATER, 0.1f);
 
-  _level->Load("../Data/Map/Ugly.tmx");
-  _level->PlayBGM();
-
-  _player->LoadSprites("Player");
-  _NPC->LoadSprites("Player");
-
   // Return success.
   return true;
 }
@@ -106,12 +98,16 @@ void Game::UpdateTitle(float dt) {
 
   if(!_titleScreen->IsAlive()) {
     switch(_titleScreen->GetResult()) {
-    case TitleScreen::QUIT:
-      _running = false;
+    case TitleScreen::NEW_GAME:
+      NewGame();
       break;
 
-    case TitleScreen::NEW_GAME:
-      _inTitleScreen = false;
+    case TitleScreen::LOAD_GAME:
+      LoadGame();
+      break;
+
+    case TitleScreen::QUIT:
+      Quit();
       break;
     }
   }
@@ -165,3 +161,23 @@ void Game::RenderGame(void) {
     _player->GetY() - _testFont->GetLineSkip() - 2,
     "Miss D");
 }
+
+void Game::NewGame(void) {
+  _level->Load("../Data/Map/Ugly.tmx");
+  _level->PlayBGM();
+
+  _player->LoadSprites("Player");
+  _NPC->LoadSprites("Player");
+
+  _testFont->Load("../Data/Font/Fairydust.ttf", 16);
+  _testFont->SetColor(0.0f, 1.0f, 1.0f, 1.0f);
+
+  _inTitleScreen = false;
+}
+
+void Game::LoadGame(void) {
+}
+
+void Game::Quit(void) {
+  SetRunning(false);
+}
diff --git a/src/Main/Game.h b/src/Main/Game.h
index 254b83b..ca4f984 100644
--- a/src/Main/Game.h
+++ b/src/Main/Game.h
@@ -32,6 +32,10 @@ private:
   void RenderTitle(void);
   void RenderGame(void);
 
+  void NewGame(void);
+  void LoadGame(void);
+  void Quit(void);
+
   Font*   _testFont;
   Player* _player;
   NPC*    _NPC;
diff --git a/src/Main/TitleScreen.cpp b/src/Main/TitleScreen.cpp
index b67108d..6ae5904 100644
--- a/src/Main/TitleScreen.cpp
+++ b/src/Main/TitleScreen.cpp
@@ -26,7 +26,6 @@ TitleScreen::TitleScreen(void) {
   _menu.AddButton(loadGameButton);
   _menu.AddButton(quitButton);
   _menu.AlignButtons(Menu::ALIGN_VERTICALLY);
-  _menu.SetXY(32, windowHeight - 128);
 }
 
 TitleScreen::~TitleScreen(void) {
@@ -57,5 +56,6 @@ void TitleScreen::Update(float dt) {
 }
 
 void TitleScreen::Render(void) {
+  _menu.SetXY(32, windowHeight - 128);
   _menu.Render();
 }