GitHub/ReGameDLL_CS
2
0
Fork 0
mirror of https://github.com/s1lentq/ReGameDLL_CS.git synced 2024-10-16 23:37:00 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix: ammo/weapons respawn behavior (#982)

Browse Source 
* `CBasePlayerAmmo`: check spawnflags on `Spawn()`

* `CBasePlayerItem`: check spawnflags on `Materialize()`

* `CBasePlayerItem`: Add `Respawn()` item when hasn't specific spawnflags

* `CBasePlayerItem`: remove `SF_NORESPAWN` flag on `Respawn()`

* Use forgotten `AMMO_RESPAWN_TIME`
This commit is contained in:
Sergey Shorokhov 2024-08-03 20:11:08 +03:00 committed by GitHub
parent 576e967cbd
commit a202425dd7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
regamedll/dlls/ammo.cpp
View File

@ -10,7 +10,11 @@ void CBasePlayerAmmo::Spawn()
SetTouch(&CBasePlayerAmmo::DefaultTouch); SetTouch(&CBasePlayerAmmo::DefaultTouch);
if (g_pGameRules->IsMultiplayer()) if (g_pGameRules->IsMultiplayer()
#ifdef REGAMEDLL_FIXES
&& g_pGameRules->AmmoShouldRespawn(this) == GR_AMMO_RESPAWN_NO
#endif
)
{ {
SetThink(&CBaseEntity::SUB_Remove); SetThink(&CBaseEntity::SUB_Remove);
pev->nextthink = gpGlobals->time + 2.0f; pev->nextthink = gpGlobals->time + 2.0f;

2
regamedll/dlls/multiplay_gamerules.cpp
View File

@ -4321,7 +4321,7 @@ int CHalfLifeMultiplay::AmmoShouldRespawn(CBasePlayerAmmo *pAmmo)
float CHalfLifeMultiplay::FlAmmoRespawnTime(CBasePlayerAmmo *pAmmo) float CHalfLifeMultiplay::FlAmmoRespawnTime(CBasePlayerAmmo *pAmmo)
{ {
return gpGlobals->time + 20.0f; return gpGlobals->time + AMMO_RESPAWN_TIME;
} }
Vector CHalfLifeMultiplay::VecAmmoRespawnSpot(CBasePlayerAmmo *pAmmo) Vector CHalfLifeMultiplay::VecAmmoRespawnSpot(CBasePlayerAmmo *pAmmo)

16
regamedll/dlls/weapons.cpp
View File

@ -518,7 +518,11 @@ void CBasePlayerItem::Materialize()
UTIL_SetOrigin(pev, pev->origin); UTIL_SetOrigin(pev, pev->origin);
SetTouch(&CBasePlayerItem::DefaultTouch); SetTouch(&CBasePlayerItem::DefaultTouch);
if (g_pGameRules->IsMultiplayer()) if (g_pGameRules->IsMultiplayer()
#ifdef REGAMEDLL_FIXES
&& g_pGameRules->WeaponShouldRespawn(this) == GR_WEAPON_RESPAWN_NO
#endif
)
{ {
if (!CanDrop()) if (!CanDrop())
{ {
@ -555,8 +559,12 @@ void CBasePlayerItem::CheckRespawn()
{ {
switch (g_pGameRules->WeaponShouldRespawn(this)) switch (g_pGameRules->WeaponShouldRespawn(this))
{ {
case GR_WEAPON_RESPAWN_YES: case GR_WEAPON_RESPAWN_YES: {
#ifdef REGAMEDLL_FIXES
Respawn();
#endif
return; return;
}
case GR_WEAPON_RESPAWN_NO: case GR_WEAPON_RESPAWN_NO:
return; return;
} }
@ -575,6 +583,10 @@ CBaseEntity *CBasePlayerItem::Respawn()
// invisible for now // invisible for now
pNewWeapon->pev->effects |= EF_NODRAW; pNewWeapon->pev->effects |= EF_NODRAW;
#ifdef REGAMEDLL_ADD
pNewWeapon->pev->spawnflags &= ~SF_NORESPAWN;
#endif
// no touch // no touch
pNewWeapon->SetTouch(nullptr); pNewWeapon->SetTouch(nullptr);
pNewWeapon->SetThink(&CBasePlayerItem::AttemptToMaterialize); pNewWeapon->SetThink(&CBasePlayerItem::AttemptToMaterialize);