kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

finishing touches on AR/SubGun spread/damage-alteration

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@5927 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
flowtron
2010-11-22 18:58:29 +00:00
parent 841a0b6aae
commit c4be2481b3
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/weapon.cpp
+3 -2
View File
@@ -570,7 +570,8 @@ void raydamage(vec &from, vec &to, playerent *d)
case GUN_SUBGUN: if(flag4subgunDMGalt) dam +=1; break;
default: break;
}
hitpush(dam, o, d, from, to, d->weaponsel->type, gib, gib ? 1 : 0);
bool info = gib || (GUN_SUBGUN && flag4subgunDMGalt);
hitpush(dam, o, d, from, to, d->weaponsel->type, gib, info ? 1 : 0);
if(d==player1) hitted=true;
shorten(from, o->o, to);
}
@@ -1225,7 +1226,7 @@ bool rifle::selectable() { return weapon::selectable() && !m_noprimary && this =
assaultrifle::assaultrifle(playerent *owner) : gun(owner, GUN_ASSAULT) {}
int assaultrifle::dynspread() { return shots > 3 ? info.spread * 3 : info.spread; }
int assaultrifle::dynspread() { return shots > 3 ? 60 : ( info.spread + ( shots > 0 ? ( shots == 1 ? 5 : 15 ) : 0 }
float assaultrifle::dynrecoil() { return info.recoil + (rnd(8)*-0.01f); }
bool assaultrifle::selectable() { return weapon::selectable() && !m_noprimary && this == owner->primweap; }