Split scenarios into .inc files

src/include/game/mplayer/scenarios.h

@@ -7,55 +7,27 @@
 extern struct menudialog g_MpScenarioMenuDialog;
 extern struct menudialog g_MpQuickTeamScenarioMenuDialog;
 
-void scenarioHtbInit(void);
-s32 scenarioHtbCallback08(void);
-void scenarioHtbReset(void);
-void scenarioHtbTick(void);
-void scenarioHtbCallback14(struct chrdata *chr);
-void scenarioHtbCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths);
-Gfx *scenarioHtbRadar(Gfx *gdl);
-bool scenarioHtbRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioHtbHighlight(struct prop *prop, s32 *colour);
-void scenarioCtcInit(void);
-s32 scenarioCtcCallback08(void);
-void scenarioCtcTick(void);
-void scenarioCtcCallback14(struct chrdata *chr);
-void scenarioCtcCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths);
-Gfx *scenarioCtcRadar(Gfx *gdl);
-bool scenarioCtcRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioCtcChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
-s32 scenarioCtcGetMaxTeams(void);
-bool scenarioCtcIsRoomHighlighted(s16 room);
-s32 menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data);
-void scenarioKohReadSave(struct savebuffer *buffer);
-void scenarioKohWriteSave(struct savebuffer *buffer);
-void scenarioKohInit(void);
-void scenarioKohReset(void);
-void scenarioKohCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths);
-Gfx *scenarioKohRadar(Gfx *gdl);
-bool scenarioKohIsRoomHighlighted(s16 arg0);
-void scenarioHtmInit(void);
-s32 scenarioHtmCallback08(void);
-void scenarioHtmTick(void);
-void scenarioHtmCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths);
-bool scenarioHtmRadar2(Gfx **gdl, struct prop *prop);
-bool scenarioHtmHighlight(struct prop *prop, s32 *colour);
-void scenarioPacInit(void);
-void scenarioPacReset(void);
-void scenarioPacCalculatePlayerScore(struct mpchrconfig *mpchr, s32 mpchrnum, s32 *score, s32 *deaths);
-Gfx *scenarioPacRadar(Gfx *gdl);
+struct mpscenariooverview {
+	u16 name;
+	u16 shortname;
+	u8 requirefeature;
+	u8 teamonly;
+};
+
+extern struct mpscenariooverview g_MpScenarioOverviews[6];
+
 s32 menuhandlerMpOpenOptions(s32 operation, struct menuitem *item, union handlerdata *data);
 void scenarioReadSave(struct savebuffer *buffer);
 void scenarioWriteSave(struct savebuffer *buffer);
 void scenarioInit(void);
-s32 scenarioCallback08(void);
-void scenarioReset(void);
+s32 scenarioNumProps(void);
+void scenarioInitProps(void);
 void scenarioTick(void);
-void scenarioCallback14(struct chrdata *chr);
-Gfx *scenarioRadar(Gfx *gdl);
-bool scenarioRadar2(Gfx **gdl, struct prop *prop);
+void scenarioTickChr(struct chrdata *chr);
+Gfx *scenarioRadarExtra(Gfx *gdl);
+bool scenarioRadarChr(Gfx **gdl, struct prop *prop);
 f32 scenarioChooseSpawnLocation(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop);
 s32 scenarioGetMaxTeams(void);
-void scenarioCallback38(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
+void scenarioHighlightRoom(s16 room, s32 *arg1, s32 *arg2, s32 *arg3);
 
 #endif

src/include/game/mplayer/setup.h

@@ -73,49 +73,49 @@ s32 mpQuickTeamSimulantDifficultyHandler(s32 operation, struct menuitem *item, u
 u32 func0f17fa28(void);
 void func0f17fcb0(s32 silent);
 s32 menuhandlerMpSlowMotion(s32 operation, struct menuitem *item, union handlerdata *data);
-void mpHtbAddPad(s16 padnum);
-void scenarioHtmRemoveAmmoCrateAtPad(s16 padnum);
-void func0f180078(void);
-void scenarioHtbCreateToken(void);
-Gfx *scenarioHtbRenderHud(Gfx *gdl);
-void scenarioCtcReset(void);
-bool scenarioCtcHighlight(struct prop *prop, s32 *colour);
-void mpCtcAddPad(s32 *cmd);
-void scenarioCtcCallback38(s16 roomnum, s32 *arg1, s32 *arg2, s32 *arg3);
-void scenarioKohTick(void);
-Gfx *scenarioKohRenderHud(Gfx *gdl);
-void mpKohAddHill(s32 *cmd);
-void scenarioKohCallback38(s16 roomnum, s32 *arg1, s32 *arg2, s32 *arg3);
-void mpHtmAddPad(s16 padnum);
-void func0f182bf4(void);
-void scenarioHtmCreateUplink(void);
-void scenarioHtmReset(void);
-void scenarioHtmCallback14(struct chrdata *chr);
-Gfx *scenarioHtmRenderHud(Gfx *gdl);
-Gfx *scenarioHtmRadar(Gfx *gdl);
-void scenarioPacChooseVictims(void);
-bool scenarioPacHighlight(struct prop *prop, s32 *colour);
-void scenarioPacApplyNextVictim(void);
-void scenarioPacHandleDeath(s32 cplayernum, s32 vplayernum);
-void scenarioPacTick(void);
-Gfx *scenarioPacRenderHud(Gfx *gdl);
-bool scenarioPacRadar2(Gfx **gdl, struct prop *prop);
+void htbAddPad(s16 padnum);
+void htbRemoveAmmoCrateAtPad(s16 padnum);
+void htbReset(void);
+void htbCreateToken(void);
+Gfx *htbRenderHud(Gfx *gdl);
+void ctcInitProps(void);
+bool ctcHighlightProp(struct prop *prop, s32 *colour);
+void ctcAddPad(s32 *cmd);
+void ctcHighlightRoom(s16 roomnum, s32 *arg1, s32 *arg2, s32 *arg3);
+void kohTick(void);
+Gfx *kohRenderHud(Gfx *gdl);
+void kohAddHill(s32 *cmd);
+void kohHighlightRoom(s16 roomnum, s32 *arg1, s32 *arg2, s32 *arg3);
+void htmAddPad(s16 padnum);
+void htmReset(void);
+void htbCreateUplink(void);
+void htmInitProps(void);
+void htmTickChr(struct chrdata *chr);
+Gfx *htmRenderHud(Gfx *gdl);
+Gfx *htmRadarExtra(Gfx *gdl);
+void pacReset(void);
+bool pacHighlightProp(struct prop *prop, s32 *colour);
+void pacApplyNextVictim(void);
+void pacHandleDeath(s32 cplayernum, s32 vplayernum);
+void pacTick(void);
+Gfx *pacRenderHud(Gfx *gdl);
+bool pacRadarChr(Gfx **gdl, struct prop *prop);
 s32 mpOptionsMenuDialog(s32 operation, struct menudialog *dialog, union handlerdata *data);
 char *mpMenuTextScenarioShortName(struct menuitem *item);
 char *mpMenuTextScenarioName(struct menuitem *item);
 s32 scenarioScenarioMenuHandler(s32 operation, struct menuitem *item, union handlerdata *data);
-void mpCreateMatchStartHudmsgs(void);
+void scenarioCreateMatchStartHudmsgs(void);
 Gfx *scenarioRenderHud(Gfx *gdl);
 void scenarioCalculatePlayerScore(struct mpchrconfig *mpchr, s32 chrnum, s32 *arg2, s32 *arg3);
-bool scenarioHighlight(struct prop *prop, s32 *colour);
-void mpPrepareScenario(void);
+bool scenarioHighlightProp(struct prop *prop, s32 *colour);
+void scenarioReset(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);
+void scenarioCreateHudmsg(s32 playernum, char *message);
+bool scenarioChrsAreSameTeam(s32 playernum1, s32 playernum2);
 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);
+void scenarioHandleDroppedToken(struct chrdata *chr, struct prop *prop);
+s32 scenarioPickUpUplink(struct chrdata *chr, struct prop *prop);
+void scenarioHandleActivatedProp(struct chrdata *chr, struct prop *prop);
 s32 menuhandlerMpDropOut(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 menuhandlerMpTeamsLabel(s32 operation, struct menuitem *item, union handlerdata *data);
 s32 mpGetNumStages(void);