Merge branch 'port' into port-debugger

fgsfdsfgs · May 14, 2024 · 265d21c · 265d21c
2 parents 5fea484 + 70b02da
commit 265d21c
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 6 deletions.
diff --git a/src/game/lv.c b/src/game/lv.c
@@ -1132,6 +1132,13 @@ Gfx *lvRender(Gfx *gdl)
  chr->blurdrugamount = 0;
  chr->blurnumtimesdied = 0;
  }
+
+#ifndef PLATFORM_N64
+ // reset the drug blur to 0 if it's disabled in MP settings
+ if (g_Vars.mplayerisrunning && (g_MpSetup.options & MPOPTION_NODRUGBLUR)) {
+ bluramount = 0;
+ }
+#endif
  }
  }
 

diff --git a/src/game/mplayer/scenarios/capturethecase.inc b/src/game/mplayer/scenarios/capturethecase.inc
@@ -65,10 +65,18 @@ struct menuitem g_CtcOptionsMenuItems[] = {
  MENUITEMTYPE_CHECKBOX,
  0,
  MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
- (uintptr_t)"Spawn With Weapon",
+ (uintptr_t)"Spawn With Gun",
  MPOPTION_SPAWNWITHWEAPON,
  menuhandlerMpCheckboxOption,
  },
+ {
+ MENUITEMTYPE_CHECKBOX,
+ 0,
+ MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+ (uintptr_t)"No Drug Blur",
+ MPOPTION_NODRUGBLUR,
+ menuhandlerMpCheckboxOption,
+ },
 #endif
  {
  MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/combat.inc b/src/game/mplayer/scenarios/combat.inc
@@ -60,10 +60,18 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
  MENUITEMTYPE_CHECKBOX,
  0,
  MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
- (uintptr_t)"Spawn With Weapon",
+ (uintptr_t)"Spawn With Gun",
  MPOPTION_SPAWNWITHWEAPON,
  menuhandlerMpCheckboxOption,
  },
+ {
+ MENUITEMTYPE_CHECKBOX,
+ 0,
+ MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+ (uintptr_t)"No Drug Blur",
+ MPOPTION_NODRUGBLUR,
+ menuhandlerMpCheckboxOption,
+ },
 #endif
  {
  MENUITEMTYPE_SEPARATOR,

diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc
@@ -63,10 +63,18 @@ struct menuitem g_HtmOptionsMenuItems[] = {
  MENUITEMTYPE_CHECKBOX,
  0,
  MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
- (uintptr_t)"Spawn With Weapon",
+ (uintptr_t)"Spawn With Gun",
  MPOPTION_SPAWNWITHWEAPON,
  menuhandlerMpCheckboxOption,
  },
+ {
+ MENUITEMTYPE_CHECKBOX,
+ 0,
+ MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+ (uintptr_t)"No Drug Blur",
+ MPOPTION_NODRUGBLUR,
+ menuhandlerMpCheckboxOption,
+ },
 #endif
  {
  MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc
@@ -63,10 +63,18 @@ struct menuitem g_HtbOptionsMenuItems[] = {
  MENUITEMTYPE_CHECKBOX,
  0,
  MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
- (uintptr_t)"Spawn With Weapon",
+ (uintptr_t)"Spawn With Gun",
  MPOPTION_SPAWNWITHWEAPON,
  menuhandlerMpCheckboxOption,
  },
+ {
+ MENUITEMTYPE_CHECKBOX,
+ 0,
+ MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+ (uintptr_t)"No Drug Blur",
+ MPOPTION_NODRUGBLUR,
+ menuhandlerMpCheckboxOption,
+ },
 #endif
  {
  MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc
@@ -84,10 +84,18 @@ struct menuitem g_KohOptionsMenuItems[] = {
  MENUITEMTYPE_CHECKBOX,
  0,
  MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
- (uintptr_t)"Spawn With Weapon",
+ (uintptr_t)"Spawn With Gun",
  MPOPTION_SPAWNWITHWEAPON,
  menuhandlerMpCheckboxOption,
  },
+ {
+ MENUITEMTYPE_CHECKBOX,
+ 0,
+ MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+ (uintptr_t)"No Drug Blur",
+ MPOPTION_NODRUGBLUR,
+ menuhandlerMpCheckboxOption,
+ },
 #endif
  {
  MENUITEMTYPE_CHECKBOX,

diff --git a/src/game/mplayer/scenarios/popacap.inc b/src/game/mplayer/scenarios/popacap.inc
@@ -61,10 +61,18 @@ struct menuitem g_PacOptionsMenuItems[] = {
  MENUITEMTYPE_CHECKBOX,
  0,
  MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
- (uintptr_t)"Spawn With Weapon",
+ (uintptr_t)"Spawn With Gun",
  MPOPTION_SPAWNWITHWEAPON,
  menuhandlerMpCheckboxOption,
  },
+ {
+ MENUITEMTYPE_CHECKBOX,
+ 0,
+ MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
+ (uintptr_t)"No Drug Blur",
+ MPOPTION_NODRUGBLUR,
+ menuhandlerMpCheckboxOption,
+ },
 #endif
  {
  MENUITEMTYPE_CHECKBOX,

diff --git a/src/include/constants.h b/src/include/constants.h
@@ -2891,6 +2891,7 @@
 #define MPOPTION_PAC_HIGHLIGHTTARGET 0x00080000
 #define MPOPTION_PAC_SHOWONRADAR 0x00100000
 #define MPOPTION_SPAWNWITHWEAPON 0x00200000
+#define MPOPTION_NODRUGBLUR 0x00400000
 
 #define MPPAUSEMODE_UNPAUSED 0
 #define MPPAUSEMODE_PAUSED 1