]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Guide: Load turrets
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 27 Sep 2015 07:08:51 +0000 (17:08 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 27 Sep 2015 07:08:51 +0000 (17:08 +1000)
qcsrc/menu/progs.inc
qcsrc/menu/xonotic/dialog_media_guide.qc

index 45c52c8c02b34dfe10f61adc81d224962ec49c74..6739feaf9551b2a31be43f31b0e3a6231a630c20 100644 (file)
@@ -23,6 +23,7 @@
 #include "../common/items/all.qc"
 #include "../common/monsters/all.qc"
 #include "../common/mutators/all.qc"
+#include "../common/turrets/all.qc"
 #include "../common/vehicles/all.qc"
 #include "../common/weapons/all.qc"
 
index 28432c7af5435e27d7681ae1acf4f5d5bbca74e5..e36fc9957939421a9d08c29a983fc8830fe73d18 100644 (file)
@@ -10,7 +10,7 @@
     X(NEW(NadeSource),      _("Nades"),     "gametype_ft") \
     X(NEW(MonsterSource),   _("Monsters"),  "gametype_lms") \
     X(NEW(VehicleSource),   _("Vehicles"),  "gametype_rc") \
-    X(NEW(VehicleSource),   _("Turrets"),   "gametype_as") \
+    X(NEW(TurretSource),    _("Turrets"),   "gametype_as") \
     X(NEW(MutatorSource),   _("Mutators"),  "gametype_nb") \
     X(NEW(MapSource),       _("Maps"),      "gametype_ctf") \
     if (cvar("developer")) X(NEW(DebugSource), _("Debug"), "gametype_ons") \
@@ -107,6 +107,9 @@ REGISTRY_SOURCE(MonsterSource, monster_info, MON_COUNT)
 #include "../../common/vehicles/all.qh"
 REGISTRY_SOURCE(VehicleSource, vehicle_info, VEH_COUNT)
 
+#include "../../common/turrets/all.qh"
+REGISTRY_SOURCE(TurretSource, turret_info, TUR_COUNT)
+
 #include "../../common/mutators/base.qh"
 REGISTRY_SOURCE(MutatorSource, MUTATORS, MUTATORS_COUNT)