Add an option in Combat Simulator to disable the blur effect from melee damage

This effect might be annoyning or eye straining for some people so i believe it's a good idea to implement this option. There is still some free space in the MP Options bitfield for future expansion.
This commit is contained in:
Not actually throwaway committed 2024-04-24 22:54:15 +02:00
1 parent b4f7f467c0
commit 5b1d03cbbb
8 files changed
+56

No files matched your search

+7
View File
@@ -1127,6 +1127,13 @@ 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))
{
bluramount = 0;
}
#endif
}
}
@@ -69,6 +69,14 @@ struct menuitem g_CtcOptionsMenuItems[] = {
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No melee/tranquilizer blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
+8
View File
@@ -64,6 +64,14 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No melee/tranquilizer blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_SEPARATOR,
@@ -67,6 +67,14 @@ struct menuitem g_HtmOptionsMenuItems[] = {
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No melee/tranquilizer blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
@@ -67,6 +67,14 @@ struct menuitem g_HtbOptionsMenuItems[] = {
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No melee/tranquilizer blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
@@ -88,6 +88,14 @@ struct menuitem g_KohOptionsMenuItems[] = {
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No melee/tranquilizer blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
+8
View File
@@ -65,6 +65,14 @@ struct menuitem g_PacOptionsMenuItems[] = {
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
{
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"No melee/tranquilizer blur",
MPOPTION_NODRUGBLUR,
menuhandlerMpCheckboxOption,
},
#endif
{
MENUITEMTYPE_CHECKBOX,
+1
View File
@@ -2890,6 +2890,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