Merged invalid branch.

source/Game.cpp

@@ -13,7 +13,6 @@
 #include "util/Loader.h"
 #include "util/ResourceManager.h"
 #include "util/String.h"
-#include "util/Log.h"
 
 /// Goal amount of frames per second.
 const int Game::FPS_GOAL = 60;
@@ -46,7 +45,6 @@ Game::Game(const Vector2i& resolution) :
 	}
 	mCollection.insert(std::shared_ptr<Sprite>(new Enemy(mWorld, Vector2f(400.0f, 200.0f))),
 			Collection::LEVEL_ACTOR);
-
 }
 
 /**

source/abstract/Physical.cpp

@@ -22,9 +22,6 @@ Physical::Physical(const PhysicalData& data) :
 	assert(data.category);
 
 	b2BodyDef bodyDef;
-	// not moving -> static body
-	// moving -> dynamic body
-	// bullet -> kinematic body
 	bodyDef.type = 	(data.moving)
 						? b2_dynamicBody
 						: b2_staticBody;
@@ -90,7 +87,11 @@ Physical::getSpeed() const {
 }
 
 /**
+<<<<<<< HEAD
  * Returns the rotation of the body as an SFML angle.
+=======
+ * Returns the rotation of the body (converted to an SFML angle).
+>>>>>>> origin/master
  */
 float
 Physical::getAngle() const {

source/effects/Bullet.cpp

@@ -8,9 +8,9 @@
 #include "Bullet.h"
 
 #include "../abstract/Actor.h"
-#include "../util/Log.h"
 
 const Vector2i Bullet::SIZE = Vector2i(20, 20);
+
 const float Bullet::SPEED = 500.0f;
 
 /**

source/effects/Bullet.h

@@ -25,6 +25,7 @@ public:
 // Public variables.
 public:
 	static const Vector2i SIZE;
+
 // Private variables.
 private:
 	static const float SPEED; //< If speed is too low, bullets push each other away on insert.

source/sprite/Player.h

@@ -39,6 +39,7 @@ protected:
 private:
 	static const float SPEED;
 	static const Vector2i SIZE;
+
 	Weapon mWeapon; //< Weapon object used for Player::fire().
 	Vector2f mDestination; //< Absolute position of the movement destination.
 	Vector2f mCrosshairPosition; //< Relative position of the point to fire at (mouse cursor).