mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-27 06:44:48 -04:00
Code Issues Packages Projects Releases Wiki Activity

Split scenarios into .inc files

Browse Source
This commit is contained in:
Ryan Dwyer
2022-01-09 00:14:43 +10:00
parent df3c389b1c
commit 4167ec8c89
25 changed files with 2897 additions and 2845 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/include/data.h
+5 -6
View File
@@ -489,12 +489,11 @@ extern struct menudialog g_MpQuickTeamGameSetupMenuDialog;
extern struct menudialog g_MpQuickTeamMenuDialog;
extern struct menudialog g_CombatSimulatorMenuDialog;
extern struct menudialog g_MpCombatOptionsMenuDialog;
extern struct menudialog g_MpBriefcaseOptionsMenuDialog;
extern struct menudialog g_MpCaptureOptionsMenuDialog;
extern struct menudialog g_MpHillOptionsMenuDialog;
extern struct menudialog g_MpHackerOptionsMenuDialog;
extern struct menudialog g_MpPopacapOptionsMenuDialog;
extern struct mpscenariooverview g_MpScenarioOverviews[];
extern struct menudialog g_HtbOptionsMenuDialog;
extern struct menudialog g_CtcOptionsMenuDialog;
extern struct menudialog g_KohOptionsMenuDialog;
extern struct menudialog g_HtmOptionsMenuDialog;
extern struct menudialog g_PacOptionsMenuDialog;
extern struct menudialog g_MpScenarioMenuDialog;
extern struct menudialog g_MpQuickTeamScenarioMenuDialog;
extern s32 var80087260;
src/include/game/mplayer/scenarios.h
+15 -43
View File
@@ -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
+35 -35
View File
@@ -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);
src/include/types.h
+5 -32
View File
@@ -4673,34 +4673,6 @@ struct savebuffer {
u8 bytes[220];
};
struct mpscenario {
struct menudialog *optionsdialog;
void (*initfunc)(void);
s32 (*unk08)(void);
void (*resetfunc)(void);
void (*tickfunc)(void);
void (*unk14)(struct chrdata *chr);
Gfx *(*hudfunc)(Gfx *gdl);
void (*calcscorefunc)(struct mpchrconfig *mpchr, s32 chrnum, s32 *score, s32 *deaths);
Gfx *(*radarfunc)(Gfx *gdl);
bool (*radar2func)(Gfx **gdl, struct prop *prop);
bool (*highlightfunc)(struct prop *prop, s32 *colour);
bool (*spawnfunc)(f32 arg0, struct coord *pos, s16 *rooms, struct prop *prop, f32 *arg4);
s32 (*maxteamsfunc)(void);
bool (*isroomhighlightedfunc)(s16 room);
void (*unk38)(s16 arg0, s32 *arg1, s32 *arg2, s32 *arg3);
void *unk3c;
void (*readsavefunc)(struct savebuffer *buffer);
void (*writesavefunc)(struct savebuffer *buffer);
};
struct mpscenariooverview {
u16 name;
u16 shortname;
u8 requirefeature;
u8 teamonly;
};
struct mparena {
s16 stagenum;
u8 requirefeature;
@@ -4768,8 +4740,8 @@ struct htmterminal {
};
struct scenariodata_htm {
/*0x800ac110*/ s16 nextindex;
/*0x800ac112*/ s16 unk002;
/*0x800ac110*/ s16 numpads;
/*0x800ac112*/ s16 numterminals;
/*0x800ac114*/ s16 padnums[60];
/*0x800ac18c*/ struct htmterminal terminals[7]; // only the first element is used
/*0x800ac1e0*/ s16 dlplayernum;
@@ -4780,6 +4752,7 @@ struct scenariodata_htm {
/*0x800ac248*/ u32 unk138;
/*0x800ac24c*/ struct prop *uplink;
/*0x800ac250*/ u32 unk140;
/*0x800ac250*/ u32 unk144;
};
struct scenariodata_pac {
@@ -4787,8 +4760,8 @@ struct scenariodata_pac {
u16 age240;
s32 victimindex;
s16 victims[12]; // shuffled list of player numbers
s16 unk20[12];
s16 wincounts[12]; // indexed by player num
s16 killcounts[12]; // indexed by player num
s16 survivalcounts[12]; // indexed by player num
};
struct scenariodata_koh {