summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-03 14:17:53 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-04-03 14:17:53 +0000
commit1f7a0e3bf5c4ada8bfcd756c83c451be51f80e08 (patch)
tree812e8c301680db1a332426a830ed5d5d4f7e2142
parent33c862fabb849bbd93ef0bbba4688c149aefeccf (diff)
downloadhercules-1f7a0e3bf5c4ada8bfcd756c83c451be51f80e08.tar.gz
hercules-1f7a0e3bf5c4ada8bfcd756c83c451be51f80e08.tar.bz2
hercules-1f7a0e3bf5c4ada8bfcd756c83c451be51f80e08.tar.xz
hercules-1f7a0e3bf5c4ada8bfcd756c83c451be51f80e08.zip
- Oops, the overflow mentioned by foobar was actually because the equippable base-jobs field was unsigned short when we now need it to be unsigned int. Fixed now.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5884 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--src/map/itemdb.c2
-rw-r--r--src/map/itemdb.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index f9e47d56f..cac0ae986 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -194,7 +194,7 @@ struct item_data* itemdb_exists(int nameid)
* to the format used by the map server. [Skotlex]
*------------------------------------------
*/
-static void itemdb_jobid2mapid(unsigned short *bclass, int jobmask)
+static void itemdb_jobid2mapid(unsigned int *bclass, int jobmask)
{
int i;
bclass[0]= bclass[1]= bclass[2]= 0;
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index d95d64a43..f65b4b943 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -32,7 +32,7 @@ struct item_data {
int wlv;
//Lupus: I rearranged order of these fields due to compatibility with ITEMINFO script command
// some script commands should be revised as well...
- unsigned short class_base[3]; //Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)
+ unsigned int class_base[3]; //Specifies if the base can wear this item (split in 3 indexes per type: 1-1, 2-1, 2-2)
unsigned class_upper : 3; //Specifies if the upper-type can equip it (1: normal, 2: upper, 3: baby)
unsigned char *script; // 攻撃,防御の属性設定もこの中で可能かな?
struct {