diff --git a/src/game/lv.c b/src/game/lv.c index e4b066709..c3273c6c6 100644 --- a/src/game/lv.c +++ b/src/game/lv.c @@ -1127,10 +1127,10 @@ Gfx *lvRender(Gfx *gdl) chr->blurdrugamount = 0; chr->blurnumtimesdied = 0; } -#ifndef PLATFORM_N64 //set the drug blur to 0 if it's disabled in MP settings. There might be a better way to block it from occuring, but this one works just fine - - if(g_Vars.mplayerisrunning && (g_MpSetup.options & MPOPTION_NODRUGBLUR)) - { + +#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 index 2addfbfde..529fd2916 100644 --- a/src/game/mplayer/scenarios/capturethecase.inc +++ b/src/game/mplayer/scenarios/capturethecase.inc @@ -65,7 +65,7 @@ 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, }, @@ -73,7 +73,7 @@ struct menuitem g_CtcOptionsMenuItems[] = { MENUITEMTYPE_CHECKBOX, 0, MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT, - (uintptr_t)"No melee/tranquilizer blur", + (uintptr_t)"No Drug Blur", MPOPTION_NODRUGBLUR, menuhandlerMpCheckboxOption, }, diff --git a/src/game/mplayer/scenarios/combat.inc b/src/game/mplayer/scenarios/combat.inc index 76da12a16..9e58b6b65 100644 --- a/src/game/mplayer/scenarios/combat.inc +++ b/src/game/mplayer/scenarios/combat.inc @@ -60,7 +60,7 @@ 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, }, @@ -68,7 +68,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = { MENUITEMTYPE_CHECKBOX, 0, MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT, - (uintptr_t)"No melee/tranquilizer blur", + (uintptr_t)"No Drug Blur", MPOPTION_NODRUGBLUR, menuhandlerMpCheckboxOption, }, diff --git a/src/game/mplayer/scenarios/hackthatmac.inc b/src/game/mplayer/scenarios/hackthatmac.inc index bc55d75b8..a158bf9d5 100644 --- a/src/game/mplayer/scenarios/hackthatmac.inc +++ b/src/game/mplayer/scenarios/hackthatmac.inc @@ -63,7 +63,7 @@ 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, }, @@ -71,7 +71,7 @@ struct menuitem g_HtmOptionsMenuItems[] = { MENUITEMTYPE_CHECKBOX, 0, MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT, - (uintptr_t)"No melee/tranquilizer blur", + (uintptr_t)"No Drug Blur", MPOPTION_NODRUGBLUR, menuhandlerMpCheckboxOption, }, diff --git a/src/game/mplayer/scenarios/holdthebriefcase.inc b/src/game/mplayer/scenarios/holdthebriefcase.inc index a0692c5e9..39f98a728 100644 --- a/src/game/mplayer/scenarios/holdthebriefcase.inc +++ b/src/game/mplayer/scenarios/holdthebriefcase.inc @@ -63,7 +63,7 @@ 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, }, @@ -71,7 +71,7 @@ struct menuitem g_HtbOptionsMenuItems[] = { MENUITEMTYPE_CHECKBOX, 0, MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT, - (uintptr_t)"No melee/tranquilizer blur", + (uintptr_t)"No Drug Blur", MPOPTION_NODRUGBLUR, menuhandlerMpCheckboxOption, }, diff --git a/src/game/mplayer/scenarios/kingofthehill.inc b/src/game/mplayer/scenarios/kingofthehill.inc index 2d7857580..2a4d5c7aa 100644 --- a/src/game/mplayer/scenarios/kingofthehill.inc +++ b/src/game/mplayer/scenarios/kingofthehill.inc @@ -84,7 +84,7 @@ 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, }, @@ -92,7 +92,7 @@ struct menuitem g_KohOptionsMenuItems[] = { MENUITEMTYPE_CHECKBOX, 0, MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT, - (uintptr_t)"No melee/tranquilizer blur", + (uintptr_t)"No Drug Blur", MPOPTION_NODRUGBLUR, menuhandlerMpCheckboxOption, }, diff --git a/src/game/mplayer/scenarios/popacap.inc b/src/game/mplayer/scenarios/popacap.inc index faea5dd70..26221b569 100644 --- a/src/game/mplayer/scenarios/popacap.inc +++ b/src/game/mplayer/scenarios/popacap.inc @@ -61,7 +61,7 @@ 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, }, @@ -69,7 +69,7 @@ struct menuitem g_PacOptionsMenuItems[] = { MENUITEMTYPE_CHECKBOX, 0, MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT, - (uintptr_t)"No melee/tranquilizer blur", + (uintptr_t)"No Drug Blur", MPOPTION_NODRUGBLUR, menuhandlerMpCheckboxOption, },