Decompile scenarioPickUpBriefcase

src/include/constants.h

@@ -29,6 +29,7 @@
 #define CRASH()             *(u8 *)0 = 69
 #define IS4MB()             (g_Is4Mb == true)
 #define IS8MB()             (g_Is4Mb != true)
+#define MPCHR(index)        ((index) < 4 ? &g_PlayerConfigsArray[index].base : &g_BotConfigsArray[(index) - 4].base)
 #define PLAYERCOUNT()       ((g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0) + (g_Vars.players[3] ? 1 : 0))
 #define PLAYERCOUNT3012()   ((g_Vars.players[3] ? 1 : 0) + (g_Vars.players[0] ? 1 : 0) + (g_Vars.players[1] ? 1 : 0) + (g_Vars.players[2] ? 1 : 0))
 #define SECSTOTIME240(secs) (secs * 240)

src/include/game/mplayer/setup.h

@@ -112,7 +112,7 @@ void mpPrepareScenario(void);
 struct prop *scenarioCreateObj(s32 modelnum, s16 padnum, f32 arg2, u32 flags, u32 flags2, u32 flags3);
 void mpCreateScenarioHudmsg(s32 playernum, char *message);
 bool mpChrsAreSameTeam(s32 arg0, s32 arg1);
-u32 chrGiveBriefcase(struct chrdata *chr, struct prop *prop);
+s32 scenarioPickUpBriefcase(struct chrdata *chr, struct prop *prop);
 void scenarioReleaseToken(struct chrdata *chr, struct prop *prop);
 s32 chrGiveUplink(struct chrdata *chr, struct prop *prop);
 void scenarioHtmActivateUplink(struct chrdata *chr, struct prop *prop);

src/include/types.h

@@ -1717,12 +1717,19 @@ struct weaponobj { // objtype 0x08
 	/*0x60*/ s8 fadeouttimer60;
 	/*0x61*/ s8 dualweaponnum;
 
-	/**
-	 * timer240 is used for activation of proxy Dragons, grenades and proxy
-	 * mines. It ticks down to 1 where it becomes active, and set to 0 when the
-	 * item should explode.
-	 */
-	/*0x62*/ s16 timer240;
+	union {
+		/**
+		 * timer240 is used for activation of proxy Dragons, grenades and proxy
+		 * mines. It ticks down to 1 where it becomes active, and set to 0 when the
+		 * item should explode.
+		 */
+		/*0x62*/ s16 timer240;
+
+		/**
+		 * team is used for MP briefcases (Capture The Case bases).
+		 */
+		/*0x62*/ s16 team;
+	};
 
 	/*0x64*/ struct weaponobj *dualweapon; // other weapon when dual wielding
 };