From dbaff25341be4c171337c134e7899211d41413e8 Mon Sep 17 00:00:00 2001 From: aurhat Date: Sun, 11 Jun 2017 01:15:53 +0200 Subject: [PATCH] Cleanup akimbo code --- source/src/serverevents.h | 3 +++ source/src/weapon.cpp | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/source/src/serverevents.h b/source/src/serverevents.h index aabaea4f..248abbc6 100644 --- a/source/src/serverevents.h +++ b/source/src/serverevents.h @@ -42,6 +42,8 @@ void processevent(client *c, shotevent &e) waite.millis; int mag = (akimbo ? 2 : 1) * magsize(e.gun), numbullets = min(gs.ammo[e.gun], mag - gs.mag[e.gun]); if(numbullets<=0) return; diff --git a/source/src/weapon.cpp b/source/src/weapon.cpp index e6bd1358..cdfb5de4 100644 --- a/source/src/weapon.cpp +++ b/source/src/weapon.cpp @@ -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;