From f8226e32aca30c3d50a2478e4011228e7f635066 Mon Sep 17 00:00:00 2001 From: div0 Date: Tue, 2 Sep 2008 16:44:54 +0000 Subject: [PATCH] more Portar fixes git-svn-id: svn://svn.icculus.org/nexuiz/trunk@4292 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/qcsrc/server/portals.qc | 2 +- data/qcsrc/server/w_grenadelauncher.qc | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/data/qcsrc/server/portals.qc b/data/qcsrc/server/portals.qc index 9a8b5e81d..d22e3f639 100644 --- a/data/qcsrc/server/portals.qc +++ b/data/qcsrc/server/portals.qc @@ -252,7 +252,7 @@ entity Portal_Spawn(entity own, vector org, vector ang) return world; } - setsize(portal, '-32 -32 -32', '32 32 32'); + setsize(portal, '-64 -64 -64', '64 64 64'); return portal; } diff --git a/data/qcsrc/server/w_grenadelauncher.qc b/data/qcsrc/server/w_grenadelauncher.qc index e783c02c1..a20003509 100644 --- a/data/qcsrc/server/w_grenadelauncher.qc +++ b/data/qcsrc/server/w_grenadelauncher.qc @@ -104,7 +104,11 @@ void W_Grenade_Attack (void) if (cvar("g_use_ammunition")) self.ammo_rockets = self.ammo_rockets - cvar("g_balance_grenadelauncher_primary_ammo"); +#ifndef PORTAR W_SetupShot (self, '25 6 -8', FALSE, 4, "weapons/grenade_fire.wav"); +#else + W_SetupShot (self, '0 0 0', FALSE, 4, "weapons/grenade_fire.wav"); +#endif //W_SetupShot (self, '25 8 -8', FALSE, 4, "weapons/grenade_fire.wav"); // TODO: move model to the right a little pointparticles(particleeffectnum("grenadelauncher_muzzleflash"), w_shotorg, w_shotdir * 1000, 1); @@ -114,7 +118,11 @@ void W_Grenade_Attack (void) gren.classname = "grenade"; gren.bot_dodge = TRUE; gren.bot_dodgerating = cvar("g_balance_grenadelauncher_primary_damage"); +#ifndef PORTAR gren.movetype = MOVETYPE_BOUNCE; +#else + gren.movetype = MOVETYPE_BOUNCEMISSILE; +#endif gren.solid = SOLID_BBOX; gren.effects = EF_LOWPRECISION; gren.modelflags = MF_GRENADE; @@ -125,7 +133,11 @@ void W_Grenade_Attack (void) gren.nextthink = time + cvar("g_balance_grenadelauncher_primary_lifetime"); gren.think = W_Grenade_Explode; gren.touch = W_Grenade_Touch1; +#ifndef PORTAR gren.velocity = w_shotdir * cvar("g_balance_grenadelauncher_primary_speed") + v_up * cvar("g_balance_grenadelauncher_primary_speed_up"); +#else + gren.velocity = w_shotdir * cvar("g_balance_grenadelauncher_primary_speed"); +#endif W_SetupProjectileVelocity(gren); gren.avelocity_x = random () * -500 - 500; -- 2.39.2