Respawn time -1 for items: Allows the item to never respawn again after being picked up

diff --git a/Todo & known bugs.txt b/Todo & known bugs.txt
index 71ad134bca9e3540a89120cfb08497f35e5f7358..8efebe211efb63be8bf8e5f79d9603a332055dcb 100644 (file)
--- a/Todo & known bugs.txt
+++ b/Todo & known bugs.txt
@@ -4,6 +4,4 @@ Todo:
 \r
 - Bots must learn to use the Grabber gun. The weapon code of havocbot is still there, but doesn't know how to shoot the Grabber\r
 \r
-- Allow an item respawn time of -1 (never respawn again). Useful for RPG and Single Player maps\r
-\r
 Known bugs:\r

diff --git a/data/qcsrc/server/t_items.qc b/data/qcsrc/server/t_items.qc
index f37e3a2dccd215de5c27a31e3c790a4fbd817aff..71b380560b6e97dfab8df3524a4b58a5c0f36597 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)\r
+               if(g_ghost_items && self.respawntime > 0)\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)\r
+       else if(g_ghost_items && self.respawntime > 0)\r
        {\r
                // make the item translucent green and not touchable\r
                e.model = e.mdl;\r
@@ -208,7 +208,8 @@ void Item_ScheduleRespawnIn(entity e, float t)
 void Item_ScheduleRespawn(entity e)\r
 {\r
        Item_Show(e, 0);\r
-       Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r
+       if(e.respawntime > 0)\r
+               Item_ScheduleRespawnIn(e, ITEM_RESPAWNTIME(e));\r
 }\r
 \r
 void Item_ScheduleInitialRespawn(entity e)\r