ubergames/lilium-voyager
0
0
Fork 0
mirror of https://github.com/UberGames/lilium-voyager.git synced 2024-11-10 14:41:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

Let's actually use MOD_CHAINGUN! From Ensiform.

Browse source
This commit is contained in:
Zack Middleton 2012-06-18 17:12:35 +00:00
parent 56a918b9ac
commit f40042113a
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/game/g_weapon.c
View file

@ -155,12 +155,13 @@ void SnapVectorTowards( vec3_t v, vec3_t to ) {
#ifdef MISSIONPACK #ifdef MISSIONPACK
#define CHAINGUN_SPREAD 600 #define CHAINGUN_SPREAD 600
#define CHAINGUN_DAMAGE 7
#endif #endif
#define MACHINEGUN_SPREAD 200 #define MACHINEGUN_SPREAD 200
#define MACHINEGUN_DAMAGE 7 #define MACHINEGUN_DAMAGE 7
#define MACHINEGUN_TEAM_DAMAGE 5 // wimpier MG in teamplay #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; trace_t tr;
vec3_t end; vec3_t end;
#ifdef MISSIONPACK #ifdef MISSIONPACK
@ -225,7 +226,7 @@ void Bullet_Fire (gentity_t *ent, float spread, int damage ) {
else { else {
#endif #endif
G_Damage( traceEnt, ent, ent, forward, tr.endpos, G_Damage( traceEnt, ent, ent, forward, tr.endpos,
damage, 0, MOD_MACHINEGUN); damage, 0, mod);
#ifdef MISSIONPACK #ifdef MISSIONPACK
} }
#endif #endif
@ -853,9 +854,9 @@ void FireWeapon( gentity_t *ent ) {
break; break;
case WP_MACHINEGUN: case WP_MACHINEGUN:
if ( g_gametype.integer != GT_TEAM ) { if ( g_gametype.integer != GT_TEAM ) {
Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_DAMAGE ); Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_DAMAGE, MOD_MACHINEGUN );
} else { } else {
Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_TEAM_DAMAGE ); Bullet_Fire( ent, MACHINEGUN_SPREAD, MACHINEGUN_TEAM_DAMAGE, MOD_MACHINEGUN );
} }
break; break;
case WP_GRENADE_LAUNCHER: case WP_GRENADE_LAUNCHER:
@ -884,7 +885,7 @@ void FireWeapon( gentity_t *ent ) {
weapon_proxlauncher_fire( ent ); weapon_proxlauncher_fire( ent );
break; break;
case WP_CHAINGUN: case WP_CHAINGUN:
Bullet_Fire( ent, CHAINGUN_SPREAD, MACHINEGUN_DAMAGE ); Bullet_Fire( ent, CHAINGUN_SPREAD, CHAINGUN_DAMAGE, MOD_CHAINGUN );
break; break;
#endif #endif
default: default: