summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-12 21:49:42 +0000
committerzephyrus <zephyrus@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-03-12 21:49:42 +0000
commit9f3181501f0d95ffcc37bcb6a816c36362d1b164 (patch)
tree490db1d2aaa13645bba30b98e8bcc7a3e5280c09 /src
parent882a3192acdd6ca2a6e50fc0f9fc877bc454efb7 (diff)
downloadhercules-9f3181501f0d95ffcc37bcb6a816c36362d1b164.tar.gz
hercules-9f3181501f0d95ffcc37bcb6a816c36362d1b164.tar.bz2
hercules-9f3181501f0d95ffcc37bcb6a816c36362d1b164.tar.xz
hercules-9f3181501f0d95ffcc37bcb6a816c36362d1b164.zip
- Fixed bug report 1170.
- Now char data is saved to on a success mail send or auction register operation. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12351 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
-rw-r--r--src/map/clif.c5
-rw-r--r--src/map/intif.c8
2 files changed, 11 insertions, 2 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 437da3241..af4668cad 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7978,6 +7978,7 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
sd->state.night = 0;
clif_status_load(&sd->bl, SI_NIGHT, 0);
}
+ sd->state.changemap = false;
}
sd->state.using_fake_npc = 0;
@@ -11681,7 +11682,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
if( DIFF_TICK(sd->cansendmail_tick, gettick()) > 0 )
{
clif_displaymessage(sd->fd,"Cannot send mails too fast!!.");
- clif_Mail_send(fd, 1); // fail
+ clif_Mail_send(fd, true); // fail
return;
}
@@ -11692,7 +11693,7 @@ void clif_parse_Mail_send(int fd, struct map_session_data *sd)
if( !mail_setattachment(sd, &msg) )
{ // Invalid Append condition
- clif_Mail_send(sd->fd, 1); // fail
+ clif_Mail_send(sd->fd, true); // fail
mail_removeitem(sd,0);
mail_removezeny(sd,0);
return;
diff --git a/src/map/intif.c b/src/map/intif.c
index 684353395..51bbd740b 100644
--- a/src/map/intif.c
+++ b/src/map/intif.c
@@ -1644,7 +1644,11 @@ static void intif_parse_Mail_send(int fd)
if( fail )
mail_deliveryfail(sd, &msg);
else
+ {
clif_Mail_send(sd->fd, false);
+ if( save_settings&16 )
+ chrif_save(sd, 0);
+ }
}
if( fail )
@@ -1738,7 +1742,11 @@ static void intif_parse_Auction_register(int fd)
return;
if( auction.auction_id > 0 )
+ {
clif_Auction_message(sd->fd, 1); // Confirmation Packet ??
+ if( save_settings&32 )
+ chrif_save(sd,0);
+ }
else
{
clif_Auction_message(sd->fd, 4);