From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sun, 23 Aug 2015 11:15:29 +0000 (+1000)
Subject: Fix menu compile
X-Git-Tag: xonotic-v0.8.2~2048
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=253726e9350e7097345ba6d9f32106e8c46d5749;p=xonotic%2Fxonotic-data.pk3dir.git

Fix menu compile
---

diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh
index ccb3a0564..fa9e83f48 100644
--- a/qcsrc/common/vehicles/all.qh
+++ b/qcsrc/common/vehicles/all.qh
@@ -58,11 +58,10 @@ const int VEH_FIRST = 1;
 /** If you register a new vehicle, make sure to add it to all.inc */
 #define REGISTER_VEHICLE(id, class) REGISTER(RegisterVehicles, VEH, vehicle_info, VEH_COUNT, id, vehicleid, NEW(class))
 #include "vehicle.qh"
-#define REGISTER_VEHICLE_SIMPLE(id, func, vehicleflags, min_s, max_s, modelname, headmodelname, hudmodelname, headtag, hudtag, viewtag, shortname, vname) \
+#define REGISTER_VEHICLE_SIMPLE(id, vehicleflags, min_s, max_s, modelname, headmodelname, hudmodelname, headtag, hudtag, viewtag, shortname, vname) \
     REGISTER_VEHICLE(id, Vehicle) {         \
     	this.netname = shortname;           \
     	this.vehicle_name = vname;          \
-    	this.vehicle_func = func;           \
     	this.mdl = modelname;               \
     	this.spawnflags = vehicleflags;     \
     	this.mins = min_s;                  \
diff --git a/qcsrc/common/vehicles/unit/bumblebee.qc b/qcsrc/common/vehicles/unit/bumblebee.qc
index ba0db541a..25e274ea6 100644
--- a/qcsrc/common/vehicles/unit/bumblebee.qc
+++ b/qcsrc/common/vehicles/unit/bumblebee.qc
@@ -1,10 +1,11 @@
 #ifndef VEHICLE_BUMBLEBEE
 #define VEHICLE_BUMBLEBEE
 #include "bumblebee.qh"
+#ifndef MENUQC
 int v_bumblebee(int);
+#endif
 REGISTER_VEHICLE_SIMPLE(
 /* VEH_##id   */ BUMBLEBEE,
-/* function   */ v_bumblebee,
 /* spawnflags */ VHF_DMGSHAKE,
 /* mins,maxs  */ '-245 -130 -130', '230 130 130',
 /* model	  */ "models/vehicles/bumblebee_body.dpm",
@@ -15,6 +16,9 @@ REGISTER_VEHICLE_SIMPLE(
 /* fullname   */ _("Bumblebee")
 ) {
     this.m_icon = "vehicle_bumble";
+#ifndef MENUQC
+    this.vehicle_func = v_bumblebee;
+#endif
 }
 #endif
 
diff --git a/qcsrc/common/vehicles/unit/racer.qc b/qcsrc/common/vehicles/unit/racer.qc
index 41a0b12ff..a73c74680 100644
--- a/qcsrc/common/vehicles/unit/racer.qc
+++ b/qcsrc/common/vehicles/unit/racer.qc
@@ -1,9 +1,10 @@
 #ifndef VEHICLE_RACER
 #define VEHICLE_RACER
+#ifndef MENUQC
 int v_racer(int);
+#endif
 REGISTER_VEHICLE_SIMPLE(
 /* VEH_##id   */ RACER,
-/* function   */ v_racer,
 /* spawnflags */ VHF_DMGSHAKE | VHF_DMGROLL,
 /* mins,maxs  */ '-120 -120 -40' * 0.5, '120 120 40' * 0.5,
 /* model	  */ "models/vehicles/wakizashi.dpm",
@@ -14,6 +15,9 @@ REGISTER_VEHICLE_SIMPLE(
 /* fullname   */ _("Racer")
 ) {
     this.m_icon = "vehicle_racer";
+#ifndef MENUQC
+    this.vehicle_func = v_racer;
+#endif
 }
 #endif
 
diff --git a/qcsrc/common/vehicles/unit/raptor.qc b/qcsrc/common/vehicles/unit/raptor.qc
index 2ea89491b..320b89345 100644
--- a/qcsrc/common/vehicles/unit/raptor.qc
+++ b/qcsrc/common/vehicles/unit/raptor.qc
@@ -1,10 +1,11 @@
 #ifndef VEHICLE_RAPTOR
 #define VEHICLE_RAPTOR
 #include "raptor.qh"
+#ifndef MENUQC
 int v_raptor(int);
+#endif
 REGISTER_VEHICLE_SIMPLE(
 /* VEH_##id   */ RAPTOR,
-/* function   */ v_raptor,
 /* spawnflags */ VHF_DMGSHAKE | VHF_DMGROLL,
 /* mins,maxs  */ '-80 -80 0', '80 80 70',
 /* model	  */ "models/vehicles/raptor.dpm",
@@ -15,6 +16,9 @@ REGISTER_VEHICLE_SIMPLE(
 /* fullname   */ _("Raptor")
 ) {
     this.m_icon = "vehicle_raptor";
+#ifndef MENUQC
+    this.vehicle_func = v_raptor;
+#endif
 }
 #endif
 
diff --git a/qcsrc/common/vehicles/unit/spiderbot.qc b/qcsrc/common/vehicles/unit/spiderbot.qc
index 939dd28a6..ca65dc992 100644
--- a/qcsrc/common/vehicles/unit/spiderbot.qc
+++ b/qcsrc/common/vehicles/unit/spiderbot.qc
@@ -1,9 +1,10 @@
 #ifndef VEHICLE_SPIDERBOT
 #define VEHICLE_SPIDERBOT
+#ifndef MENUQC
 int v_spiderbot(int);
+#endif
 REGISTER_VEHICLE_SIMPLE(
 /* VEH_##id   */ SPIDERBOT,
-/* function   */ v_spiderbot,
 /* spawnflags */ VHF_DMGSHAKE,
 /* mins,maxs  */ '-75 -75 10', '75 75 125',
 /* model	  */ "models/vehicles/spiderbot.dpm",
@@ -14,6 +15,9 @@ REGISTER_VEHICLE_SIMPLE(
 /* fullname   */ _("Spiderbot")
 ) {
     this.m_icon = "vehicle_spider";
+#ifndef MENUQC
+    this.vehicle_func = v_spiderbot;
+#endif
 }
 #endif