summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-27 19:26:00 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2007-05-27 19:26:00 +0000
commite0e70276d5d0bf992d7327d4e2696da62c5a2237 (patch)
tree64c22e6404f611aea1420d19d5197207de9f8fcf /src
parent5795eee87863dbdcc4133cd7e0a63d4fb5337bde (diff)
downloadhercules-e0e70276d5d0bf992d7327d4e2696da62c5a2237.tar.gz
hercules-e0e70276d5d0bf992d7327d4e2696da62c5a2237.tar.bz2
hercules-e0e70276d5d0bf992d7327d4e2696da62c5a2237.tar.xz
hercules-e0e70276d5d0bf992d7327d4e2696da62c5a2237.zip
Cleaned up a hack from r10112 (forward declaration does the trick)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@10633 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/itemdb.c6
-rw-r--r--src/map/itemdb.h2
-rw-r--r--src/map/pc.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/map/itemdb.c b/src/map/itemdb.c
index bf23c5280..4e93dc309 100644
--- a/src/map/itemdb.c
+++ b/src/map/itemdb.c
@@ -101,16 +101,16 @@ int itemdb_searchrandomid(int group)
/*==========================================
* Calculates total item-group related bonuses for the given item
*------------------------------------------*/
-int itemdb_group_bonus(const int itemgrouphealrate[MAX_ITEMGROUP], int itemid)
+int itemdb_group_bonus(struct map_session_data* sd, int itemid)
{
int bonus = 0, i, j;
for (i=0; i < MAX_ITEMGROUP; i++) {
- if (!itemgrouphealrate[i])
+ if (!sd->itemgrouphealrate[i])
continue;
for (j=0; j < itemgroup_db[i].qty; j++) {
if (itemgroup_db[i].nameid[j] == itemid)
{
- bonus += itemgrouphealrate[i];
+ bonus += sd->itemgrouphealrate[i];
break;
}
}
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 1edd0f96f..425df63de 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -147,8 +147,8 @@ struct item_data* itemdb_exists(int nameid);
#define itemdb_available(n) (itemdb_exists(n) && itemdb_search(n)->flag.available)
#define itemdb_viewid(n) (itemdb_search(n)->view_id)
#define itemdb_autoequip(n) (itemdb_search(n)->flag.autoequip)
-int itemdb_group_bonus(const int itemgrouphealrate[MAX_ITEMGROUP], int itemid);
+int itemdb_group_bonus(struct map_session_data* sd, int itemid);
int itemdb_searchrandomid(int flags);
#define itemdb_value_buy(n) itemdb_search(n)->value_buy
diff --git a/src/map/pc.c b/src/map/pc.c
index 8692599f1..127020e1e 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -5506,7 +5506,7 @@ int pc_itemheal(struct map_session_data *sd,int itemid, int hp,int sp)
if (potion_flag > 1)
bonus += bonus*(potion_flag-1)*50/100;
//Item Group bonuses
- bonus += bonus*itemdb_group_bonus(sd->itemgrouphealrate, itemid)/100;
+ bonus += bonus*itemdb_group_bonus(sd, itemid)/100;
//Individual item bonuses.
for(i = 0; i < MAX_PC_BONUS && sd->itemhealrate[i].nameid; i++)
{