Sfoglia il codice sorgente

Cleaned up a hack from r10112 (forward declaration does the trick)

git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@10633 54d463be-8e91-2dee-dedb-b68131a5f0ec
ultramage 18 anni fa
parent
commit
c24133482f
3 ha cambiato i file con 5 aggiunte e 5 eliminazioni
  1. 3 3
      src/map/itemdb.c
  2. 1 1
      src/map/itemdb.h
  3. 1 1
      src/map/pc.c

+ 3 - 3
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;
 			}
 		}

+ 1 - 1
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

+ 1 - 1
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++)
 		{