From 34f0f95bcef33b7079194d9c9c01c588e7b0e419 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <felixableitner@gmail.com>
Date: Mon, 10 Sep 2012 17:54:17 +0200
Subject: [PATCH] Changed Player initial position to be passed in constructor.

---
 source/Game.cpp          | 2 +-
 source/sprite/Player.cpp | 4 ++--
 source/sprite/Player.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/source/Game.cpp b/source/Game.cpp
index 9b0e647..aefc7a2 100644
--- a/source/Game.cpp
+++ b/source/Game.cpp
@@ -30,7 +30,7 @@ Game::Game(const Vector2i& resolution) :
 		mView(Vector2f(0, 0), Vector2f(resolution)),
 		//mFps("test"),
 		mTileManager(mWorld),
-		mPlayer(mWorld, mCollection),
+		mPlayer(mWorld, mCollection, Vector2f(200.0f, 100.0f)),
 		mElapsed(0),
 		mQuit(false),
 		mPaused(false) {
diff --git a/source/sprite/Player.cpp b/source/sprite/Player.cpp
index 871eeef..ec64937 100644
--- a/source/sprite/Player.cpp
+++ b/source/sprite/Player.cpp
@@ -17,8 +17,8 @@ const float Player::SPEED = 100.0f;
 /**
  * Initializes Sprite.
  */
-Player::Player(b2World& world, Collection& collection) :
-		Sprite("player.png", PhysicalData(Vector2f(200.0f, 100.0f), Vector2i(50, 50), world,
+Player::Player(b2World& world, Collection& collection, const Vector2f& position) :
+		Sprite("player.png", PhysicalData(position, Vector2i(50, 50), world,
 				CATEGORY_ACTOR, MASK_ALL, true)),
 		mWeapon(*this, collection, world),
 		mDestination(Vector2i(50, 50)) {
diff --git a/source/sprite/Player.h b/source/sprite/Player.h
index 9e79323..4021941 100644
--- a/source/sprite/Player.h
+++ b/source/sprite/Player.h
@@ -24,7 +24,7 @@ class Sprite;
 class Player : public Sprite, public Actor {
 // Public functions.
 public:
-	Player(b2World& world, Collection& collection);
+	Player(b2World& world, Collection& collection, const Vector2f& position);
 
 	void setCrosshairPosition(const Vector2f& position);
 	void fire();