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

[Fix] Player caption font being too big.

Browse Source 
[Change] Level and actors only loading on new game.
This commit is contained in:
Tamir Atias 2012-04-19 10:15:20 +03:00
parent 774ffb0487
commit c55b71e07f
3 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/Main/Game.cpp
View File

@ -25,8 +25,6 @@ Game::Game(void) {
_NPC->SetXY(30.0f, 30.0f); _NPC->SetXY(30.0f, 30.0f);
_testFont = new Font(); _testFont = new Font();
_testFont->Load("../Data/Font/Fairydust.ttf", 24);
_testFont->SetColor(0.0f, 1.0f, 1.0f, 1.0f);
_titleScreen = new TitleScreen(); _titleScreen = new TitleScreen();
_inTitleScreen = true; _inTitleScreen = true;
@ -47,12 +45,6 @@ bool Game::Init(void) {
glEnable(GL_ALPHA_TEST); glEnable(GL_ALPHA_TEST);
glAlphaFunc(GL_GREATER, 0.1f); glAlphaFunc(GL_GREATER, 0.1f);
_level->Load("../Data/Map/Ugly.tmx");
_level->PlayBGM();
_player->LoadSprites("Player");
_NPC->LoadSprites("Player");
// Return success. // Return success.
return true; return true;
} }
@ -106,12 +98,16 @@ void Game::UpdateTitle(float dt) {
if(!_titleScreen->IsAlive()) { if(!_titleScreen->IsAlive()) {
switch(_titleScreen->GetResult()) { switch(_titleScreen->GetResult()) {
case TitleScreen::QUIT: case TitleScreen::NEW_GAME:
_running = false; NewGame();
break; break;
case TitleScreen::NEW_GAME: case TitleScreen::LOAD_GAME:
_inTitleScreen = false; LoadGame();
break;
case TitleScreen::QUIT:
Quit();
break; break;
} }
} }
@ -165,3 +161,23 @@ void Game::RenderGame(void) {
_player->GetY() - _testFont->GetLineSkip() - 2, _player->GetY() - _testFont->GetLineSkip() - 2,
"Miss D"); "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);
}

4
src/Main/Game.h
View File

@ -32,6 +32,10 @@ private:
void RenderTitle(void); void RenderTitle(void);
void RenderGame(void); void RenderGame(void);
void NewGame(void);
void LoadGame(void);
void Quit(void);
Font* _testFont; Font* _testFont;
Player* _player; Player* _player;
NPC* _NPC; NPC* _NPC;

2
src/Main/TitleScreen.cpp
View File

@ -26,7 +26,6 @@ TitleScreen::TitleScreen(void) {
_menu.AddButton(loadGameButton); _menu.AddButton(loadGameButton);
_menu.AddButton(quitButton); _menu.AddButton(quitButton);
_menu.AlignButtons(Menu::ALIGN_VERTICALLY); _menu.AlignButtons(Menu::ALIGN_VERTICALLY);
_menu.SetXY(32, windowHeight - 128);
} }
TitleScreen::~TitleScreen(void) { TitleScreen::~TitleScreen(void) {
@ -57,5 +56,6 @@ void TitleScreen::Update(float dt) {
} }
void TitleScreen::Render(void) { void TitleScreen::Render(void) {
_menu.SetXY(32, windowHeight - 128);
_menu.Render(); _menu.Render();
} }