* Fixed compile errors and warning in chrif.c and charsave.c. [Valaris]
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@5160 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
parent
3983f053ea
commit
3e1f72d709
@ -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
|
GOES INTO TRUNK AND WILL BE MERGED INTO STABLE BY VALARIS AND WIZPUTER. -- VALARIS
|
||||||
|
|
||||||
2006/02/01
|
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
|
* Map and char server now will complain if they are run using the default
|
||||||
user/password set. [Skotlex]
|
user/password set. [Skotlex]
|
||||||
* Trick Dead makes you stop walking now. [Skotlex]
|
* Trick Dead makes you stop walking now. [Skotlex]
|
||||||
|
@ -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++)
|
for(i = 0; i < max_sc; i++)
|
||||||
{
|
{
|
||||||
if (sc.data[i].timer == -1)
|
if (sc_data->data[i].timer == -1)
|
||||||
continue;
|
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)
|
if (timer == NULL || timer->func != status_change_timer || DIFF_TICK(timer->tick,tick) < 0)
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
sprintf (tmp_sql, "%s ('%d','%d','%hu','%d','%d','%d','%d','%d'),", tmp_sql, account_id, char_id,
|
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++;
|
count++;
|
||||||
}
|
}
|
||||||
|
@ -1158,7 +1158,7 @@ int chrif_save_scdata(struct map_session_data *sd)
|
|||||||
#ifndef TXT_ONLY
|
#ifndef TXT_ONLY
|
||||||
if(charsave_method) //New 'Local' save
|
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;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user