summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-06 23:01:58 +0000
committerultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec>2008-01-06 23:01:58 +0000
commit8f3f5c94a0111b37b374f7d861533f5f25a99af5 (patch)
treec7f14ec7fa97c9966baec1f06478dcd75e09fcf7 /src/map
parentc4227b9c59b6495e7853c0736f1fa4a2a40b9ba4 (diff)
downloadhercules-8f3f5c94a0111b37b374f7d861533f5f25a99af5.tar.gz
hercules-8f3f5c94a0111b37b374f7d861533f5f25a99af5.tar.bz2
hercules-8f3f5c94a0111b37b374f7d861533f5f25a99af5.tar.xz
hercules-8f3f5c94a0111b37b374f7d861533f5f25a99af5.zip
Corrected a TXT compilation problem caused by r12023 (mail system code is not present in TXT builds).
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12026 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/clif.c13
1 files changed, 9 insertions, 4 deletions
diff --git a/src/map/clif.c b/src/map/clif.c
index 6974f7426..70da31b53 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7049,8 +7049,6 @@ int clif_refresh(struct map_session_data *sd)
{
nullpo_retr(-1, sd);
- mail_clear(sd);
-
clif_changemap(sd,sd->mapindex,sd->bl.x,sd->bl.y);
clif_inventorylist(sd);
if(pc_iscarton(sd)) {
@@ -7073,6 +7071,11 @@ int clif_refresh(struct map_session_data *sd)
clif_send_homdata(sd,0,0);
map_foreachinrange(clif_getareachar,&sd->bl,AREA_SIZE,BL_ALL,sd);
clif_weather_check(sd);
+
+#ifndef TXT_ONLY
+ mail_clear(sd);
+#endif
+
return 0;
}
@@ -7691,8 +7694,6 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
return;
}
- mail_clear(sd);
-
if (sd->state.rewarp)
{ //Rewarp player.
sd->state.rewarp = 0;
@@ -7883,6 +7884,10 @@ void clif_parse_LoadEndAck(int fd,struct map_session_data *sd)
if(sd->npc_id)
npc_event_dequeue(sd);
+
+#ifndef TXT_ONLY
+ mail_clear(sd);
+#endif
}
if(map[sd->bl.m].flag.loadevent) // Lance