diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-08 18:36:30 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-08 18:36:30 +0000 |
| commit | b0a88d81aaba70bd16ba3502753cae8afc3f1b38 (patch) | |
| tree | 843717bca11486db34c5b83a57928c9b6686e865 /src/game/server/entities/pickup.cpp | |
| parent | b39e58ce265971b7f3aa21204e62b45b0319ac76 (diff) | |
| download | zcatch-b0a88d81aaba70bd16ba3502753cae8afc3f1b38.tar.gz zcatch-b0a88d81aaba70bd16ba3502753cae8afc3f1b38.zip | |
fixed so the ninja works again. made it less specialized aswell
Diffstat (limited to 'src/game/server/entities/pickup.cpp')
| -rw-r--r-- | src/game/server/entities/pickup.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/server/entities/pickup.cpp b/src/game/server/entities/pickup.cpp index e9997733..b6258446 100644 --- a/src/game/server/entities/pickup.cpp +++ b/src/game/server/entities/pickup.cpp @@ -25,6 +25,8 @@ void PICKUP::reset() spawntick = server_tick() + server_tickspeed() * data->pickups[type].spawndelay; else spawntick = -1; + + spawntick = -1; } void PICKUP::tick() @@ -93,6 +95,7 @@ void PICKUP::tick() // activate ninja on target player chr->ninja.activationtick = server_tick(); chr->weapons[WEAPON_NINJA].got = true; + chr->weapons[WEAPON_NINJA].ammo = -1; chr->last_weapon = chr->active_weapon; chr->active_weapon = WEAPON_NINJA; respawntime = data->pickups[type].respawntime; |