From 03289f69811e73f724704c198b21c786c48c9cde Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Thu, 19 Apr 2012 15:25:11 +0100 Subject: [PATCH 1/3] [Fix] Tamir thought it be a good idea to kill my Player Title. [Fix] Fixed out of date copyright. [Add] Just starting on battle systems. --- LibDQt/LibDQt.pro | 6 ++++-- README | 2 +- src/BattleSys/HUB.cpp | 0 src/BattleSys/HUB.h | 0 src/Main/Game.cpp | 8 ++++++-- 5 files changed, 11 insertions(+), 5 deletions(-) create mode 100644 src/BattleSys/HUB.cpp create mode 100644 src/BattleSys/HUB.h diff --git a/LibDQt/LibDQt.pro b/LibDQt/LibDQt.pro index 913dd74..41c10ed 100644 --- a/LibDQt/LibDQt.pro +++ b/LibDQt/LibDQt.pro @@ -65,7 +65,8 @@ HEADERS += ../src/Actor/Player.h \ ../src/Animation/AnimatingSprite.h \ ../src/UI/Menu.h \ ../src/UI/Button.h \ - ../src/Main/TitleScreen.h + ../src/Main/TitleScreen.h \ + ../src/BattleSys/HUB.h SOURCES += ../src/Actor/Player.cpp \ ../src/Collision/AABB.cpp \ ../src/Global/Globals.cpp \ @@ -105,4 +106,5 @@ SOURCES += ../src/Actor/Player.cpp \ ../src/Animation/AnimatingSprite.cpp \ ../src/UI/Menu.cpp \ ../src/UI/Button.cpp \ - ../src/Main/TitleScreen.cpp + ../src/Main/TitleScreen.cpp \ + ../src/BattleSys/HUB.cpp diff --git a/README b/README index 8ae3054..6cbf6c6 100644 --- a/README +++ b/README @@ -14,7 +14,7 @@ KonoM ################################################################## ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Copyright (C) 2011 SaraCraft +Copyright (C) 2012 SaraCraft allanis@saracraft.net This program is free software; you can redistribute it and/or diff --git a/src/BattleSys/HUB.cpp b/src/BattleSys/HUB.cpp new file mode 100644 index 0000000..e69de29 diff --git a/src/BattleSys/HUB.h b/src/BattleSys/HUB.h new file mode 100644 index 0000000..e69de29 diff --git a/src/Main/Game.cpp b/src/Main/Game.cpp index 4187c67..2964f70 100644 --- a/src/Main/Game.cpp +++ b/src/Main/Game.cpp @@ -32,7 +32,7 @@ Game::Game(void) { _titleScreen = new TitleScreen(); _inTitleScreen = true; - + _inGameMenuShown = false; _running = true; @@ -182,6 +182,10 @@ void Game::RenderGame(void) { _level->Draw(xOffset, yOffset); _player->Render(); _NPC->Render(); + _testFont->RenderText( + _player->GetX() - 5, + _player->GetY() - _testFont->GetLineSkip() - 20, + "Miss D"); _testFont->RenderText( _player->GetX() - 50, _player->GetY() - _testFont->GetLineSkip() - 2, @@ -195,7 +199,7 @@ void Game::RenderGame(void) { _inGameMenu->Render(); } - + } void Game::NewGame(void) { From b3ec9673a5b34ba4086177d2671aa94c42b39234 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Thu, 19 Apr 2012 15:27:17 +0100 Subject: [PATCH 2/3] [Remove] Removed start of Battle system files, not complete, and incorrect nameing conventions. --- src/BattleSys/HUB.cpp | 0 src/BattleSys/HUB.h | 0 2 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 src/BattleSys/HUB.cpp delete mode 100644 src/BattleSys/HUB.h diff --git a/src/BattleSys/HUB.cpp b/src/BattleSys/HUB.cpp deleted file mode 100644 index e69de29..0000000 diff --git a/src/BattleSys/HUB.h b/src/BattleSys/HUB.h deleted file mode 100644 index e69de29..0000000 From 348d91cc4d23906ae8654eef73027ffcd8b01d41 Mon Sep 17 00:00:00 2001 From: Rtch90 Date: Thu, 19 Apr 2012 15:29:45 +0100 Subject: [PATCH 3/3] [Fix] Removed BattleSys stuff from Qt project for now. --- LibDQt/LibDQt.pro | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/LibDQt/LibDQt.pro b/LibDQt/LibDQt.pro index 41c10ed..882d006 100644 --- a/LibDQt/LibDQt.pro +++ b/LibDQt/LibDQt.pro @@ -8,7 +8,7 @@ LIBS += -lGL \ -ltinyxml \ -lSDL_mixer \ -lSDL_ttf -win32: { +win32: { LIBS -= -lGL \ -lGLU LIBS += -lkernel32 \ @@ -65,8 +65,7 @@ HEADERS += ../src/Actor/Player.h \ ../src/Animation/AnimatingSprite.h \ ../src/UI/Menu.h \ ../src/UI/Button.h \ - ../src/Main/TitleScreen.h \ - ../src/BattleSys/HUB.h + ../src/Main/TitleScreen.h SOURCES += ../src/Actor/Player.cpp \ ../src/Collision/AABB.cpp \ ../src/Global/Globals.cpp \ @@ -107,4 +106,3 @@ SOURCES += ../src/Actor/Player.cpp \ ../src/UI/Menu.cpp \ ../src/UI/Button.cpp \ ../src/Main/TitleScreen.cpp \ - ../src/BattleSys/HUB.cpp