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

[jdolan at jdolan.dyndns.org]

Author: jdolan
Date: 2009-03-15 16:58:22 +0000 (Sun, 15 Mar 2009)
New Revision: 263

Modified:
   quake2world/trunk/src/cl_emit.c
   quake2world/trunk/src/game/default/g_items.c
Log:
Whoops, this wasn't supposed to get in :>

Modified: quake2world/trunk/src/cl_emit.c
===================================================================
--- quake2world/trunk/src/cl_emit.c	2009-03-15 14:51:55 UTC (rev 262)
+++ quake2world/trunk/src/cl_emit.c	2009-03-15 16:58:22 UTC (rev 263)
@@ -189,9 +189,8 @@
 					if(e->atten == -1)  // explicit -1 for global
 						e->atten = ATTN_NONE;
 					else {
-						if(e->atten == 0){  // default
+						if(e->atten == 0)  // default
 							e->atten = ATTN_IDLE;
-						}
 					}
 
 					// flame and steam sounds are always looped

Modified: quake2world/trunk/src/game/default/g_items.c
===================================================================
--- quake2world/trunk/src/game/default/g_items.c	2009-03-15 14:51:55 UTC (rev 262)
+++ quake2world/trunk/src/game/default/g_items.c	2009-03-15 16:58:22 UTC (rev 263)
@@ -987,8 +987,8 @@
 		P_DropWeapon,
 		P_FireRocketLauncher,
 		"weapons/common/pickup.wav",
-		"models/weapons/rocketlauncher/tris.obj",
-		0,
+		"models/weapons/rocketlauncher/tris.md3",
+		EF_ROTATE | EF_BOB | EF_PULSE,
 		"w_rlauncher",
 		"Rocket Launcher",
 		1,