diff options
| author | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-30 13:53:13 +0000 |
|---|---|---|
| committer | skotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2006-06-30 13:53:13 +0000 |
| commit | 15976eb40c2689d53d537ab425447eca572d9e7e (patch) | |
| tree | fbabf9d6f2e9b87485babe28c19567d9e097d949 /src/map/map.h | |
| parent | 90cbdc408520d9902be4f67d29a3ebc7f8625c5b (diff) | |
| download | hercules-15976eb40c2689d53d537ab425447eca572d9e7e.tar.gz hercules-15976eb40c2689d53d537ab425447eca572d9e7e.tar.bz2 hercules-15976eb40c2689d53d537ab425447eca572d9e7e.tar.xz hercules-15976eb40c2689d53d537ab425447eca572d9e7e.zip | |
- Moved item group enumeration from itemdb.h to map.h
- Cleanup in itemheal related code, fixed the item heal group bonus not working on Groups beyond 7.
- Fixed pet's loot not being moved to your inventory on logout.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7419 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/map.h')
| -rw-r--r-- | src/map/map.h | 42 |
1 files changed, 41 insertions, 1 deletions
diff --git a/src/map/map.h b/src/map/map.h index 7a8b99f33..da8b1c715 100644 --- a/src/map/map.h +++ b/src/map/map.h @@ -216,6 +216,46 @@ enum { ELE_MAX
};
+enum {
+ IG_BLUEBOX=1,
+ IG_VIOLETBOX, //2
+ IG_CARDALBUM, //3
+ IG_GIFTBOX, //4
+ IG_SCROLLBOX, //5
+ IG_FINDINGORE, //6
+ IG_COOKIEBAG, //7
+ IG_POTION, //8
+ IG_HERBS, //9
+ IG_FRUITS, //10
+ IG_MEAT, //11
+ IG_CANDY, //12
+ IG_JUICE, //13
+ IG_FISH, //14
+ IG_BOXES, //15
+ IG_GEMSTONE, //16
+ IG_JELLOPY, //17
+ IG_ORE, //18
+ IG_FOOD, //19
+ IG_RECOVERY, //20
+ IG_MINERALS, //21
+ IG_TAMING, //22
+ IG_SCROLLS, //23
+ IG_QUIVERS, //24
+ IG_MASKS, //25
+ IG_ACCESORY, //26
+ IG_JEWELS, //27
+ IG_GIFTBOX_1, //28
+ IG_GIFTBOX_2, //29
+ IG_GIFTBOX_3, //30
+ IG_GIFTBOX_4, //31
+ IG_EGGBOY, //32
+ IG_EGGGIRL, //33
+ IG_GIFTBOXCHINA, //34
+ IG_LOTTOBOX, //35
+ MAX_ITEMGROUP,
+} item_group_list;
+
+
struct block_list {
struct block_list *next,*prev;
int id;
@@ -587,7 +627,7 @@ struct map_session_data { int magic_addsize[3];
int critaddrace[RC_MAX];
int expaddrace[RC_MAX];
- int itemhealrate[7];
+ int itemhealrate[MAX_ITEMGROUP];
int addeff3[SC_COMMON_MAX-SC_COMMON_MIN+1];
short addeff3_type[SC_COMMON_MAX-SC_COMMON_MIN+1];
short sp_gain_race[RC_MAX];
|