Update

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

Changelog.txt

@@ -1,6 +1,6 @@
 Date	Added
 12/27
-        * Now I remember what I was smoking.. (SVN 817) [MouseJstr]
+        * Now I remember what I was smoking.. (SVN 819) [MouseJstr]
 	* 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]

src/char_sql/int_guild.c

@@ -513,6 +513,7 @@ static int _set_guild_castle(void *key, void *data, va_list ap) {
         g->castle_id = -1;
     if (g->guild_id == guild_id)
         g->castle_id = castle_id;
+    return 0;
 }
 
 
@@ -530,7 +531,7 @@ int inter_guildcastle_tosql(struct guild_castle *gc)
 	  gcopy = (struct guild_castle *) malloc(sizeof(struct guild_castle));
 	  numdb_insert(castle_db_, gc->castle_id, gcopy);
 	} else {
-            if ((gc->guild_id  == copy->guild_id ) && (  gc->economy  == copy->economy ) && ( gc->defense  == copy->defense ) && ( gc->triggerE  == copy->triggerE ) && ( gc->triggerD  == copy->triggerD ) && ( gc->nextTime  == copy->nextTime ) && ( gc->payTime  == copy->payTime ) && ( gc->createTime  == copy->createTime ) && ( gc->visibleC  == copy->visibleC ) && ( gc->visibleG0  == copy->visibleG0 ) && ( gc->visibleG1  == copy->visibleG1 ) && ( gc->visibleG2  == copy->visibleG2 ) && ( gc->visibleG3  == copy->visibleG3 ) && ( gc->visibleG4  == copy->visibleG4 ) && ( gc->visibleG5  == copy->visibleG5 ) && ( gc->visibleG6  == copy->visibleG6 ) && ( gc->visibleG7  == copy->visibleG7 ) && ( gc->Ghp0  == copy->Ghp0 ) && ( gc->Ghp1  == copy->Ghp1 ) && ( gc->Ghp2  == copy->Ghp2 ) && ( gc->Ghp3  == copy->Ghp3 ) && ( gc->Ghp4  == copy->Ghp4 ) && ( gc->Ghp5  == copy->Ghp5 ) && ( gc->Ghp6  == copy->Ghp6 ) && ( gc->Ghp7 == copy->Ghp7 ))
+            if ((gc->guild_id  == gcopy->guild_id ) && (  gc->economy  == gcopy->economy ) && ( gc->defense  == gcopy->defense ) && ( gc->triggerE  == gcopy->triggerE ) && ( gc->triggerD  == gcopy->triggerD ) && ( gc->nextTime  == gcopy->nextTime ) && ( gc->payTime  == gcopy->payTime ) && ( gc->createTime  == gcopy->createTime ) && ( gc->visibleC  == gcopy->visibleC ) && ( gc->visibleG0  == gcopy->visibleG0 ) && ( gc->visibleG1  == gcopy->visibleG1 ) && ( gc->visibleG2  == gcopy->visibleG2 ) && ( gc->visibleG3  == gcopy->visibleG3 ) && ( gc->visibleG4  == gcopy->visibleG4 ) && ( gc->visibleG5  == gcopy->visibleG5 ) && ( gc->visibleG6  == gcopy->visibleG6 ) && ( gc->visibleG7  == gcopy->visibleG7 ) && ( gc->Ghp0  == gcopy->Ghp0 ) && ( gc->Ghp1  == gcopy->Ghp1 ) && ( gc->Ghp2  == gcopy->Ghp2 ) && ( gc->Ghp3  == gcopy->Ghp3 ) && ( gc->Ghp4  == gcopy->Ghp4 ) && ( gc->Ghp5  == gcopy->Ghp5 ) && ( gc->Ghp6  == gcopy->Ghp6 ) && ( gc->Ghp7 == gcopy->Ghp7 ))
             return 0;
         }