From 3f22b00986d9fe2ebc0b596235b9093a96720614 Mon Sep 17 00:00:00 2001
From: Colin Noga <Tempus@chronometry.ca>
Date: Wed, 29 Feb 2012 14:43:35 -0600
Subject: Added meteor, changes to fuzzybear intro (now complete), some header
 tweaks

---
 include/game.h | 46 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 43 insertions(+), 3 deletions(-)

(limited to 'include/game.h')

diff --git a/include/game.h b/include/game.h
index e3bbb5f..6412f5e 100755
--- a/include/game.h
+++ b/include/game.h
@@ -344,6 +344,17 @@ public:
 };
 
 
+class WLClass {
+public:
+	u32 _0;
+	u32 _4;
+	u32 _8;
+	u32 _otherDatum[38];
+
+	static WLClass *instance;
+};
+
+
 class dStage32C_c {
 public:
 
@@ -1137,7 +1148,8 @@ public:
 	float lastX, lastY;
 	Unknown unkArray[4];
 	float x, y;
-	float _88, _8C, _90;
+	float _88, _8C;
+	float diameter;
 	Vec lastActorPosition;
 	float _A0, _A4, last_A0, last_A4, _B0, _B4;
 	u32 _B8;
@@ -1156,7 +1168,7 @@ public:
 	void addToList();
 	void removeFromList();
 
-	void baseSetup(dActor_c *actor, u32 t_40, u32 t_44, u32 t_48, u8 t_DD, u8 layer);
+	void baseSetup(dActor_c *actor, void *otherCB1, void *otherCB2, void *otherCB3, u8 t_DD, u8 layer);
 
 	// note: Scale can be a null pointer (in that case, it'll use 1.0)
 	void setup(dActor_c *actor,
@@ -1175,7 +1187,7 @@ public:
 	void setupRound(dActor_c *actor,
 			float x, float y, float radius,
 			void *otherCB1, void *otherCB2, void *otherCB3,
-			u8 t_DD, u8 layer);
+			u8 t_DD, u8 layer, Vec2 *scale = 0);
 
 	void setRect(float x1, float y1, float x2, float y2, Vec2 *scale = 0);
 	void setRect(Vec2 *p1, Vec2 *p2, Vec2 *scale = 0);
@@ -2123,6 +2135,34 @@ public:
 };
 
 
+
+class daKameckDemo : public dEn_c {
+
+public:
+	USING_STATES(daKameckDemo);
+	REF_NINTENDO_STATE(DemoWait);
+	REF_NINTENDO_STATE(DemoSt);
+	REF_NINTENDO_STATE(DemoSt2);
+};
+
+
+class dPlayer : public dActorMultiState_c {
+
+public:
+	USING_STATES(dPlayer);
+	REF_NINTENDO_STATE(None);
+	REF_NINTENDO_STATE(Walk);
+	REF_NINTENDO_STATE(Jump);
+	REF_NINTENDO_STATE(DemoNone);
+	REF_NINTENDO_STATE(DemoWait);
+	REF_NINTENDO_STATE(DemoGoal);
+	REF_NINTENDO_STATE(DemoControl);
+};
+
+
+
+
+
 class BgGmBase : public dBase_c {
 public:
 	// TODO, a lot
-- 
cgit v1.2.3