Fix menu compile

diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh
index ccb3a05642830b27140c51bdbd46dbdd6efe5f5d..fa9e83f48531fa66231691391eade3a57781808f 100644 (file)
--- 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 ba0db541a9634130a64160f235aa064465bcf4d0..25e274ea607a3f1e0d5c222528c925fed4d3a51e 100644 (file)
--- 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 41a0b12ff71eaf2811fc826d9991226c3f734a7c..a73c746806ad85028899a07435fe732e8f4b6eb8 100644 (file)
--- 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 2ea89491bb21317f61637ab6480ef3a9d48bfddb..320b89345d24d0f5a1edac13c15217ecfb21e817 100644 (file)
--- 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 939dd28a63a557b5226b51b5ee12ebe9cf6087b7..ca65dc99245ab56fac624493f3b153c8af583b9a 100644 (file)
--- 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