diff options
| author | technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 11:15:30 +0000 |
|---|---|---|
| committer | technote24 <technote24@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-04-22 11:15:30 +0000 |
| commit | f68dc1494d25a167a2858d3654f6d0f2ce51a35a (patch) | |
| tree | de0dc92a4f66702b48a03717ac16be3d3331c3e2 /src | |
| parent | f81d3e3afeaa5227dad285ce24c8c17b0b1bd7b5 (diff) | |
| download | hercules-f68dc1494d25a167a2858d3654f6d0f2ce51a35a.tar.gz hercules-f68dc1494d25a167a2858d3654f6d0f2ce51a35a.tar.bz2 hercules-f68dc1494d25a167a2858d3654f6d0f2ce51a35a.tar.xz hercules-f68dc1494d25a167a2858d3654f6d0f2ce51a35a.zip | |
=General
*Removed IT_THROWWEAPON as its not needed.
-The items that use this are being treated as a ammo type through A_THROWWEAPON.
=Database
*Updated throwable items and cannonballs to official.
-Genetics can now equip cannonballs.
-Throwable items are now ammo type number 9 as they should be.
=Jobs
*Genetic's Cart Cannon and Sling Item skills should now work due to the item fixes.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@15922 54d463be-8e91-2dee-dedb-b68131a5f0ec
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; |