update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@823 54d463be-8e91-2dee-dedb-b68131a5f0ec

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]

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);
 

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
 	}

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);