about summary refs log tree commit diff
path: root/src/game/collision.h
diff options
context:
space:
mode:
authorGreYFoXGTi <GreYFoXGTi@GMaiL.CoM>2011-02-12 12:40:36 +0200
committeroy <Tom_Adams@web.de>2011-02-12 21:18:41 +0100
commit1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251 (patch)
treed4b94b98105c3af23c79bae02a132bfe66738392 /src/game/collision.h
parente45ad2a085d8f02aadc5d823a1d7dda4e1da70aa (diff)
downloadzcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.tar.gz
zcatch-1b2703aaba9ef21b8fca7c12b299fcd0fd4b9251.zip
Refactoring & fixed WEAPONSPEC_GUN in content.py
Diffstat (limited to 'src/game/collision.h')
-rw-r--r--src/game/collision.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/collision.h b/src/game/collision.h
index 8bcbe789..3a0a490a 100644
--- a/src/game/collision.h
+++ b/src/game/collision.h
@@ -25,9 +25,9 @@ public:
 
 	CCollision();
 	void Init(class CLayers *pLayers);
-	bool CheckPoint(float x, float y) { return IsTileSolid(round(x), round(y)); }
-	bool CheckPoint(vec2 p) { return CheckPoint(p.x, p.y); }
-	int GetCollisionAt(float x, float y) { return GetTile(round(x), round(y)); }
+	bool CheckPoint(float X, float Y) { return IsTileSolid(round(X), round(Y)); }
+	bool CheckPoint(vec2 P) { return CheckPoint(P.x, P.y); }
+	int GetCollisionAt(float X, float Y) { return GetTile(round(X), round(Y)); }
 	int GetWidth() { return m_Width; };
 	int GetHeight() { return m_Height; };
 	int IntersectLine(vec2 Pos0, vec2 Pos1, vec2 *pOutCollision, vec2 *pOutBeforeCollision);