r4292 - trunk/data/qcsrc/server

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-09-02 12:44:54 -0400 (Tue, 02 Sep 2008)
New Revision: 4292

Modified:
   trunk/data/qcsrc/server/portals.qc
   trunk/data/qcsrc/server/w_grenadelauncher.qc
Log:
more Portar fixes


Modified: trunk/data/qcsrc/server/portals.qc
===================================================================
--- trunk/data/qcsrc/server/portals.qc	2008-09-02 16:24:52 UTC (rev 4291)
+++ trunk/data/qcsrc/server/portals.qc	2008-09-02 16:44:54 UTC (rev 4292)
@@ -252,7 +252,7 @@
 		return world;
 	}
 
-	setsize(portal, '-32 -32 -32', '32 32 32');
+	setsize(portal, '-64 -64 -64', '64 64 64');
 
 	return portal;
 }

Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc	2008-09-02 16:24:52 UTC (rev 4291)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc	2008-09-02 16:44:54 UTC (rev 4292)
@@ -104,7 +104,11 @@
 
 	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 @@
 	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 @@
 	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;