yquake2
/
rogue
mirror of https://github.com/yquake2/rogue.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #28 from BjossiAlfreds/etf-dmflags 

Etf dmflags
This commit is contained in:
Yamagi 2019-09-23 13:09:29 +02:00 committed by GitHub
parent 6258958105 fbbe82d543
commit 3bf86f4d61
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/player/weapon.c
View File

@ -2268,7 +2268,7 @@ weapon_etf_rifle_fire(edict_t *ent)
{
vec3_t forward, right, up;
vec3_t start, tempPt;
int damage;
int damage = 10;
int kick = 3;
int i;
vec3_t offset;
@ -2278,15 +2278,6 @@ weapon_etf_rifle_fire(edict_t *ent)
return;
}
if (deathmatch->value)
{
damage = 10;
}
else
{
damage = 10;
}
if (ent->client->pers.inventory[ent->client->ammo_index] < ent->client->pers.weapon->quantity)
{
VectorClear(ent->client->kick_origin);
@ -2341,7 +2332,11 @@ weapon_etf_rifle_fire(edict_t *ent)
PlayerNoise(ent, start, PNOISE_WEAPON);
ent->client->ps.gunframe++;
ent->client->pers.inventory[ent->client->ammo_index] -= ent->client->pers.weapon->quantity;
if (!((int)dmflags->value & DF_INFINITE_AMMO))
{
ent->client->pers.inventory[ent->client->ammo_index] -= ent->client->pers.weapon->quantity;
}
ent->client->anim_priority = ANIM_ATTACK;
@ -2403,18 +2398,11 @@ Heatbeam_Fire(edict_t *ent)
if (deathmatch->value)
{
damage = HEATBEAM_DM_DMG;
kick = 75; /* really knock 'em around in deathmatch */
}
else
{
damage = HEATBEAM_SP_DMG;
}
if (deathmatch->value) /* really knock 'em around in deathmatch */
{
kick = 75;
}
else
{
kick = 30;
}