summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorshennetsind <notind@gmail.com>2013-09-28 10:56:19 -0700
committershennetsind <notind@gmail.com>2013-09-28 10:56:19 -0700
commit00c26a4d1bdd19f8f0f2ce3e9d5fbd2a6b5a0ab4 (patch)
tree67f474dde21aa054ee2cc0406607e8bd664f39c4
parent07eba3971b99c979949c6002109897c07234fc64 (diff)
parent84b3b60a846bc01a2bdefcd16f0d345bdc35edda (diff)
downloadhercules-00c26a4d1bdd19f8f0f2ce3e9d5fbd2a6b5a0ab4.tar.gz
hercules-00c26a4d1bdd19f8f0f2ce3e9d5fbd2a6b5a0ab4.tar.bz2
hercules-00c26a4d1bdd19f8f0f2ce3e9d5fbd2a6b5a0ab4.tar.xz
hercules-00c26a4d1bdd19f8f0f2ce3e9d5fbd2a6b5a0ab4.zip
Merge pull request #164 from cannelle/patch-1
Fix for incorrect mob_warpslave_sub and map_quit clear values.
-rw-r--r--src/map/map.c2
-rw-r--r--src/map/mob.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 5c973889e..ea05208a6 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1597,7 +1597,7 @@ int map_quit(struct map_session_data *sd) {
clif->chsys_quit(sd);
- unit->remove_map_pc(sd,CLR_TELEPORT);
+ unit->remove_map_pc(sd,CLR_RESPAWN);
if( maplist[sd->bl.m].instance_id >= 0 ) { // Avoid map conflicts and warnings on next login
int16 m;
diff --git a/src/map/mob.c b/src/map/mob.c
index 8e956adc1..f6938f7b7 100644
--- a/src/map/mob.c
+++ b/src/map/mob.c
@@ -2781,7 +2781,7 @@ int mob_warpslave_sub(struct block_list *bl,va_list ap) {
return 0;
map->search_freecell(master, 0, &x, &y, range, range, 0);
- unit->warp(&md->bl, master->m, x, y,CLR_RESPAWN);
+ unit->warp(&md->bl, master->m, x, y,CLR_TELEPORT);
return 1;
}