fn/tfc
fn/tfc
3
0
Fork 0
Code Issues11 Pull requests Projects Releases Packages Wiki Activity

Minor cleanup around some well deserved warnings

Browse source
This commit is contained in:
Marco Cawthorne 2022-07-10 13:21:16 -07:00
parent e78ae3cf86
commit e2299d8d22
Signed by: eukara
GPG key ID: CE2032F0A2882A22
3 changed files with 12 additions and 5 deletions

11
src/server/gamerules.qc
View file

@ -29,7 +29,6 @@ TFCGameRules::DropGoalItem(NSClientPlayer pp)
if (!(pp.g_items & ITEM_GOALITEM)) if (!(pp.g_items & ITEM_GOALITEM))
return; return;
item_tfgoal target; item_tfgoal target;
for (entity e = world; (e = find(e, ::classname, "item_tfgoal"));) { for (entity e = world; (e = find(e, ::classname, "item_tfgoal"));) {
@ -90,6 +89,13 @@ TFCGameRules::PlayerDisconnect(NSClientPlayer pl)
pl.SendFlags = PLAYER_MODELINDEX; pl.SendFlags = PLAYER_MODELINDEX;
} }
void
TFCGameRules_PlayerRespawn(void)
{
TFCGameRules rule = (TFCGameRules)g_grMode;
rule.PlayerRespawn((NSClientPlayer)self);
}
void void
TFCGameRules::PlayerDeath(NSClientPlayer pp) TFCGameRules::PlayerDeath(NSClientPlayer pp)
{ {
@ -98,7 +104,8 @@ TFCGameRules::PlayerDeath(NSClientPlayer pp)
DropGoalItem(pp); DropGoalItem(pp);
pl.SetSolid(SOLID_NOT); pl.SetSolid(SOLID_NOT);
pl.SetMovetype(MOVETYPE_NONE); pl.SetMovetype(MOVETYPE_NONE);
pl.think = PlayerRespawn;
pl.think = TFCGameRules_PlayerRespawn;
pl.nextthink = time + 4.0f; pl.nextthink = time + 4.0f;
/* play the iconic death sound */ /* play the iconic death sound */

2
src/server/teleporter.qc
View file

@ -38,7 +38,7 @@ TFCTeleporter::Touch(entity eToucher)
if (m_flNextTeleport > time) if (m_flNextTeleport > time)
return; return;
TFCTeleporter target = world; TFCTeleporter target = __NULL__;
string exitname; string exitname;
if (classname == "TFCTeleporter") if (classname == "TFCTeleporter")

4
src/shared/items.h
View file

@ -37,7 +37,7 @@
#define ITEM_GRAPPLE 0x00080000 #define ITEM_GRAPPLE 0x00080000
#define ITEM_SUIT 0x00100000 #define ITEM_SUIT 0x00100000
#define ITEM_UNUSED22 0x00200000 #define ITEM_GOALITEM 0x00200000
#define ITEM_UNUSED23 0x00400000 #define ITEM_UNUSED23 0x00400000
#define ITEM_UNUSED24 0x00800000 #define ITEM_UNUSED24 0x00800000
#define ITEM_UNUSED25 0x01000000 #define ITEM_UNUSED25 0x01000000
@ -47,4 +47,4 @@
#define ITEM_UNUSED29 0x10000000 #define ITEM_UNUSED29 0x10000000
#define ITEM_UNUSED30 0x20000000 #define ITEM_UNUSED30 0x20000000
#define ITEM_UNUSED31 0x40000000 #define ITEM_UNUSED31 0x40000000
#define ITEM_GOALITEM 0x80000000 #define ITEM_UNUSED32 0x80000000