|
@@ -78,7 +78,7 @@ enum mail_type {
|
|
|
|
|
|
/** Converts item type to display it on client if necessary.
|
|
/** Converts item type to display it on client if necessary.
|
|
* @param nameid: Item ID
|
|
* @param nameid: Item ID
|
|
-* @return item type. For IT_PETEGG will be displayed as IT_WEAPON. If Shadow Weapon of IT_SHADOWGEAR as IT_WEAPON and else as IT_ARMOR
|
|
|
|
|
|
+* @return item type. For IT_PETEGG will be displayed as IT_ARMOR. If Shadow Weapon of IT_SHADOWGEAR as IT_WEAPON and else as IT_ARMOR
|
|
*/
|
|
*/
|
|
static inline int itemtype(unsigned short nameid) {
|
|
static inline int itemtype(unsigned short nameid) {
|
|
struct item_data* id = itemdb_search(nameid); //Use itemdb_search, so non-existance item will use dummy data and won't crash the server. bugreport:8468
|
|
struct item_data* id = itemdb_search(nameid); //Use itemdb_search, so non-existance item will use dummy data and won't crash the server. bugreport:8468
|
|
@@ -89,7 +89,7 @@ static inline int itemtype(unsigned short nameid) {
|
|
else
|
|
else
|
|
return IT_ARMOR;
|
|
return IT_ARMOR;
|
|
}
|
|
}
|
|
- return ( type == IT_PETEGG ) ? IT_WEAPON : type;
|
|
|
|
|
|
+ return ( type == IT_PETEGG ) ? IT_ARMOR : type;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
@@ -4519,7 +4519,7 @@ void clif_storageitemadded(struct map_session_data* sd, struct item* i, int inde
|
|
WFIFOL(fd, 4) = amount; // amount
|
|
WFIFOL(fd, 4) = amount; // amount
|
|
WFIFOW(fd, 8) = ( view > 0 ) ? view : i->nameid; // id
|
|
WFIFOW(fd, 8) = ( view > 0 ) ? view : i->nameid; // id
|
|
#if PACKETVER >= 5
|
|
#if PACKETVER >= 5
|
|
- WFIFOB(fd,10) = itemdb_type(i->nameid); //type
|
|
|
|
|
|
+ WFIFOB(fd,10) = itemtype(i->nameid); //type
|
|
offset += 1;
|
|
offset += 1;
|
|
#endif
|
|
#endif
|
|
WFIFOB(fd,10+offset) = i->identify; //identify flag
|
|
WFIFOB(fd,10+offset) = i->identify; //identify flag
|