allow weapon files to define functions in csqc too

diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc
index 8f6a9104946ce3f6dc263191d5520853f1065e57..2ee72701ff4838b18b9ff0d01555f02ec9bf1b23 100644 (file)
--- a/qcsrc/server/w_campingrifle.qc
+++ b/qcsrc/server/w_campingrifle.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(CAMPINGRIFLE, w_campingrifle, IT_NAILS, 3, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_MID, "campingrifle", "campingrifle", "Rifle");
 #else
+#ifdef SVQC
 //Camping rifle Primary mode: manually operated bolt*, Secondary: full automatic**
 //* Manually operating the bolt means that all the power of the gas is used to propell the bullet. In this mode the bolt is prevented from moving backwards in response to the firing of the bullet.
 //** In fully automatic mode some of the gas is used to extract and reload the next cartrige, thus there is less power and range.
@@ -294,3 +295,6 @@ float w_campingrifle(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_crylink.qc b/qcsrc/server/w_crylink.qc
index b95a7cef897645479054eba22b5e7d79e269a2c8..53a737f2dde379f2834ea422603fca269f0d8898 100644 (file)
--- a/qcsrc/server/w_crylink.qc
+++ b/qcsrc/server/w_crylink.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(CRYLINK, w_crylink, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "crylink", "crylink", "Crylink");
 #else
+#ifdef SVQC
 .float gravity;
 
 .entity realowner;
@@ -235,3 +236,6 @@ float w_crylink(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_electro.qc b/qcsrc/server/w_electro.qc
index c9e7d23c31eff0682d56453b594b2cfdbd115481..7c61599aeeedcca146dfd971d5d026d71f432974 100644 (file)
--- a/qcsrc/server/w_electro.qc
+++ b/qcsrc/server/w_electro.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(ELECTRO, w_electro, IT_CELLS, 5, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "electro", "electro", "Electro");
 #else
+#ifdef SVQC
 .float electro_count;
 .float electro_secondarytime;
 
@@ -317,3 +318,6 @@ float w_electro(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_fireball.qc b/qcsrc/server/w_fireball.qc
index 0462cd9018b256f0febe222f9e415b3c164e3a2c..10ff3b14d051239f59abe89b4ff788401e97ef2b 100644 (file)
--- a/qcsrc/server/w_fireball.qc
+++ b/qcsrc/server/w_fireball.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(FIREBALL, w_fireball, IT_FUEL, 9, WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "fireball", "fireball", "Fireball");
 #else
+#ifdef SVQC
 .float bot_primary_fireballmooth; // whatever a mooth is
 .vector fireball_impactvec;
 .float fireball_primarytime;
@@ -392,3 +393,6 @@ float w_fireball(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_grenadelauncher.qc b/qcsrc/server/w_grenadelauncher.qc
index 251137401c4a0580d934da6f6b4949313131ed59..9409a2b6f218f6a46ac63ea72dc9f6a61594d0b1 100644 (file)
--- a/qcsrc/server/w_grenadelauncher.qc
+++ b/qcsrc/server/w_grenadelauncher.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(GRENADE_LAUNCHER, w_glauncher, IT_ROCKETS, 4, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "gl", "grenadelauncher", "Mortar");
 #else
+#ifdef SVQC
 void W_Grenade_Explode (void)
 {
        if(other.takedamage == DAMAGE_AIM)
@@ -236,3 +237,6 @@ float w_glauncher(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_hagar.qc b/qcsrc/server/w_hagar.qc
index 638e18bcc261f5f718de326eb40647d3640f8e6a..ed2cc3ad6ae549f26a721ea0d51fe0262468612b 100644 (file)
--- a/qcsrc/server/w_hagar.qc
+++ b/qcsrc/server/w_hagar.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(HAGAR, w_hagar, IT_ROCKETS, 8, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hagar", "hagar", "Hagar");
 #else
+#ifdef SVQC
 // NO bounce protection, as bounces are limited!
 void W_Hagar_Explode (void)
 {
@@ -162,3 +163,6 @@ float w_hagar(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_hlac.qc b/qcsrc/server/w_hlac.qc
index ecd30d76911d0b8f016eada99910014eb7cf9d31..4de9937977c5f1d6098302428491eb33b2ddbf96 100644 (file)
--- a/qcsrc/server/w_hlac.qc
+++ b/qcsrc/server/w_hlac.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(HLAC, w_hlac, IT_CELLS, 6, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "hlac", "hlac", "Heavy Laser Assault Cannon");
 #else
+#ifdef SVQC
 .float HLAC_bulletcounter;
 void W_HLAC_Touch (void)
 {
@@ -213,3 +214,6 @@ float w_hlac(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_hook.qc b/qcsrc/server/w_hook.qc
index 7b4eba094df0d558318942fbb8879947102f6097..ffec6ac71241f82e6b7a4451bb43d9124cc2d956 100644 (file)
--- a/qcsrc/server/w_hook.qc
+++ b/qcsrc/server/w_hook.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(HOOK, w_hook, IT_CELLS|IT_FUEL, 0, WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, 0, "hookgun", "hook", "Grappling Hook");
 #else
+#ifdef SVQC
 .float dmg;
 .float dmg_edge;
 .float dmg_radius;
@@ -249,3 +250,6 @@ float w_hook(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_laser.qc b/qcsrc/server/w_laser.qc
index 4d749d0ba1c36bdcdc792883cee07b0d1652cc0e..eb3740f394651677872078949026835ed94da044 100644 (file)
--- a/qcsrc/server/w_laser.qc
+++ b/qcsrc/server/w_laser.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(LASER, w_laser, 0, 1, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, 0, "laser", "laser", "Laser");
 #else
+#ifdef SVQC
 void(float imp) W_SwitchWeapon;
 
 void W_Laser_Touch (void)
@@ -186,3 +187,6 @@ float w_laser(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_minstanex.qc b/qcsrc/server/w_minstanex.qc
index 00e8fd890a0ea2f2a7bf22ac9328fc52daf9ac3c..f44f1bec5933ed2c03fc12939300fc738cb0e7c8 100644 (file)
--- a/qcsrc/server/w_minstanex.qc
+++ b/qcsrc/server/w_minstanex.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(MINSTANEX, w_minstanex, IT_CELLS, 7, WEP_FLAG_HIDDEN | WEP_FLAG_CANCLIMB | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "minstanex", "minstanex", "MinstaNex");
 #else
+#ifdef SVQC
 .float minstanex_lasthit;
 
 void W_MinstaNex_Attack (void)
@@ -242,3 +243,6 @@ float w_minstanex(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_nex.qc b/qcsrc/server/w_nex.qc
index 7a9103ccfabf2cd619919b4863fbfcdc9a1ccaa9..931d2ef0fd0658e6283d253e21b35aa910f9bcbb 100644 (file)
--- a/qcsrc/server/w_nex.qc
+++ b/qcsrc/server/w_nex.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(NEX, w_nex, IT_CELLS, 7, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_HIGH, "nex", "nex", "Nex");
 #else
+#ifdef SVQC
 void SendCSQCNexBeamParticle() {
        vector v;
        v = WarpZone_UnTransformOrigin(WarpZone_trace_transform, trace_endpos);
@@ -80,3 +81,6 @@ float w_nex(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_porto.qc b/qcsrc/server/w_porto.qc
index 55bbc51f8c4bc44624187cabe4fcdba3ddc74cce..5b037bf20f51d741e9638d2cdee91ab9092aabb8 100644 (file)
--- a/qcsrc/server/w_porto.qc
+++ b/qcsrc/server/w_porto.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(PORTO, w_porto, 0, 0, WEP_TYPE_OTHER, 0, "porto" , "porto", "Port-O-Launch");
 #else
+#ifdef SVQC
 .entity porto_current;
 .vector porto_v_angle; // holds "held" view angles
 .float porto_v_angle_held;
@@ -279,3 +280,6 @@ float w_porto(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_rocketlauncher.qc b/qcsrc/server/w_rocketlauncher.qc
index 348a79c700630c8cd78663c1014ea95394e897a0..d2c0e412a9df7e589e3b59f66a95c392804544ee 100644 (file)
--- a/qcsrc/server/w_rocketlauncher.qc
+++ b/qcsrc/server/w_rocketlauncher.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(ROCKET_LAUNCHER, w_rlauncher, IT_ROCKETS, 9, WEP_FLAG_NORMAL | WEP_FLAG_CANCLIMB | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_HIGH, "rl", "rocketlauncher", "Rocket Launcher");
 #else
+#ifdef SVQC
 .float rl_release;
 .float rl_detonate_later;
 
@@ -561,3 +562,6 @@ float w_rlauncher(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_seeker.qc b/qcsrc/server/w_seeker.qc
index 83d615884c89e2b81473c279404197acbd65473b..16cc4728167a37733bdda87a2e7c91079585dd6d 100644 (file)
--- a/qcsrc/server/w_seeker.qc
+++ b/qcsrc/server/w_seeker.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(SEEKER, w_seeker, IT_ROCKETS, 9, WEP_FLAG_NORMAL | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "seeker", "seeker", "T.A.G. Seeker");
 #else
+#ifdef SVQC
 //.float speed; = switchweapon
 //.float proxytime; = autoswitch
 //.float tl; = wait
@@ -479,3 +480,6 @@ float w_seeker(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_shotgun.qc b/qcsrc/server/w_shotgun.qc
index 0b499f4832586cc8b5c03e6688d00c519a7adcd6..ad2bca91800cfcb72433f1c43cbebef5aebee1ca 100644 (file)
--- a/qcsrc/server/w_shotgun.qc
+++ b/qcsrc/server/w_shotgun.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(SHOTGUN, w_shotgun, IT_SHELLS, 2, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_LOW, "shotgun", "shotgun", "Shotgun");
 #else
+#ifdef SVQC
 void W_Shotgun_Attack (void)
 {
        float   sc;
@@ -148,3 +149,6 @@ float w_shotgun(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_tuba.qc b/qcsrc/server/w_tuba.qc
index eab14f4f516d62da409e3c2ada398c8afb81b9ce..0ba1aae3e3ef10a06606992f035cabbfc211522f 100644 (file)
--- a/qcsrc/server/w_tuba.qc
+++ b/qcsrc/server/w_tuba.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(TUBA, w_tuba, 0, 1, WEP_FLAG_HIDDEN | WEP_TYPE_SPLASH, BOT_PICKUP_RATING_MID, "tuba", "tuba", "@!#%'n Tuba");
 #else
+#ifdef SVQC
 //#define TUBA_NOTE(n) strcat("weapons/tuba_note", ftos(n), ".wav")
 .float tuba_notecount;
 .entity tuba_note;
@@ -251,3 +252,6 @@ float w_tuba(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif

diff --git a/qcsrc/server/w_uzi.qc b/qcsrc/server/w_uzi.qc
index 4887f803d36e518153bf69de39a14378f1b6c982..e392ac9d267a4ee48fb7453e4a059eb801fd4458 100644 (file)
--- a/qcsrc/server/w_uzi.qc
+++ b/qcsrc/server/w_uzi.qc
@@ -1,6 +1,7 @@
 #ifdef REGISTER_WEAPON
 REGISTER_WEAPON(UZI, w_uzi, IT_NAILS, 3, WEP_FLAG_NORMAL | WEP_TYPE_HITSCAN, BOT_PICKUP_RATING_MID, "uzi", "uzi", "Machine Gun");
 #else
+#ifdef SVQC
 // leilei's fancy muzzleflash stuff
 void W_Uzi_Flash_Go() {
        if (self.frame > 10){
@@ -137,3 +138,6 @@ float w_uzi(float req)
        return TRUE;
 };
 #endif
+#ifdef CSQC
+#endif
+#endif