[Quake2world-dev] r430 - in quake2world/trunk/src: . game/default

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2009-04-22 02:30:40 +0000 (Wed, 22 Apr 2009)
New Revision: 430

Modified:
   quake2world/trunk/src/cl_effect.c
   quake2world/trunk/src/cl_main.c
   quake2world/trunk/src/game/default/g_spawn.c
Log:
Increase angular velocity of energy trail particles.
Remove ammo pic from HUD program, move weapon pic to its place.

Modified: quake2world/trunk/src/cl_effect.c
===================================================================
--- quake2world/trunk/src/cl_effect.c	2009-04-21 21:40:29 UTC (rev 429)
+++ quake2world/trunk/src/cl_effect.c	2009-04-22 02:30:40 UTC (rev 430)
@@ -928,7 +928,7 @@
 			avelocities[0][i] = (rand() & 255) * 0.01;
 	}
 
-	ltime = (float)cl.time / 1000.0;
+	ltime = (float)cl.time / 300.0;
 
 	for(i = 0; i < NUMVERTEXNORMALS; i+= 4){
 

Modified: quake2world/trunk/src/cl_main.c
===================================================================
--- quake2world/trunk/src/cl_main.c	2009-04-21 21:40:29 UTC (rev 429)
+++ quake2world/trunk/src/cl_main.c	2009-04-22 02:30:40 UTC (rev 430)
@@ -1023,8 +1023,10 @@
 	}
 
 	if(!timedemo->value){  // check framerate cap conditions
+
 		if(cl_maxpps->value > 0.0 && cls.packet_delta < 1000.0 / cl_maxpps->value)
 			packet_frame = false;  // cap net framerate
+
 		if(cl_maxfps->value > 0.0 && cls.render_delta < 1000.0 / cl_maxfps->value)
 			render_frame = false;  // and render framerate
 	}

Modified: quake2world/trunk/src/game/default/g_spawn.c
===================================================================
--- quake2world/trunk/src/game/default/g_spawn.c	2009-04-21 21:40:29 UTC (rev 429)
+++ quake2world/trunk/src/game/default/g_spawn.c	2009-04-22 02:30:40 UTC (rev 430)
@@ -532,14 +532,14 @@
 	"pic 0 "
 	"endif "
 
-	// ammo
+	// ammo and weapon
 	"if 2 "
 	"xv	256 "
 	"yb -40 "
 	"ammo "
 	"yb -64 "
 	"xv	320 "
-	"pic 2 "
+	"pic 8 "
 	"endif "
 
 	// armor
@@ -562,13 +562,6 @@
 	"stat_string 7 "
 	"endif "
 
-	// weapon
-	"if 8 "
-	"xv 256 "
-	"yb	-96 "
-	"pic 8 "
-	"endif "
-
 	// spectator
 	"if 12 "
 	"xv 240 "