summaryrefslogtreecommitdiff
path: root/src/map
diff options
context:
space:
mode:
authorLuzZza <LuzZza@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-05 01:30:56 +0000
committerLuzZza <LuzZza@54d463be-8e91-2dee-dedb-b68131a5f0ec>2006-11-05 01:30:56 +0000
commit24d6f4a3fcea95d44808e14653c4435fdc8bb3bd (patch)
tree094ed4b35d7fc38d776d6ffced61228bd6a28303 /src/map
parent9c08ebbab7841a2e210613f4e072da4ca48f331b (diff)
downloadhercules-24d6f4a3fcea95d44808e14653c4435fdc8bb3bd.tar.gz
hercules-24d6f4a3fcea95d44808e14653c4435fdc8bb3bd.tar.bz2
hercules-24d6f4a3fcea95d44808e14653c4435fdc8bb3bd.tar.xz
hercules-24d6f4a3fcea95d44808e14653c4435fdc8bb3bd.zip
Readded duel code in map_quit. Why it has been removed!?
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@9138 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
-rw-r--r--src/map/map.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c
index fadb59664..2c609bc74 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1681,6 +1681,14 @@ int map_quit(struct map_session_data *sd) {
unit_remove_map(&sd->pd->bl, 0);
}
}
+
+ // Force exiting from duel and rejecting
+ // all duel invitations when player quit [LuzZza]
+ if(sd->duel_group > 0)
+ duel_leave(sd->duel_group, sd);
+
+ if(sd->duel_invite > 0)
+ duel_reject(sd->duel_invite, sd);
//Do we really need to remove the name?
idb_remove(charid_db,sd->status.char_id);
@@ -3903,8 +3911,8 @@ int do_init(int argc, char *argv[]) {
mapindex_init();
grfio_init(GRF_PATH_FILENAME);
- map_readallmaps();
-
+ map_readallmaps();
+
add_timer_func_list(map_freeblock_timer, "map_freeblock_timer");
add_timer_func_list(map_clearflooritem_timer, "map_clearflooritem_timer");
add_timer_func_list(map_removemobs_timer, "map_removemobs_timer");