]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Update Q3 item compat comments
authorbones_was_here <bones_was_here@yahoo.com.au>
Mon, 13 Jul 2020 11:28:22 +0000 (21:28 +1000)
committerbones_was_here <bones_was_here@yahoo.com.au>
Mon, 13 Jul 2020 11:28:22 +0000 (21:28 +1000)
qcsrc/common/mutators/mutator/buffs/all.inc
qcsrc/server/compat/quake3.qc

index e4e6de02618ed0bc285d6bc5c30665f4ef6a2d29..6fd7bdd9b32c2380766bf068975436ae6bbf603e 100644 (file)
@@ -2,14 +2,14 @@ string Buff_UndeprecateName(string buffname)
 {
     switch(buffname)
     {
-        case "ammoregen": return "ammo";               // ammoregen from Q3TA
-        case "haste": return "speed";                  // haste from Q3A
-        case "doubler": return "inferno";              // doubler from Q3TA
-        case "scout": return "bash";                   // scout from Q3TA
-        case "guard": return "resistance";             // guard from Q3TA
-        case "revival": case "regen": return "medic";  // revival from WOP, regen from Q3A
-        case "invis": return "invisible";              // invis from Q3A
-        case "jumper": return "jump";                  // jumper from WOP
+        case "ammoregen": return "ammo";               // Q3TA ammoregen
+        case "haste": return "speed";                  // Q3A haste
+        case "doubler": return "inferno";              // Q3TA doubler
+        case "scout": return "bash";                   // Q3TA scout
+        case "guard": return "resistance";             // Q3TA guard
+        case "revival": case "regen": return "medic";  // WOP revival, Q3A regen
+        case "invis": return "invisible";              // Q3A invis
+        case "jumper": return "jump";                  // WOP jumper
         default: return buffname;
     }
 }
index 03f5580d61e68fd6245da5364e9c65d150407b9a..f7b77d83d1c0a839a13a9b4ead1fe061eb7abaf8 100644 (file)
 #include <common/notifications/all.qh>
 #include <common/weapons/_all.qh>
 
-//***********************
-//QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons
-//***********************
+/***********************
+ * QUAKE 3 ENTITIES - So people can play quake3 maps with the xonotic weapons
+ ***********************
+
+ * Map entities NOT handled in this file:
+ holdable_invulnerability      Q3TA    currently unsupported
+ holdable_kamikaze             Q3TA    currently unsupported
+ item_ammoregen                        Q3TA    handled by buffs mutator
+ item_doubler                  Q3TA    handled by buffs mutator
+ item_guard                    Q3TA    handled by buffs mutator
+ item_scout                    Q3TA    handled by buffs mutator
+ item_armor_jacket             CPMA    handled in quake2.qc
+ item_flight                   Q3A     handled by buffs mutator
+ item_haste                    Q3A     handled by buffs mutator
+ item_health                   Q3A     handled in quake.qc
+ item_health_large             Q3A     handled in items.qc
+ item_health_small             Q3A     handled in health.qh
+ item_health_mega              Q3A     handled in health.qh
+ item_invis                    Q3A     handled by buffs mutator
+ item_quad                     Q3A     handled in items.qc
+ item_regen                    Q3A     handled by buffs mutator
+ CTF spawnfuncs handled in sv_ctf.qc
+
+ NOTE: for best experience, you need to swap MGs with SGs in the map or it won't have a MG
+*/
 
-// NOTE: for best experience, you need to swap MGs with SGs in the map or it won't have a MG
 bool q3compat_arena(string mapname)
 {
        if(fexists(strcat("scripts/", mapname, ".arena"))) return true;
@@ -258,18 +279,6 @@ spawnfunc(target_fragsFilter)
        this.use = fragsfilter_use;
 }
 
-//spawnfunc(item_flight)       /* handled by buffs mutator */
-//spawnfunc(item_doubler)        /* handled by buffs mutator */
-//spawnfunc(item_haste)        /* handled by buffs mutator */
-//spawnfunc(item_health)       /* handled in t_quake.qc */
-//spawnfunc(item_health_large) /* handled in t_items.qc */
-//spawnfunc(item_health_small) /* handled in t_items.qc */
-//spawnfunc(item_health_mega)  /* handled in t_items.qc */
-//spawnfunc(item_invis)        /* handled by buffs mutator */
-//spawnfunc(item_regen)        /* handled by buffs mutator */
-
-// CTF spawnfuncs handled in mutators/gamemode_ctf.qc now
-
 .bool notteam;
 .bool notsingle;
 .bool notfree;