From: TimePath Date: Sun, 13 Aug 2017 09:32:54 +0000 (+1000) Subject: vehicles: remove _all X-Git-Tag: xonotic-v0.8.5~2530 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=61328a6e0716be245cc54c8cf640f549bc76a317;p=xonotic%2Fxonotic-data.pk3dir.git vehicles: remove _all --- diff --git a/qcsrc/common/_all.inc b/qcsrc/common/_all.inc index 687833390..32dbf5208 100644 --- a/qcsrc/common/_all.inc +++ b/qcsrc/common/_all.inc @@ -46,7 +46,7 @@ noref float autocvar_net_connecttimeout = 30; #include "weapons/_all.inc" #include "monsters/_mod.inc" #include "turrets/_mod.inc" - #include "vehicles/all.qc" + #include "vehicles/_mod.inc" #include "mutators/_mod.inc" #include "gamemodes/_mod.inc" diff --git a/qcsrc/common/vehicles/_all.inc b/qcsrc/common/vehicles/_all.inc deleted file mode 100644 index 8bc63f720..000000000 --- a/qcsrc/common/vehicles/_all.inc +++ /dev/null @@ -1,2 +0,0 @@ -#include "_all.qh" -#include "_mod.inc" diff --git a/qcsrc/common/vehicles/_all.qh b/qcsrc/common/vehicles/_all.qh deleted file mode 100644 index 947026dd5..000000000 --- a/qcsrc/common/vehicles/_all.qh +++ /dev/null @@ -1,2 +0,0 @@ -#pragma once -#include "_mod.qh" diff --git a/qcsrc/common/vehicles/_mod.inc b/qcsrc/common/vehicles/_mod.inc index ed26659da..b358830df 100644 --- a/qcsrc/common/vehicles/_mod.inc +++ b/qcsrc/common/vehicles/_mod.inc @@ -7,3 +7,5 @@ #ifdef SVQC #include #endif + +#include diff --git a/qcsrc/common/vehicles/_mod.qh b/qcsrc/common/vehicles/_mod.qh index 4892b0f31..755a9a049 100644 --- a/qcsrc/common/vehicles/_mod.qh +++ b/qcsrc/common/vehicles/_mod.qh @@ -7,3 +7,5 @@ #ifdef SVQC #include #endif + +#include diff --git a/qcsrc/common/vehicles/all.qc b/qcsrc/common/vehicles/all.qc index 4aef11cad..eed249b97 100644 --- a/qcsrc/common/vehicles/all.qc +++ b/qcsrc/common/vehicles/all.qc @@ -1,17 +1,3 @@ #include "all.qh" -#ifndef VEHICLES_ALL_C -#define VEHICLES_ALL_C REGISTER_NET_LINKED(ENT_CLIENT_AUXILIARYXHAIR) - -#if defined(SVQC) - #include "sv_vehicles.qc" -#elif defined(CSQC) - #include "cl_vehicles.qc" -#endif - -#define IMPLEMENTATION -#include "vehicle/_mod.inc" -#undef IMPLEMENTATION - -#endif diff --git a/qcsrc/common/vehicles/all.qh b/qcsrc/common/vehicles/all.qh index 158492f66..ed44be777 100644 --- a/qcsrc/common/vehicles/all.qh +++ b/qcsrc/common/vehicles/all.qh @@ -20,4 +20,4 @@ const int VEH_FIRST = 1; REGISTER_VEHICLE(Null, NEW(Vehicle)); -#include "vehicle/_mod.inc" +#include "vehicle/_mod.qh" diff --git a/qcsrc/common/vehicles/vehicle/bumblebee.qc b/qcsrc/common/vehicles/vehicle/bumblebee.qc index d3f802791..018e1a17d 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee.qc @@ -1,7 +1,5 @@ #include "bumblebee.qh" -#ifdef IMPLEMENTATION - const float BRG_SETUP = 2; const float BRG_START = 4; const float BRG_END = 8; @@ -968,4 +966,3 @@ METHOD(Bumblebee, vr_setup, void(Bumblebee thisveh, entity instance)) } #endif -#endif diff --git a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc index 889ca4715..fa05c6a6f 100644 --- a/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc +++ b/qcsrc/common/vehicles/vehicle/bumblebee_weapons.qc @@ -1,7 +1,5 @@ #include "bumblebee_weapons.qh" -#ifdef IMPLEMENTATION - REGISTER_NET_LINKED(ENT_CLIENT_BUMBLE_RAYGUN) #ifdef SVQC @@ -132,5 +130,3 @@ void bumble_raygun_draw(entity this) } #endif - -#endif diff --git a/qcsrc/common/vehicles/vehicle/racer.qc b/qcsrc/common/vehicles/vehicle/racer.qc index a648a005e..8dbfae467 100644 --- a/qcsrc/common/vehicles/vehicle/racer.qc +++ b/qcsrc/common/vehicles/vehicle/racer.qc @@ -1,7 +1,5 @@ #include "racer.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC #include @@ -637,5 +635,3 @@ METHOD(Racer, vr_setup, void(Racer thisveh, entity instance)) AuxiliaryXhair[0].axh_image = vCROSS_LOCK; // Rocket #endif } - -#endif diff --git a/qcsrc/common/vehicles/vehicle/racer_weapon.qc b/qcsrc/common/vehicles/vehicle/racer_weapon.qc index 838f0cf42..02015eb8d 100644 --- a/qcsrc/common/vehicles/vehicle/racer_weapon.qc +++ b/qcsrc/common/vehicles/vehicle/racer_weapon.qc @@ -1,7 +1,5 @@ #include "racer_weapon.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC void racer_fire_rocket(entity player, vector org, vector dir, entity trg); @@ -169,5 +167,3 @@ void racer_rocket_groundhugger(entity this) } #endif - -#endif diff --git a/qcsrc/common/vehicles/vehicle/raptor.qc b/qcsrc/common/vehicles/vehicle/raptor.qc index e48600c47..d7ef38abc 100644 --- a/qcsrc/common/vehicles/vehicle/raptor.qc +++ b/qcsrc/common/vehicles/vehicle/raptor.qc @@ -1,7 +1,5 @@ #include "raptor.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC bool autocvar_g_vehicle_raptor = true; @@ -833,4 +831,3 @@ METHOD(Raptor, vr_setup, void(Raptor thisveh, entity instance)) } #endif -#endif diff --git a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc index 5cb0f271c..514d67c0e 100644 --- a/qcsrc/common/vehicles/vehicle/raptor_weapons.qc +++ b/qcsrc/common/vehicles/vehicle/raptor_weapons.qc @@ -1,7 +1,5 @@ #include "raptor_weapons.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC METHOD(RaptorCannon, wr_think, void(entity thiswep, entity actor, .entity weaponentity, int fire)) { @@ -259,5 +257,3 @@ void RaptorCBShellfragToss(vector _org, vector _vel, vector _ang) } #endif - -#endif diff --git a/qcsrc/common/vehicles/vehicle/spiderbot.qc b/qcsrc/common/vehicles/vehicle/spiderbot.qc index 93f479b14..57486a2f3 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot.qc +++ b/qcsrc/common/vehicles/vehicle/spiderbot.qc @@ -1,7 +1,5 @@ #include "spiderbot.qh" -#ifdef IMPLEMENTATION - const int SBRM_FIRST = 1; const int SBRM_VOLLY = 1; const int SBRM_GUIDE = 2; @@ -639,4 +637,3 @@ METHOD(Spiderbot, vr_setup, void(Spiderbot thisveh, entity instance)) } #endif -#endif diff --git a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc index 1fde99b3f..7887781ed 100644 --- a/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc +++ b/qcsrc/common/vehicles/vehicle/spiderbot_weapons.qc @@ -1,7 +1,5 @@ #include "spiderbot_weapons.qh" -#ifdef IMPLEMENTATION - #ifdef SVQC void spiderbot_rocket_artillery(entity this) @@ -248,5 +246,3 @@ void spiderbot_rocket_do(entity this) } #endif - -#endif