summaryrefslogtreecommitdiff
path: root/src/map/chrif.c
diff options
context:
space:
mode:
authorskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-27 14:54:01 +0000
committerskotlex <skotlex@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-06-27 14:54:01 +0000
commit036bbfd9ae5a4a77031fb33a87264e58214c2ba0 (patch)
tree7df6db240c83ab4c0e7b5733dee337c0583010b8 /src/map/chrif.c
parentf68366250c523440b972616f61577edfe6d51c04 (diff)
downloadhercules-036bbfd9ae5a4a77031fb33a87264e58214c2ba0.tar.gz
hercules-036bbfd9ae5a4a77031fb33a87264e58214c2ba0.tar.bz2
hercules-036bbfd9ae5a4a77031fb33a87264e58214c2ba0.tar.xz
hercules-036bbfd9ae5a4a77031fb33a87264e58214c2ba0.zip
- Fixed indentation on int_pet.c (how did it got messed up?)
- Added mapflag "loadevent", now load-map script events will ONLY trigger on maps with this mapflag on, rather than every map. - High Jump can now be used in all versus maps. - Added Kaite's opt3 value, taken from jA - Added state dirty == 2 to storages. Signals when a storage was sent for final saving. Said storage is removed from memory after the ack from the char-server, and they are sent to save if the map/char servers reconnect before the act arrives. In short: they are guaranteed to be saved after a char logs out. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7358 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/chrif.c')
-rw-r--r--src/map/chrif.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/map/chrif.c b/src/map/chrif.c
index 5b7dee2de..be0b2a25f 100644
--- a/src/map/chrif.c
+++ b/src/map/chrif.c
@@ -189,7 +189,7 @@ int chrif_save(struct map_session_data *sd, int flag)
return -1; //Refuse to save a char already tagged for final saving. [Skotlex]
//For data sync
if (sd->state.storage_flag == 1)
- storage_storage_save(sd->status.account_id);
+ storage_storage_save(sd->status.account_id, flag);
else if (sd->state.storage_flag == 2)
storage_guild_storagesave(sd->status.account_id, sd->status.guild_id);
@@ -218,10 +218,8 @@ int chrif_save(struct map_session_data *sd, int flag)
#ifndef TXT_ONLY
}
#endif
- if (flag) {//Remove the storage from memory.
- storage_delete(sd->status.account_id);
+ if (flag)
sd->state.finalsave = 1; //Mark the last save as done.
- }
return 0;
}