Merge branch 'level-select' into new-hud

3 files changed, 204 insertions, 1 deletions

diff --git a/include/game.h b/include/game.h
index 2dc64a6..7911880 100755
--- a/include/game.h
+++ b/include/game.h
@@ -1253,6 +1253,8 @@ public:
 

 	void update();

 	

+	static Physics *globalListHead;

+	static Physics *globalListTail;

 	// todo: more stuff that might not be relevant atm

 };

 

@@ -1315,6 +1317,9 @@ public:
 	float xCenter();

 

 	// Plus more stuff that isn't needed in the public API, I'm pretty sure.

+	

+	static ActivePhysics *globalListHead;

+	static ActivePhysics *globalListTail;

 };

 

 

@@ -3186,5 +3191,20 @@ extern "C" u32 GetActivePlayerCount();
 

 #include "newer.h"

 

+class BGGMEffectRenderer : public m3d::proc_c {

+	private:

+		u32 effectGroupID;

+	public:

+		~BGGMEffectRenderer();

+		void drawOpa();

+		void drawXlu();

+		virtual bool setupEffectRenderer(mAllocator_c *allocator, int opaPrio, int xluPrio, int groupID);

+};

+

+void CleanUpEffectThings();

+bool FreeEffects(int efNum);

+bool FreeBreff(int efNum);

+bool FreeBreft(int efNum);

+

 #endif

 

diff --git a/include/playerAnim.h b/include/playerAnim.h
new file mode 100644
index 0000000..905703f
--- /dev/null
+++ b/include/playerAnim.h
@@ -0,0 +1,182 @@
+#ifndef PLAYERANIM_H
+#define PLAYERANIM_H 
+enum PlayerAnim { 
+	wait = 0,
+	walk = 1,
+	run = 2,
+	b_dash = 3,
+	b_dash2 = 4,
+	jump = 5,
+	jump2 = 6,
+	jumped = 7,
+	Tjmp_c_1 = 8,
+	Tjmp_c_2 = 9,
+	Tjumped = 10,
+	roll_jump = 11,
+	Tjump2 = 12,
+	mame_jump2 = 13,
+	turn = 14,
+	turned = 15,
+	hipsr = 16,
+	hipat = 17,
+	hiped = 18,
+	hip_to_stoop = 19,
+	stoop = 20,
+	stoop_start = 21,
+	slip = 22,
+	sliped = 23,
+	slip_to_stoop = 24,
+	carry_wait = 25,
+	carry_walk = 26,
+	carry_throw = 27,
+	Rcarry_wait = 28,
+	wsld = 29,
+	fire_at = 30,
+	swim_fire_at = 31,
+	swim_fire_at2 = 32,
+	star_roll = 33,
+	P_swim = 34,
+	swim = 35,
+	swim_wait = 36,
+	swim_throw = 37,
+	swim_walk = 38,
+	swim_standing = 39,
+	paddle_1 = 40,
+	paddle_2 = 41,
+	paddle_carry = 42,
+	tree_start = 43,
+	tree_wait = 44,
+	tree_climb = 45,
+	tree_pose = 46,
+	monkey_start = 47,
+	monkey_wait_r = 48,
+	monkey_wait_l = 49,
+	monkey_r_to_l = 50,
+	monkey_l_to_r = 51,
+	net_wait = 52,
+	net_walk1 = 53,
+	net_walk2 = 54,
+	net_attack = 55,
+	pea_plant = 56,
+	pea_plant_st = 57,
+	pea_plant_wait = 58,
+	wall_wait = 59,
+	wall_walk_l = 60,
+	wall_walk_r = 61,
+	hang_start = 62,
+	hang_up = 63,
+	hang_wait = 64,
+	hang_walk_l = 65,
+	hang_walk_r = 66,
+	w_jump1 = 67,
+	w_jump2 = 68,
+	RTjumped = 69,
+	jump_hang = 70,
+	spin_st = 71,
+	spin_end = 72,
+	spin_low_st = 73,
+	spin_low_ed = 74,
+	spin_jump2 = 75,
+	spin_jump_end = 76,
+	damF = 77,
+	damB = 78,
+	dowF = 79,
+	dowB = 80,
+	firejmp = 81,
+	e_shock = 82,
+	dead = 83,
+	dead_pose = 84,
+	Rtree_start = 85,
+	Rtree_wait = 86,
+	Rtree_pose = 87,
+	goal_jump = 88,
+	goal_jump_ed = 89,
+	goal_puton_capA = 90,
+	goal_puton_capB = 91,
+	goal_puton_capC = 92,
+	PL_Rgoal_puton_cap = 93,
+	P_Rgoal_puton_cap = 94,
+	goal_puton_capF = 95,
+	waitB = 96,
+	eat_out = 97,
+	eat_success = 98,
+	eat_fail = 99,
+	eat_successB = 100,
+	eat_successC = 101,
+	Seat = 102,
+	Seat_out = 103,
+	Seat_success = 104,
+	Seat_fail = 105,
+	Seat_successB = 106,
+	Seat_successC = 107,
+	carryP_start = 108,
+	carryP_wait = 109,
+	carryP_walk = 110,
+	carryP_throw = 111,
+	carryP_waitR = 112,
+	ride_on = 113,
+	Fjump = 114,
+	waitC = 115,
+	set_to_wait = 116,
+	star_rollB = 117,
+	Sjump = 118,
+	Sjump2 = 119,
+	Sjumped = 120,
+	get_down = 121,
+	turnB = 122,
+	turnedB = 123,
+	ice_slipF = 124,
+	ice_slipB = 125,
+	rope_swing = 126,
+	shoot = 127,
+	shoot_slip = 128,
+	shoot_slip_end = 129,
+	low_walk_start = 130,
+	low_walk = 131,
+	swim_pipe = 132,
+	door_walk = 133,
+	PL_spin_jump = 134,
+	waitL = 135,
+	waitR = 136,
+	fire_at2 = 137,
+	blow_up = 138,
+	P_slip = 139,
+	P_slip_jump = 140,
+	P_slip_jump2 = 141,
+	FjumpB = 142,
+	stamp = 143,
+	waitRB = 144,
+	waitLB = 145,
+	waitR3 = 146,
+	waitL3 = 147,
+	boss_key_get = 148,
+	balloon_wait = 149,
+	slope_waitL = 150,
+	slope_waitR = 151,
+	slope_waitL2 = 152,
+	slope_waitR2 = 153,
+	carryP_waitLB = 154,
+	carryP_waitRB = 155,
+	carry_waitL = 156,
+	carry_waitR = 157,
+	spin_jump3 = 158,
+	ride_wait = 159,
+	P_paddle_1 = 160,
+	P_paddle_2 = 161,
+	poseL = 162,
+	poseR = 163,
+	gorl_wait = 164,
+	dm_notice = 165,
+	dm_noti_wait = 166,
+	dm_surprise = 167,
+	dm_surp_wait = 168,
+	wait_select = 169,
+	course_in = 170,
+	waitD = 171,
+	waitE = 172,
+	dm_escort = 173,
+	dm_glad = 174,
+	ending_wait = 175,
+	coin_comp = 176
+};
+#endif /* PLAYERANIM_H */
diff --git a/include/sfx.h b/include/sfx.h
index 61ee664..b84e89c 100644
--- a/include/sfx.h
+++ b/include/sfx.h
@@ -4,6 +4,7 @@
 #include <common.h>

 

 enum SFX {

+	SE_NULL = -1,
 	SE_DEMO_OP_DUMMY_U = 0,
 	SE_DEMO_OP_JUMP_JR_0954f = 1,
 	SE_DEMO_OP_LAND_JR_0983f = 2,
@@ -1984,4 +1985,4 @@ enum SFX {
 	SE_GAKKI_L_2_ON = 1977
 };

 
-#endif
\ No newline at end of file
+#endif