Skip to content

Conversation

@Rainyan
Copy link
Collaborator

@Rainyan Rainyan commented Sep 25, 2025

Description

Fix regression from 20b5821

We need to run the base class code for CNEO_Player::BumpWeapon even in the IsDead case, because the current weapon spawning logic is reliant on it for game modes other than CTG.

This is just a hotfix, this whole thing could use a rework. For example it appears we apply GiveDefaultItems several times pointlessly, which could be cleaned up also.

Toolchain

  • Windows MSVC VS2022

Linked Issues

Fix regression from 20b5821

We need to run the BaseClass code for CNEO_Player::BumpWeapon
even in the IsDead case, because the current weapon spawning logic is
reliant on it for game modes other than CTG.

This is just a hotfix, this whole thing could use a rework. For example
it appears we apply GiveDefaultItems several times pointlessly, which
could be cleaned up also.
@Rainyan Rainyan requested a review from DESTROYGIRL September 25, 2025 01:40
@Rainyan
Copy link
Collaborator Author

Rainyan commented Sep 25, 2025

Also, we're now calling Weapon_Equip in the BaseClass::BumpWeapon regardless of the IsDead check, so I guess this renders it somewhat moot... At least the floating guns should be visually hidden by the previous patch's ShouldDraw guard, but that won't prevent the situation from occurring. I wonder if it's to do with GiveDefaultItems being called to dead players under some conditions? Should definitely revisit at some point.

@sunzenshen sunzenshen requested a review from a team September 25, 2025 04:26
Copy link
Contributor

@DESTROYGIRL DESTROYGIRL left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works

@Rainyan Rainyan merged commit 810e611 into NeotokyoRebuild:master Sep 26, 2025
7 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Spectators can spawn guns

3 participants