From b0a88d81aaba70bd16ba3502753cae8afc3f1b38 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Wed, 8 Oct 2008 18:36:30 +0000 Subject: fixed so the ninja works again. made it less specialized aswell --- src/game/server/entities/pickup.cpp | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/game/server/entities/pickup.cpp') 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; -- cgit 1.4.1