Properly execute target_changelevel

[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 89e2b808fe7b183a8b3494ce24b1e6ed85aa00b7..1048dfbab6016e30d28f5371f990340c38b36fe0 100644 (file)
--- a/data/qcsrc/server/t_items.qc
+++ b/data/qcsrc/server/t_items.qc
@@ -46,7 +46,7 @@ float Item_Customize()
        }\r
        else\r
        {\r
-               if(g_ghost_items && self.respawntime > 0) // if respawntime is -1, this item does not respawn\r
+               if(g_ghost_items)\r
                {\r
                        self.colormod = stov(cvar_string("g_ghost_items_color"));\r
                        self.glowmod = self.colormod;\r
@@ -97,7 +97,7 @@ void Item_Show (entity e, float mode)
 \r
                e.spawnshieldtime = 0; // field indicates whether picking it up may give you anything other than the weapon\r
        }\r
-       else if(g_ghost_items && self.respawntime > 0) // if respawntime is -1, this item does not respawn\r
+       else if(g_ghost_items)\r
        {\r
                // make the item translucent green and not touchable\r
                e.model = e.mdl;\r
@@ -210,6 +210,8 @@ void Item_ScheduleRespawn(entity e)
        Item_Show(e, 0);\r
        if(e.respawntime > 0) // if respawntime is -1, this item does not respawn\r
                Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r
+       else\r
+               remove(e);\r
 }\r
 \r
 void Item_ScheduleInitialRespawn(entity e)\r
@@ -623,7 +625,7 @@ void StartItem (string itemmodel, string pickupsound, float defaultrespawntime,
 \r
                weaponsInMap |= weaponid;\r
 \r
-               if(g_lms || g_ca)\r
+               if(g_lms)\r
                {\r
                        startitem_failed = TRUE;\r
                        remove(self);\r
@@ -880,7 +882,7 @@ void spawnfunc_item_health_large (void) {
                self.max_health = g_pickup_healthlarge_max;\r
        if(!self.health)\r
                self.health = g_pickup_healthlarge;\r
-       StartItem ("models/items/g_h50.md3", "misc/mediumhealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);\r
+       StartItem ("models/items/g_h50.md3", "misc/largehealth.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "50 Health", IT_25HP, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);\r
 }\r
 \r
 void spawnfunc_item_health_mega (void) {\r