From 1f29f50f75ce678b2bcd05860f2ab5ed0edb81b6 Mon Sep 17 00:00:00 2001 From: Cydh Ramdh Date: Fri, 10 Jan 2014 17:39:14 +0700 Subject: [PATCH] Follow up 780b9d3 Signed-off-by: Cydh Ramdh --- src/map/pc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/map/pc.c b/src/map/pc.c index f160965d8f..9740f2c556 100755 --- a/src/map/pc.c +++ b/src/map/pc.c @@ -8513,7 +8513,6 @@ void pc_cleareventtimer(struct map_session_data *sd) static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) { uint16 i; int success = 0; - for( i = 0; i < data->combos_count; i++ ) { int16 *combo_idx = NULL, idx, j; /* ensure this isn't a duplicate combo */ @@ -8527,7 +8526,7 @@ static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) { } CREATE(combo_idx,int16,data->combos[i]->count); - memset(combo_idx,-1,data->combos[i]->count); + memset(combo_idx,-1,sizeof(combo_idx)); for( j = 0; j < data->combos[i]->count; j++ ) { uint16 id = data->combos[i]->nameid[j], k; bool found = false; @@ -8544,7 +8543,7 @@ static int pc_checkcombo(struct map_session_data *sd, struct item_data *data) { if(!sd->inventory_data[index]) continue; if(j>0){ - uint16 z; + uint8 z; for (z = 0; z < data->combos[i]->count; z++) if(combo_idx[z] == index) //we already have that index recorded do_continue=true;