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

Merge branch 'port' into port-net

Browse Source
This commit is contained in:
fgsfds committed 2024-05-15 12:13:43 +02:00
2 parents e5f142b110 9edfd667b7
commit 30e987eb50
8 files changed
+10 -8
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/game/bot.c
+2 -1
View File
@@ -264,7 +264,8 @@ void botSpawn(struct chrdata *chr, u8 respawning)
#ifndef PLATFORM_N64
if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON)
&& g_MpSetup.weapons[0] != MPWEAPON_NONE
&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED) {
&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED
&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {
struct mpweapon *mpweapon = &g_MpWeapons[g_MpSetup.weapons[0]];
botinvGiveSingleWeapon(chr, mpweapon->weaponnum);
botactGiveAmmoByType(aibot, mpweapon->priammotype - 1, mpweapon->priammoqty / 2);
src/game/mplayer/scenarios/capturethecase.inc
+1 -1
View File
@@ -65,7 +65,7 @@ struct menuitem g_CtcOptionsMenuItems[] = {
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Spawn With Gun",
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
src/game/mplayer/scenarios/combat.inc
+1 -1
View File
@@ -60,7 +60,7 @@ struct menuitem g_MpCombatOptionsMenuItems[] = {
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Spawn With Gun",
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
src/game/mplayer/scenarios/hackthatmac.inc
+1 -1
View File
@@ -63,7 +63,7 @@ struct menuitem g_HtmOptionsMenuItems[] = {
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Spawn With Gun",
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
src/game/mplayer/scenarios/holdthebriefcase.inc
+1 -1
View File
@@ -63,7 +63,7 @@ struct menuitem g_HtbOptionsMenuItems[] = {
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Spawn With Gun",
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
src/game/mplayer/scenarios/kingofthehill.inc
+1 -1
View File
@@ -84,7 +84,7 @@ struct menuitem g_KohOptionsMenuItems[] = {
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Spawn With Gun",
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
src/game/mplayer/scenarios/popacap.inc
+1 -1
View File
@@ -61,7 +61,7 @@ struct menuitem g_PacOptionsMenuItems[] = {
MENUITEMTYPE_CHECKBOX,
0,
MENUITEMFLAG_LOCKABLEMINOR | MENUITEMFLAG_LITERAL_TEXT,
(uintptr_t)"Spawn With Gun",
(uintptr_t)"Start Armed",
MPOPTION_SPAWNWITHWEAPON,
menuhandlerMpCheckboxOption,
},
src/game/player.c
+2 -1
View File
@@ -1111,7 +1111,8 @@ void playerSpawn(void)
if ((g_MpSetup.options & MPOPTION_SPAWNWITHWEAPON)
&& g_MpSetup.weapons[0] != MPWEAPON_NONE
&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED) {
&& g_MpSetup.weapons[0] != MPWEAPON_DISABLED
&& g_MpSetup.weapons[0] != MPWEAPON_SHIELD) {
struct mpweapon *mpweapon = &g_MpWeapons[g_MpSetup.weapons[0]];
invGiveSingleWeapon(mpweapon->weaponnum);
bgunEquipWeapon2(HAND_LEFT, WEAPON_NONE);