diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/common/mmo.h | 1 | ||||
| -rw-r--r-- | src/map/itemdb.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/common/mmo.h b/src/common/mmo.h index 55dcd9ed1..ddcbf1272 100644 --- a/src/common/mmo.h +++ b/src/common/mmo.h @@ -175,7 +175,6 @@ enum item_types { IT_UNKNOWN2,//9 IT_AMMO, //10 IT_DELAYCONSUME,//11 - IT_THROWWEAPON= 17,//17 IT_CASH = 18, IT_MAX }; diff --git a/src/map/itemdb.c b/src/map/itemdb.c index 44a296bb0..cce5a19dd 100644 --- a/src/map/itemdb.c +++ b/src/map/itemdb.c @@ -771,7 +771,7 @@ static bool itemdb_parse_dbrow(char** str, const char* source, int line, int scr id->type = atoi(str[3]); - if( id->type < 0 || id->type == IT_UNKNOWN || id->type == IT_UNKNOWN2 || ( id->type > IT_DELAYCONSUME && id->type < IT_THROWWEAPON ) || id->type >= IT_MAX ) + if( id->type < 0 || id->type == IT_UNKNOWN || id->type == IT_UNKNOWN2 || ( id->type > IT_DELAYCONSUME && id->type < IT_CASH ) || id->type >= IT_MAX ) {// catch invalid item types ShowWarning("itemdb_parse_dbrow: Invalid item type %d for item %d. IT_ETC will be used.\n", id->type, nameid); id->type = IT_ETC; |