fn/valve
fn/valve
3
0
Fork 0
Code Issues 12 Pull requests Projects Releases Packages Wiki Activity

item_pickup: Call respawn item sound in a separate method for sanity's sake

Browse source
This commit is contained in:
Marco Cawthorne 2023-02-07 17:35:47 -08:00
parent 22d5b36d1c
commit 3a37d21257
Signed by: eukara
GPG key ID: CE2032F0A2882A22
2 changed files with 15 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/server/items.h
View file

@ -21,11 +21,12 @@ class item_pickup:NSRenderableEntity
int m_iClip;
int m_iWasDropped;
int id;
void(void) item_pickup;
void item_pickup(void);
virtual void(void) Spawned;
virtual void(entity) Touch;
virtual void(int i) SetItem;
virtual void(void) Respawn;
virtual void(int) SetFloating;
virtual void Spawned(void);
virtual void Touch(entity);
virtual void SetItem(int i);
virtual void Respawn(void);
virtual void SetFloating(int);
virtual void PickupRespawn(void);
};

16
src/server/items.qc
View file

@ -34,7 +34,7 @@ void item_pickup::Touch(entity eToucher)
Destroy();
} else {
Disappear();
ScheduleThink(Respawn, 30.0f);
ScheduleThink(PickupRespawn, 30.0f);
}
}
@ -51,6 +51,13 @@ void item_pickup::SetFloating(int i)
m_bFloating = rint(bound(0, m_bFloating, 1));
}
void
item_pickup::PickupRespawn(void)
{
Respawn();
Sound_Play(this, CHAN_ITEM, "item.respawn");
}
void item_pickup::Respawn(void)
{
SetSolid(SOLID_TRIGGER);
@ -65,13 +72,6 @@ void item_pickup::Respawn(void)
SetSize([-16,-16,0], [16,16,16]);
ReleaseThink();
if (!m_iWasDropped && cvar("sv_playerslots") > 1) {
if (!real_owner && time > 30.0f)
Sound_Play(this, CHAN_ITEM, "item.respawn");
m_iClip = -1;
}
if (!m_bFloating) {
DropToFloor();
SetMovetype(MOVETYPE_TOSS);