Game-Decompilation/PsyDoom
1
0
Fork 0
mirror of https://github.com/BodbDearg/PsyDoom.git synced 2025-02-22 06:02:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

allow force pistol start to work when advancing level

Browse Source
This commit is contained in:
ts-miller 2022-10-18 10:08:31 -04:00
parent 03001f00cb
commit fa7055cd20
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -3,4 +3,8 @@ build
# QTCreator user project file
/CMakeLists.txt.user*
CMakeSettings.json
# Visual Studio Files
.vs/
.dccache

5
game/Doom/Game/g_game.cpp
View File

@ -223,7 +223,8 @@ void G_PlayerReborn(const int32_t playerIdx) noexcept {
bool setRedSkull = false;
// Preserve from ammo, keys, and backpack from death if co-op and setting is toggled
if (gNetGame == gt_coop) {
// This is ignored if advancing to next level and 'Force Pistol Start' is true
if (gNetGame == gt_coop && player.playerstate == PST_REBORN) {
const int32_t preserveAmmoFactor = Game::gSettings.preserveAmmoFactor;
if ((preserveAmmoFactor > 0) && (preserveAmmoFactor <= 2)) {
spawnWithBackpack = player.backpack;
@ -275,7 +276,7 @@ void G_PlayerReborn(const int32_t playerIdx) noexcept {
#if PSYDOOM_MODS
player.cheats = cheatFlags; // PsyDoom: preserve cheats on level warping
// Set using preserved settings
// Set using preserved state
if (gNetGame == gt_coop) {
player.backpack = spawnWithBackpack;
// Player must start with at least 50 ammo for pistol