From 996c6418b1baa67dab210d44dd43f3af7d4f5d8d Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Thu, 19 Apr 2012 12:54:04 +0100
Subject: [PATCH 1/3] [Fix] Merging crap to git.

---
 LibDQt/LibDQt.pro | 8 ++++----
 src/Actor/Actor.h | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/LibDQt/LibDQt.pro b/LibDQt/LibDQt.pro
index 59bf44f..522cf79 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 \
@@ -62,7 +62,7 @@ HEADERS += ../src/Actor/Player.h \
     ../src/Animation/AnimationSequence.h \
     ../src/System/String.h \
     ../src/Font/Font.h \
-    ../src/Animation/AnimatingSprite.h
+    ../src/Animation/AnimatingSprite.h \
 SOURCES += ../src/Actor/Player.cpp \
     ../src/Collision/AABB.cpp \
     ../src/Global/Globals.cpp \
@@ -99,5 +99,5 @@ SOURCES += ../src/Actor/Player.cpp \
     ../src/Animation/AnimationSequence.cpp \
     ../src/System/String.cpp \
     ../src/Font/Font.cpp \
-    ../src/Animation/AnimatingSprite.cpp
-OTHER_FILES += 
+    ../src/Animation/AnimatingSprite.cpp \
+OTHER_FILES +=
diff --git a/src/Actor/Actor.h b/src/Actor/Actor.h
index e7707b0..3ca3b1f 100644
--- a/src/Actor/Actor.h
+++ b/src/Actor/Actor.h
@@ -42,8 +42,8 @@ public:
 
   void SetXY(float xArg, float yArg)    { x = xArg; y = yArg; }
 
-  Facing GetDirection(void)                 { return _direction; }
-  void SetDirection(Facing direction)      { _direction = direction; }
+  Facing GetDirection(void)             { return _direction; }
+  void SetDirection(Facing direction)   { _direction = direction; }
 
 protected:
   virtual void Move(float dt) = 0;

From 8ae564528a6c2e0fbbce004829c414ae7eaa2e35 Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Thu, 19 Apr 2012 14:35:12 +0100
Subject: [PATCH 2/3] [Add] Adding a README file, with GPL software licencing.

---
 README | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 README

diff --git a/README b/README
new file mode 100644
index 0000000..8ae3054
--- /dev/null
+++ b/README
@@ -0,0 +1,35 @@
+Readme plz!
+___________
+
+~~Instructions~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Arrow keys/wasd		- Move Player.
+'Shift'			      - Run.
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+##Developers######################################################
+Allanis
+KonoM
+##################################################################
+
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Copyright (C) 2011 SaraCraft
+allanis@saracraft.net
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Here is a nice link to the licence:
+http://www.gnu.org/licenses/gpl-2.0.html

From 098d4f900ebdd63732d17bca82b86da17fc6a73a Mon Sep 17 00:00:00 2001
From: Rtch90 <ritchie.cunningham@protonmail.com>
Date: Thu, 19 Apr 2012 14:53:25 +0100
Subject: [PATCH 3/3] [Add] Just a little fun adding a title to our player.

---
 src/Main/Game.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Main/Game.cpp b/src/Main/Game.cpp
index c967953..03bcc35 100644
--- a/src/Main/Game.cpp
+++ b/src/Main/Game.cpp
@@ -158,8 +158,12 @@ void Game::RenderGame(void) {
   _NPC->Render();
   _testFont->RenderText(
     _player->GetX() - 5,
-    _player->GetY() - _testFont->GetLineSkip() - 2,
+    _player->GetY() - _testFont->GetLineSkip() - 20,
     "Miss D");
+  _testFont->RenderText(
+    _player->GetX() - 50,
+    _player->GetY() - _testFont->GetLineSkip() - 2,
+    "<Mistress of Magic>");
 }
 
 void Game::NewGame(void) {