diff --git a/source/src/entities.cpp b/source/src/entities.cpp index 358943c0..48dc5d33 100644 --- a/source/src/entities.cpp +++ b/source/src/entities.cpp @@ -257,11 +257,6 @@ void equip(playerent *d) d->mag[d->primary] = magsize(d->primary); } - if (d->hasarmour) - { - if(gamemode==m_arena) d->armour = 100; - } - d->gunselect = d->primary; } diff --git a/source/src/entity.h b/source/src/entity.h index 0a71220e..4f94f7e5 100644 --- a/source/src/entity.h +++ b/source/src/entity.h @@ -167,7 +167,7 @@ struct playerent : dynent int mag[NUMGUNS]; string name, team; int shots; //keeps track of shots from auto weapons - bool reloading, hasarmour, weaponchanging; + bool reloading, weaponchanging; int nextweapon; // weapon we switch to int primary; //primary gun int nextprimary; // primary after respawning @@ -195,7 +195,6 @@ struct playerent : dynent history.reset(); health = 100; armour = 0; - hasarmour = false; lastaction = akimbolastaction[0] = akimbolastaction[1] = 0; akimbomillis = 0; gunselect = GUN_PISTOL;