Merge branch 'master' into Mario/bulldozer

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / vehicles / all.qc

diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc
index 923ed4e5bd4f2e977a92e0ef258db313fafdd4b9..c7b84582239e1c129ab4de4d95d2e79fb6a82f66 100644 (file)
--- a/qcsrc/common/vehicles/all.qc
+++ b/qcsrc/common/vehicles/all.qc
@@ -3,33 +3,10 @@
 
 #include "all.qh"
 
-#if defined(SVQC)
-       #include "sv_vehicles.qc"
-#elif defined(CSQC)
-       #include "cl_vehicles.qc"
-#endif
-
-#define IMPLEMENTATION
-#include "all.inc"
-#undef IMPLEMENTATION
-
 #ifndef MENUQC
 STATIC_INIT(vehicles_common_initialize)
 {
-#ifdef CSQC
-       precache_model("models/vehicles/bomblet.md3");
-       precache_model("models/vehicles/clusterbomb.md3");
-       precache_model("models/vehicles/clusterbomb_fragment.md3");
-       precache_model("models/vehicles/rocket01.md3");
-       precache_model("models/vehicles/rocket02.md3");
-
-       precache_sound ("vehicles/alarm.wav");
-       precache_sound ("vehicles/alarm_shield.wav");
-#endif // CSQC
 #ifdef SVQC
-       precache_sound("onslaught/ons_hit2.wav");
-       precache_sound("onslaught/electricity_explode.wav");
-
        addstat(STAT_HUD, AS_INT, hud);
        addstat(STAT_VEHICLESTAT_HEALTH,  AS_INT, vehicle_health);
        addstat(STAT_VEHICLESTAT_SHIELD,  AS_INT, vehicle_shield);
@@ -46,11 +23,16 @@ STATIC_INIT(vehicles_common_initialize)
 }
 #endif
 
-entity get_vehicleinfo(int id)
-{
-       if (id < VEH_FIRST || id > VEH_LAST) return VEH_Null;
-       entity m = vehicle_info[id];
-       return m ? m : VEH_Null;
-}
+REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR)
+
+#if defined(SVQC)
+       #include "sv_vehicles.qc"
+#elif defined(CSQC)
+       #include "cl_vehicles.qc"
+#endif
+
+#define IMPLEMENTATION
+#include "all.inc"
+#undef IMPLEMENTATION
 
 #endif