From 01abdde918a73b95409b2cae4a5492b9ffc9134f Mon Sep 17 00:00:00 2001
From: Treeki <treeki@gmail.com>
Date: Thu, 23 Feb 2012 05:42:54 +0100
Subject: header updates

---
 include/game.h | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

(limited to 'include')

diff --git a/include/game.h b/include/game.h
index 9dd1605..ccc8fee 100755
--- a/include/game.h
+++ b/include/game.h
@@ -370,7 +370,8 @@ class mMtx {
 	operator MtxPtr() const { return (MtxPtr)this; }
 
 	/* Create New Ones */
-	void identity();
+	void zero();
+	void identity() { MTXIdentity(data); }
 
 	void translation(float x, float y, float z) { MTXTrans(data, x, y, z); }
 	void scale(float x, float y, float z) { MTXScale(data, x, y, z); }
@@ -1095,7 +1096,9 @@ public:
 
 	dActor_c *owner;
 	Physics *next, *prev;
-	u32 _C, _10, _14, _18, _1C, _20, _24, _28, _2C, _30, _34, _38, _3C;
+	u32 _C, _10, _14, _18, _1C, _20, _24, _28, _2C, _30, _34;
+	void *somePlayer;
+	u32 _3C;
 	void *otherCallback1, *otherCallback2, *otherCallback3;
 	void *callback1, *callback2, *callback3;
 	float lastX, lastY;
@@ -1201,8 +1204,8 @@ public:
 	void addToList();
 	void removeFromList();
 
-	void initWithStruct(dActor_c *owner, Info *info);
-	void initWithStruct(dActor_c *owner, Info *info, u8 clMode);
+	void initWithStruct(dActor_c *owner, const Info *info);
+	void initWithStruct(dActor_c *owner, const Info *info, u8 clMode);
 
 	u16 checkResult1(u16 param);
 	u16 checkResult3(u16 param);
@@ -1373,12 +1376,16 @@ public:
 	//FIXME params and returns and add more
 	void Clear1();
 	void Clear2();
-	void Init(dStageActor_c*,u8*,u8*,u8*);
+	void Init(dStageActor_c*,const u8*,const u8*,const u8*);
 
 	void Clear3();
-	int CollidedWithTile();
-	int SomethingSemiImportant(int);
-	int s_80072BC0();
+	bool CollidedWithTile();
+	int SomethingSemiImportant(u32);
+	u32 execute();
+
+	u32 s_8006FA40(void *);
+	u32 s_80070760();
+	bool s_800707E0();
 
 	dStageActor_c* owner;
 	void* struct1_ptr;
@@ -1917,6 +1924,10 @@ public:
 	void doSpriteMovement();
 	bool CheckIfPlayerBelow(float,float);
 
+	void stuffRelatingToCollisions(float, float, float);
+
+	void checkLiquidImmersionAndKillIfTouchingLava(Vec *pos, float effectScale);
+
 	// States
 	USING_STATES(dEn_c);
 	REF_NINTENDO_STATE(DieFumi);
-- 
cgit v1.2.3