Explorar o código

update

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@804 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber %!s(int64=20) %!d(string=hai) anos
pai
achega
973fe525a7
Modificáronse 3 ficheiros con 3 adicións e 1 borrados
  1. 1 0
      Changelog.txt
  2. 2 0
      src/char_sql/char.c
  3. 0 1
      src/map/pet.c

+ 1 - 0
Changelog.txt

@@ -1,5 +1,6 @@
 Date	Added
 12/26
+	* Fixed ANOTHER pet crash (double free) (SVN: 804) [MouseJstr]
         * Added a proper #define for MAX_VENDING (SVN: 802) [MouseJstr]
 	* Fixed crash associated with vending more then 12 items
 	  which walked on memory.. corrupting the pet data 	

+ 2 - 0
src/char_sql/char.c

@@ -3338,7 +3338,9 @@ int do_init(int argc, char **argv){
 #undef mysql_query
 
 int debug_mysql_query(char *file, int line, void *mysql, const char *q) {
+#ifdef TWILIGHT
         printf("sql: %s:%d# %s\n", file, line, q);
+#endif
         return mysql_query((MYSQL *) mysql, q);
 }
 

+ 0 - 1
src/map/pet.c

@@ -608,7 +608,6 @@ int pet_remove_map(struct map_session_data *sd)
 		clif_clearchar_area(&sd->pd->bl,0);
 		map_delblock(&sd->pd->bl);
 		map_deliddb(&sd->pd->bl);
-		map_freeblock(sd->pd);
 	}
 	return 0;
 }