[quake3-commits] r2273 - trunk/code/game

[DONOTREPLY at icculus.org]

Author: ztm
Date: 2012-06-18 13:12:35 -0400 (Mon, 18 Jun 2012)
New Revision: 2273

Modified:
   trunk/code/game/g_weapon.c
Log:
Let's actually use MOD_CHAINGUN! From Ensiform.

Modified: trunk/code/game/g_weapon.c
===================================================================
--- trunk/code/game/g_weapon.c	2012-06-18 17:09:33 UTC (rev 2272)
+++ trunk/code/game/g_weapon.c	2012-06-18 17:12:35 UTC (rev 2273)
@@ -155,12 +155,13 @@
 
 #ifdef MISSIONPACK
 #define CHAINGUN_SPREAD		600
+#define CHAINGUN_DAMAGE		7
 #endif
 #define MACHINEGUN_SPREAD	200
 #define	MACHINEGUN_DAMAGE	7
 #define	MACHINEGUN_TEAM_DAMAGE	5		// wimpier MG in teamplay
 
-void Bullet_Fire (gentity_t *ent, float spread, int damage ) {
+void Bullet_Fire (gentity_t *ent, float spread, int damage, int mod ) {
 	trace_t		tr;
 	vec3_t		end;
 #ifdef MISSIONPACK
@@ -225,7 +226,7 @@
 			else {
 #endif
 				G_Damage( traceEnt, ent, ent, forward, tr.endpos,
-					damage, 0, MOD_MACHINEGUN);
+					damage, 0, mod);
 #ifdef MISSIONPACK
 			}
 #endif
@@ -853,9 +854,9 @@
 		break;
 	case WP_MACHINEGUN:
 		if ( g_gametype.integer != GT_TEAM ) {
-			Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_DAMAGE );
+			Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_DAMAGE, MOD_MACHINEGUN );
 		} else {
-			Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_TEAM_DAMAGE );
+			Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_TEAM_DAMAGE, MOD_MACHINEGUN );
 		}
 		break;
 	case WP_GRENADE_LAUNCHER:
@@ -884,7 +885,7 @@
 		weapon_proxlauncher_fire( ent );
 		break;
 	case WP_CHAINGUN:
-		Bullet_Fire( ent, CHAINGUN_SPREAD, MACHINEGUN_DAMAGE );
+		Bullet_Fire( ent, CHAINGUN_SPREAD, CHAINGUN_DAMAGE, MOD_CHAINGUN );
 		break;
 #endif
 	default: