popux/perfect_dark
1
0 Fork 0
forked from Ports/perfect_dark
Code Pull Requests Activity

port-no-doors: moved new MP options to a new menu

Browse Source
This commit is contained in:
Raf committed 2025-05-28 20:59:36 -03:00
1 parent c866940873
commit a70868fba0
6 files changed
+23 -213
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/mplayer/scenarios/capturethecase.inc
+4 -35
View File
@@ -11,6 +11,8 @@
* Players cannot score unless their briefcase is at the home base.
*/
extern struct menudialogdef g_ExtGameOptionsMenuDialog;
struct menuitem g_CtcOptionsMenuItems[] = {
{
MENUITEMTYPE_CHECKBOX,
@@ -60,40 +62,6 @@ struct menuitem g_CtcOptionsMenuItems[] = {
MPOPTION_NOAUTOAIM,
menuhandlerMpCheckboxOption,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Drug Blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR,
L_OPTIONS_257, // "Friendly Fire"
MPOPTION_FRIENDLYFIRE,
menuhandlerMpDisplayTeam,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Player on Radar",
MPOPTION_NOPLAYERONRADAR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
0,
@@ -143,7 +111,8 @@ struct menudialogdef g_CtcOptionsMenuDialog = {
g_CtcOptionsMenuItems,
mpOptionsMenuDialog,
MENUDIALOGFLAG_MPLOCKABLE,
NULL,
&g_ExtGameOptionsMenuDialog,
// NULL,
};
struct weaponobj g_CtcTokenObj0;
src/game/mplayer/scenarios/combat.inc
+3 -35
View File
@@ -6,6 +6,8 @@
* There are no callback functions or special logic.
*/
extern struct menudialogdef g_ExtGameOptionsMenuDialog;
struct menuitem g_MpCombatOptionsMenuItems[] = {
{
MENUITEMTYPE_CHECKBOX,
@@ -55,40 +57,6 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
MPOPTION_NOAUTOAIM,
menuhandlerMpCheckboxOption,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Drug Blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR,
L_OPTIONS_257, // "Friendly Fire"
MPOPTION_FRIENDLYFIRE,
menuhandlerMpDisplayTeam,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Player on Radar",
MPOPTION_NOPLAYERONRADAR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_SEPARATOR,
0,
@@ -138,5 +106,5 @@ struct menudialogdef g_MpCombatOptionsMenuDialog = {
g_MpCombatOptionsMenuItems,
mpOptionsMenuDialog,
MENUDIALOGFLAG_MPLOCKABLE,
NULL,
&g_ExtGameOptionsMenuDialog,
};
src/game/mplayer/scenarios/hackthatmac.inc
+3 -35
View File
@@ -7,6 +7,8 @@
* cannot use weapons while uplinking.
*/
extern struct menudialogdef g_ExtGameOptionsMenuDialog;
#define HTM_NUM_TERMINALS 1
struct menuitem g_HtmOptionsMenuItems[] = {
@@ -58,40 +60,6 @@ struct menuitem g_HtmOptionsMenuItems[] = {
MPOPTION_NOAUTOAIM,
menuhandlerMpCheckboxOption,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Drug Blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR,
L_OPTIONS_257, // "Friendly Fire"
MPOPTION_FRIENDLYFIRE,
menuhandlerMpDisplayTeam,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Player on Radar",
MPOPTION_NOPLAYERONRADAR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
0,
@@ -149,7 +117,7 @@ struct menudialogdef g_HtmOptionsMenuDialog = {
g_HtmOptionsMenuItems,
mpOptionsMenuDialog,
MENUDIALOGFLAG_MPLOCKABLE,
NULL,
&g_ExtGameOptionsMenuDialog,
};
struct weaponobj g_HtmUplinkObj;
src/game/mplayer/scenarios/holdthebriefcase.inc
+3 -35
View File
@@ -9,6 +9,8 @@
* slightly slower but still have full access to their weaponry.
*/
extern struct menudialogdef g_ExtGameOptionsMenuDialog;
struct menuitem g_HtbOptionsMenuItems[] = {
{
MENUITEMTYPE_CHECKBOX,
@@ -58,40 +60,6 @@ struct menuitem g_HtbOptionsMenuItems[] = {
MPOPTION_NOAUTOAIM,
menuhandlerMpCheckboxOption,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Drug Blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR,
L_OPTIONS_257, // "Friendly Fire"
MPOPTION_FRIENDLYFIRE,
menuhandlerMpDisplayTeam,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Player on Radar",
MPOPTION_NOPLAYERONRADAR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
0,
@@ -149,7 +117,7 @@ struct menudialogdef g_HtbOptionsMenuDialog = {
g_HtbOptionsMenuItems,
mpOptionsMenuDialog,
MENUDIALOGFLAG_MPLOCKABLE,
NULL,
&g_ExtGameOptionsMenuDialog,
};
struct defaultobj *var800869ec = NULL;
src/game/mplayer/scenarios/kingofthehill.inc
+7 -38
View File
@@ -13,6 +13,8 @@
* Points are awarded to each player in the hill at the time that it is won.
*/
extern struct menudialogdef g_ExtGameOptionsMenuDialog;
MenuItemHandlerResult menuhandlerMpHillTime(s32 operation, struct menuitem *item, union handlerdata *data)
{
switch (operation) {
@@ -79,40 +81,6 @@ struct menuitem g_KohOptionsMenuItems[] = {
MPOPTION_NOAUTOAIM,
menuhandlerMpCheckboxOption,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Drug Blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR,
L_OPTIONS_257, // "Friendly Fire"
MPOPTION_FRIENDLYFIRE,
menuhandlerMpDisplayTeam,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Player on Radar",
MPOPTION_NOPLAYERONRADAR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
0,
@@ -178,17 +146,18 @@ struct menudialogdef g_KohOptionsMenuDialog = {
g_KohOptionsMenuItems,
mpOptionsMenuDialog,
MENUDIALOGFLAG_MPLOCKABLE,
NULL,
&g_ExtGameOptionsMenuDialog,
};
void kohReadSave(struct savebuffer *buffer)
void kohReadSave(struct savebuffer *buffer, u8 version)
{
g_Vars.mphilltime = savebufferReadBits(buffer, 8);
u8 sz = version > 0 ? 32 : 8;
g_Vars.mphilltime = savebufferReadBits(buffer, sz);
}
void kohWriteSave(struct savebuffer *buffer)
{
savebufferOr(buffer, g_Vars.mphilltime, 8);
savebufferOr(buffer, g_Vars.mphilltime, 32);
}
void kohInit(void)
src/game/mplayer/scenarios/popacap.inc
+3 -35
View File
@@ -7,6 +7,8 @@
* chosen as the victim.
*/
extern struct menudialogdef g_ExtGameOptionsMenuDialog;
struct menuitem g_PacOptionsMenuItems[] = {
{
MENUITEMTYPE_CHECKBOX,
@@ -56,40 +58,6 @@ struct menuitem g_PacOptionsMenuItems[] = {
MPOPTION_NOAUTOAIM,
menuhandlerMpCheckboxOption,
},
#ifndef PLATFORM_N64
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Drug Blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR,
L_OPTIONS_257, // "Friendly Fire"
MPOPTION_FRIENDLYFIRE,
menuhandlerMpDisplayTeam,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No Player on Radar",
MPOPTION_NOPLAYERONRADAR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
0,
@@ -147,7 +115,7 @@ struct menudialogdef g_PacOptionsMenuDialog = {
g_PacOptionsMenuItems,
mpOptionsMenuDialog,
MENUDIALOGFLAG_MPLOCKABLE,
NULL,
&g_ExtGameOptionsMenuDialog,
};
void pacReset(void)