Browse Source

Fix

git-svn-id: https://svn.code.sf.net/p/rathena/svn/branches/stable@816 54d463be-8e91-2dee-dedb-b68131a5f0ec
amber 20 years ago
parent
commit
355bd00f87
2 changed files with 6 additions and 2 deletions
  1. 2 0
      Changelog.txt
  2. 4 2
      src/char_sql/int_guild.c

+ 2 - 0
Changelog.txt

@@ -1,5 +1,7 @@
 Date	Added
 12/27
+	* Fixed a bug in the guild_castle persistance code
+	  in char_sql.  What was I smoking?  (SVN: 816) [MouseJstr]
         * Corrected a bad error in itemdb_read_itemslottable [celest]
         * Corrected wrong logging of text in int_guild.c, thanks to Alex14 [celest]
         * Summoned monsters will not give exp and items [celest]

+ 4 - 2
src/char_sql/int_guild.c

@@ -48,6 +48,8 @@ int _erase_guild(void *key, void *data, va_list ap) {
         free(castle);
         db_erase(castle_db_, key);
     }
+
+    return 0;
 }
 
 // Save guild into sql
@@ -162,7 +164,7 @@ int inter_guild_tosql(struct guild *g,int flag)
 			if(mysql_query(&mysql_handle, tmp_sql) ) {
 				printf("DB server Error (delete `guild_castle`)- %s\n", mysql_error(&mysql_handle) );
 			}			
-                        db_foreach(_guild_castle_, _erase_guild, g->guild_id);
+                        db_foreach(castle_db_, _erase_guild, g->guild_id);
 		}
 	}
 
@@ -1333,7 +1335,7 @@ int mapif_parse_BreakGuild(int fd,int guild_id)
 		printf("DB server Error (delete `guild_position`)- %s\n", mysql_error(&mysql_handle) );
 	}
 
-        db_foreach(_guild_castle_, _erase_guild, guild_id);
+        db_foreach(castle_db_, _erase_guild, guild_id);
 	
 	//printf("- Update guild %d of char\n",guild_id);
 	sprintf(tmp_sql, "UPDATE `%s` SET `guild_id`='0' WHERE `guild_id`='%d'",char_db, guild_id);