summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-27 17:13:39 +0000
committeramber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec>2004-12-27 17:13:39 +0000
commita51c01c18d3130d54dc3f032a22bbbf88ffdc8c1 (patch)
tree7b943b76de251460ff6ca273d93369feedc922ac
parent7206810cc58a01e9d87a02920b0e6771c9864b8a (diff)
downloadhercules-a51c01c18d3130d54dc3f032a22bbbf88ffdc8c1.tar.gz
hercules-a51c01c18d3130d54dc3f032a22bbbf88ffdc8c1.tar.bz2
hercules-a51c01c18d3130d54dc3f032a22bbbf88ffdc8c1.tar.xz
hercules-a51c01c18d3130d54dc3f032a22bbbf88ffdc8c1.zip
update
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@823 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--Changelog.txt1
-rw-r--r--src/map/clif.c2
-rw-r--r--src/map/map.c2
-rw-r--r--src/map/pc.c2
4 files changed, 4 insertions, 3 deletions
diff --git a/Changelog.txt b/Changelog.txt
index 397ad7ccc..209e486ef 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -1,5 +1,6 @@
Date Added
12/27
+ * don't delete alive_timers of -1 (SVN 823) [MouseJstr]
* switched malloc,calloc,realloc to aMalloc, aCalloc, aRealloc
so support the use of a garbage collector (SVN 821) [MouseJstr]
* Removed some printf's from map-sql [MC Cameri]
diff --git a/src/map/clif.c b/src/map/clif.c
index c9d286a7a..26740323e 100644
--- a/src/map/clif.c
+++ b/src/map/clif.c
@@ -7541,7 +7541,7 @@ void clif_parse_TickSend(int fd, struct map_session_data *sd) {
}
//double connection bug fix by Valaris
- if(sd->alive_timer)
+ if(sd->alive_timer > 0)
delete_timer(sd->alive_timer,pc_alive_timer);
sd->alive_timer=add_timer(gettick()+60*1000,pc_alive_timer,sd->bl.id,0);
diff --git a/src/map/map.c b/src/map/map.c
index 91f82110f..83ef75762 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1055,7 +1055,7 @@ int map_quit(struct map_session_data *sd) {
storage_storage_save(sd);
//double connect bug fix by Valaris
- if(sd->alive_timer) {
+ if(sd->alive_timer > 0) {
delete_timer(sd->alive_timer,pc_alive_timer);
sd->alive_timer = -1; // not 0, the server will assume it's still active
}
diff --git a/src/map/pc.c b/src/map/pc.c
index f7837f838..fd84742c4 100644
--- a/src/map/pc.c
+++ b/src/map/pc.c
@@ -3994,7 +3994,7 @@ int pc_setpos(struct map_session_data *sd,char *mapname_org,int x,int y,int clrt
// clif_spawnpc(sd);
//double connection bug fix by Valaris
- if(sd->alive_timer)
+ if(sd->alive_timer > 0)
delete_timer(sd->alive_timer,pc_alive_timer);
sd->alive_timer=add_timer(gettick()+60*1000,pc_alive_timer,sd->bl.id,0);