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

fix compiler warning

Browse Source 
git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@4130 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
ac_stef
2009-01-12 15:27:25 +00:00
parent 4bb129ee40
commit fafa762fab
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/src/entity.h
+6 -2
View File
@@ -14,7 +14,7 @@ enum // static entity types
MAXENTTYPES
};
#define isitem(i) (i >= I_CLIPS && i <= I_AKIMBO)
#define isitem(i) ((i) >= I_CLIPS && (i) <= I_AKIMBO)
struct persistent_entity // map entity
{
@@ -32,7 +32,11 @@ struct entity : public persistent_entity
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); }
void transformtype(int gamemode) { type = (m_noitemsnade && type==I_CLIPS) ? I_GRENADE : ((m_pistol && type==I_AMMO) ? I_CLIPS : type); }
void transformtype(int gamemode)
{
if(m_noitemsnade && type==I_CLIPS) type = I_GRENADE;
else if(m_pistol && type==I_AMMO) type = I_CLIPS;
}
};
struct itemstat { int add, start, max, sound; };