Cleanup akimbo code

This commit is contained in:
aurhat
2017-06-11 01:15:53 +02:00
parent 800e4f3a13
commit dbaff25341
2 changed files with 4 additions and 7 deletions
+3
View File
@@ -42,6 +42,8 @@ void processevent(client *c, shotevent &e)
wait<gs.gunwait[e.gun] ||
gs.mag[e.gun]<=0)
return;
if(e.gun == GUN_AKIMBO && gs.akimbomillis < gamemillis) return;
if(e.gun!=GUN_KNIFE) gs.mag[e.gun]--;
loopi(NUMGUNS) if(gs.gunwait[i]) gs.gunwait[i] = max(gs.gunwait[i] - (e.millis-gs.lastshot), 0);
gs.lastshot = e.millis;
@@ -126,6 +128,7 @@ void processevent(client *c, reloadevent &e)
gs.ammo[e.gun]<=0)
return;
if(e.gun == GUN_AKIMBO && gs.akimbomillis < gamemillis) return;
bool akimbo = e.gun==GUN_PISTOL && gs.akimbomillis>e.millis;
int mag = (akimbo ? 2 : 1) * magsize(e.gun), numbullets = min(gs.ammo[e.gun], mag - gs.mag[e.gun]);
if(numbullets<=0) return;
+1 -7
View File
@@ -1779,15 +1779,9 @@ void checkakimbo()
weapon &p = *player1->weapons[GUN_PISTOL];
player1->akimbo = false;
a.reset();
// transfer ammo to pistol
p.mag = min((int)p.info.magsize, max(a.mag, p.mag));
p.ammo = max(p.ammo, p.ammo);
// fix akimbo magcontent
a.mag = 0;
a.ammo = 0;
if(player1->weaponsel->type==GUN_AKIMBO || (player1->weaponchanging && player1->nextweaponsel->type==GUN_AKIMBO))
{
switch(akimboendaction)
{
case 0: player1->weaponswitch(player1->weapons[GUN_KNIFE]); break;