diff --git a/source/src/entity.h b/source/src/entity.h index 76a82e5a..e301f1f7 100644 --- a/source/src/entity.h +++ b/source/src/entity.h @@ -37,7 +37,7 @@ struct entity : persistent_entity int lastmillis; entity(short x, short y, short z, uchar type, short attr1, uchar attr2, uchar attr3, uchar attr4) : persistent_entity(x, y, z, type, attr1, attr2, attr3, attr4), spawned(false) {} entity() {} - bool fitsmode(int gamemode) { return !m_noitems && isitem(type) && !(m_noitemsnade && type!=I_GRENADE) && !(m_pistol && type==I_AMMO); } + bool fitsmode(int gamemode) { return !m_noitems && isitem(type) && !(m_noitemsnade && type!=I_GRENADE) && !(m_pistol && (type!=I_GRENADE && type!=I_CLIPS && type!=I_AMMO)); } void transformtype(int gamemode) { if(m_noitemsnade && type==I_CLIPS) type = I_GRENADE;