Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Fixed bugreport http://rathena.org/board/tracker/issue-8309-map-server-crash/

Browse Source 
* Fixed bugreport http://rathena.org/board/tracker/issue-8307-error-in-map-server-in-latest-update/

Signed-off-by: Cydh Ramdh <house.bad@gmail.com>
This commit is contained in:
Cydh Ramdh 2013-12-05 11:16:40 +07:00
parent 2755164385
commit 77b2ff8df6
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/map/pc.c
View File

@ -8485,7 +8485,8 @@ int pc_checkcombo(struct map_session_data *sd, struct item_data *data) {
int index, idx, success = 0; int index, idx, success = 0;
for( i = 0; i < data->combos_count; i++ ) { for( i = 0; i < data->combos_count; i++ ) {
int *combo_idx = aMalloc(data->combos[i]->count); int *combo_idx = NULL;
/* ensure this isn't a duplicate combo */ /* ensure this isn't a duplicate combo */
if( sd->combos.bonus != NULL ) { if( sd->combos.bonus != NULL ) {
int x; int x;
@ -8496,6 +8497,7 @@ int pc_checkcombo(struct map_session_data *sd, struct item_data *data) {
continue; continue;
} }
combo_idx = CREATE(combo_idx,int,data->combos[i]->count);
for( j = 0; j < data->combos[i]->count; j++ ) { for( j = 0; j < data->combos[i]->count; j++ ) {
int id = data->combos[i]->nameid[j]; int id = data->combos[i]->nameid[j];
bool found = false; bool found = false;

2
src/map/status.c
View File

@ -6988,7 +6988,7 @@ int status_get_sc_def(struct block_list *src, struct block_list *bl, enum sc_typ
else if (sc->data[SC_SIEGFRIED]) else if (sc->data[SC_SIEGFRIED])
sc_def += sc->data[SC_SIEGFRIED]->val3*100; // Status resistance. sc_def += sc->data[SC_SIEGFRIED]->val3*100; // Status resistance.
else if (sc->data[SC_SHIELDSPELL_REF] && sc->data[SC_SHIELDSPELL_REF]->val1 == 2) else if (sc->data[SC_SHIELDSPELL_REF] && sc->data[SC_SHIELDSPELL_REF]->val1 == 2)
sc_def += sc->data[SC_SIEGFRIED]->val3*100; sc_def += sc->data[SC_SHIELDSPELL_REF]->val3*100;
} }
// When tick def not set, reduction is the same for both. // When tick def not set, reduction is the same for both.