Don't regurgitate fully digested prey silently by default

[voretournament/voretournament.git] / data / qcsrc / server / t_items.qc

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index 89c5a2f2880b5b660cea84210c20483d4134591f..83ec80f4704c137863e95387b82d9aeaeaf62f18 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -174,7 +174,7 @@ void Item_RespawnCountdown (void)
                                WaypointSprite_Spawn(name, 0, 0, self, '0 0 64', world, 0, self, waypointsprite_attached, TRUE);\r
                                if(self.waypointsprite_attached)\r
                                {\r
-                                       WaypointSprite_UpdateTeamRadar(self.waypointsprite_attached, RADARICON_POWERUP, rgb);\r
+                                       WaypointSprite_UpdateRadar(self.waypointsprite_attached, RADARICON_POWERUP, rgb);\r
                                        //WaypointSprite_UpdateMaxHealth(self.waypointsprite_attached, ITEM_RESPAWN_TICKS + 1);\r
                                        WaypointSprite_UpdateBuildFinished(self.waypointsprite_attached, time + ITEM_RESPAWN_TICKS);\r
                                }\r
@@ -390,14 +390,15 @@ void Item_DroppedConsumable_Spawn(entity e)
        if(cvar("g_nodepthtestitems"))\r
                item.effects |= EF_NODEPTHTEST;\r
 \r
-       float scalediff;\r
-       scalediff = cvar("g_healthsize") ? e.scale / e.predator.scale : e.scale; // the tighter the gut, the greater the velocity\r
+       float scalediff, sz;\r
+       sz = e.scale; // the line below does not work if I define this directly (fteqcc bug?)\r
+       scalediff = cvar("g_healthsize") ? sz / e.predator.scale : sz; // the tighter the gut, the greater the velocity\r
+\r
        setorigin(item, e.predator.origin);\r
        item.angles_y = e.predator.angles_y;\r
        makevectors(e.predator.v_angle);\r
        item.velocity = v_forward * cvar("g_balance_vore_regurgitate_force") * scalediff;\r
        e.predator.velocity += -v_forward * cvar("g_balance_vore_regurgitate_predatorforce") * scalediff;\r
-\r
        item.touch = Item_DroppedConsumable_Touch;\r
        item.cnt = time + 1; // 1 second delay\r
        SUB_SetFade(item, time + 20, 1);\r