From 90c9c4e610a4e0ffdad53033b03ce75dc6078489 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Sun, 6 Jun 2010 13:57:58 +0200 Subject: [PATCH] allow weapon files to define functions in csqc too --- qcsrc/server/w_campingrifle.qc | 4 ++++ qcsrc/server/w_crylink.qc | 4 ++++ qcsrc/server/w_electro.qc | 4 ++++ qcsrc/server/w_fireball.qc | 4 ++++ qcsrc/server/w_grenadelauncher.qc | 4 ++++ qcsrc/server/w_hagar.qc | 4 ++++ qcsrc/server/w_hlac.qc | 4 ++++ qcsrc/server/w_hook.qc | 4 ++++ qcsrc/server/w_laser.qc | 4 ++++ qcsrc/server/w_minstanex.qc | 4 ++++ qcsrc/server/w_nex.qc | 4 ++++ qcsrc/server/w_porto.qc | 4 ++++ qcsrc/server/w_rocketlauncher.qc | 4 ++++ qcsrc/server/w_seeker.qc | 4 ++++ qcsrc/server/w_shotgun.qc | 4 ++++ qcsrc/server/w_tuba.qc | 4 ++++ qcsrc/server/w_uzi.qc | 4 ++++ 17 files changed, 68 insertions(+) diff --git a/qcsrc/server/w_campingrifle.qc b/qcsrc/server/w_campingrifle.qc index 8f6a91049..2ee72701f 100644 --- 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 b95a7cef8..53a737f2d 100644 --- 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 c9e7d23c3..7c61599ae 100644 --- 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 0462cd901..10ff3b14d 100644 --- 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 251137401..9409a2b6f 100644 --- 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 638e18bcc..ed2cc3ad6 100644 --- 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 ecd30d769..4de993797 100644 --- 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 7b4eba094..ffec6ac71 100644 --- 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 4d749d0ba..eb3740f39 100644 --- 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 00e8fd890..f44f1bec5 100644 --- 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 7a9103ccf..931d2ef0f 100644 --- 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 55bbc51f8..5b037bf20 100644 --- 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 348a79c70..d2c0e412a 100644 --- 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 83d615884..16cc47281 100644 --- 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 0b499f483..ad2bca918 100644 --- 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 eab14f4f5..0ba1aae3e 100644 --- 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 4887f803d..e392ac9d2 100644 --- 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 -- 2.39.2