From 1cd89d146dc11603342f44a91cb66ee40a8bfb19 Mon Sep 17 00:00:00 2001 From: Valaris Date: Thu, 2 Feb 2006 01:01:18 +0000 Subject: * Fixed compile errors and warning in chrif.c and charsave.c. [Valaris] git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@5160 54d463be-8e91-2dee-dedb-b68131a5f0ec --- Changelog-Trunk.txt | 2 +- src/map/charsave.c | 6 +++--- src/map/chrif.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Changelog-Trunk.txt b/Changelog-Trunk.txt index 3c02459fc..ff5d59fc3 100644 --- a/Changelog-Trunk.txt +++ b/Changelog-Trunk.txt @@ -5,7 +5,7 @@ IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. EV GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS 2006/02/01 - * Fixed typo in chrif.c causing compilation error (sd->sc_data => sd->sc.data) [Valaris] + * Fixed compile errors and warning in chrif.c and charsave.c. [Valaris] * Map and char server now will complain if they are run using the default user/password set. [Skotlex] * Trick Dead makes you stop walking now. [Skotlex] diff --git a/src/map/charsave.c b/src/map/charsave.c index 5ce1fb194..e9fc888db 100644 --- a/src/map/charsave.c +++ b/src/map/charsave.c @@ -491,14 +491,14 @@ void charsave_save_scdata(int account_id, int char_id, struct status_change* sc_ for(i = 0; i < max_sc; i++) { - if (sc.data[i].timer == -1) + if (sc_data->data[i].timer == -1) continue; - timer = get_timer(sc.data[i].timer); + timer = get_timer(sc_data->data[i].timer); if (timer == NULL || timer->func != status_change_timer || DIFF_TICK(timer->tick,tick) < 0) continue; sprintf (tmp_sql, "%s ('%d','%d','%hu','%d','%d','%d','%d','%d'),", tmp_sql, account_id, char_id, - i, DIFF_TICK(timer->tick,tick), sc.data[i].val1, sc.data[i].val2, sc.data[i].val3, sc.data[i].val4); + i, DIFF_TICK(timer->tick,tick), sc_data->data[i].val1, sc_data->data[i].val2, sc_data->data[i].val3, sc_data->data[i].val4); count++; } diff --git a/src/map/chrif.c b/src/map/chrif.c index ffdb21cd3..eda3a14e5 100644 --- a/src/map/chrif.c +++ b/src/map/chrif.c @@ -1158,7 +1158,7 @@ int chrif_save_scdata(struct map_session_data *sd) #ifndef TXT_ONLY if(charsave_method) //New 'Local' save { - charsave_save_scdata(sd->status.account_id, sd->status.char_id, sd->sc.data, MAX_STATUSCHANGE); + charsave_save_scdata(sd->status.account_id, sd->status.char_id, &sd->sc, MAX_STATUSCHANGE); return 0; } #endif -- cgit v1.2.3-70-g09d2