nuclide-ports/cstrike
nuclide-ports
/
cstrike
3
0
Fork 0
Code Issues 5 Pull Requests Projects Releases Wiki Activity

armoury_entity: Minor cleanup

This commit is contained in:
Marco Cawthorne 2022-08-19 15:03:27 -07:00
parent 8b4a444387
commit f6f7fcd2e5
Signed by: eukara
GPG Key ID: CE2032F0A2882A22
1 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/server/armoury_entity.qc
View File

@ -104,11 +104,56 @@ class armoury_entity:NSRenderableEntity
int m_iID;
void(void) armoury_entity;
virtual void(float) Save;
virtual void(string,string) Restore;
virtual void(entity) Touch;
virtual void(void) Respawn;
virtual void(string, string) SpawnKey;
};
void
armoury_entity::armoury_entity(void)
{
if (autocvar_fcs_nopickups == TRUE) {
Destroy();
return;
}
precache_sound("items/gunpickup2.wav");
precache_sound("items/tr_kevlar.wav");
m_iID = 0;
m_iCount = 1;
m_iLeft = 0;
}
void
armoury_entity::Save(float handle)
{
super::Save(handle);
SaveInt(handle, "m_iID", m_iID);
SaveInt(handle, "m_iCount", m_iCount);
SaveInt(handle, "m_iLeft", m_iLeft);
}
void
armoury_entity::Restore(string strKey, string strValue)
{
switch (strKey) {
case "m_iID":
m_iID = ReadInt(strValue);
break;
case "m_iCount":
m_iCount = ReadInt(strValue);
break;
case "m_iLeft":
m_iLeft = ReadInt(strValue);
break;
default:
super::Restore(strKey, strValue);
}
}
void
armoury_entity::Touch(entity eToucher)
{
@ -140,7 +185,7 @@ armoury_entity::Touch(entity eToucher)
return;
sound(pl, CHAN_ITEM, "items/tr_kevlar.wav", 1, ATTN_NORM);
} else {
} else { /* weapon pickup code */
if (Weapons_AddItem(pl, g_cstrike_armouryitems[m_iID], -1) == FALSE)
return;
@ -149,6 +194,7 @@ armoury_entity::Touch(entity eToucher)
Logging_Pickup(pl, this, __NULL__);
m_iLeft--;
if (m_iLeft <= 0) {
Hide();
}
@ -184,18 +230,3 @@ armoury_entity::SpawnKey(string strKey, string strValue)
break;
}
}
void
armoury_entity::armoury_entity(void)
{
if (autocvar_fcs_nopickups == TRUE) {
remove(this);
return;
}
precache_sound("items/gunpickup2.wav");
precache_sound("items/tr_kevlar.wav");
m_iID = 0;
m_iCount = 1;
super::NSRenderableEntity();
}