Merge branch 'master' into Inventory2

Conflicts: src/BlockInfo.cpp
2014-07-26 13:23:11 +02:00
parent 396739cc0f e23f0238a8
commit ba36e79bc5
108 changed files with 956 additions and 667 deletions
@@ -48,7 +48,7 @@ public:
 	
 	virtual void Tick(float a_Dt, cChunk & a_Chunk) override;

-	virtual void HandlePhysics(float a_Dt, cChunk &) override { UNUSED(a_Dt); };
+	virtual void HandlePhysics(float a_Dt, cChunk &) override { UNUSED(a_Dt); }

 	/** Returns the curently equipped weapon; empty item if none */
 	virtual cItem GetEquippedWeapon(void) const override { return m_Inventory.GetEquippedItem(); }