diff options
| author | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-27 14:01:47 +0000 |
|---|---|---|
| committer | amber <amber@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2004-12-27 14:01:47 +0000 |
| commit | bd17820a383dea794a53795b75a49667920e00f6 (patch) | |
| tree | f523b26b06524f8e45d04e0ffd1713be625844c6 | |
| parent | b5667de306377d62cf511f4173e396da7bf2cc26 (diff) | |
| download | hercules-bd17820a383dea794a53795b75a49667920e00f6.tar.gz hercules-bd17820a383dea794a53795b75a49667920e00f6.tar.bz2 hercules-bd17820a383dea794a53795b75a49667920e00f6.tar.xz hercules-bd17820a383dea794a53795b75a49667920e00f6.zip | |
More updates
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/stable@817 54d463be-8e91-2dee-dedb-b68131a5f0ec
| -rw-r--r-- | Changelog.txt | 1 | ||||
| -rw-r--r-- | src/char_sql/int_guild.c | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/Changelog.txt b/Changelog.txt index f49ccce23..199413555 100644 --- a/Changelog.txt +++ b/Changelog.txt @@ -1,5 +1,6 @@ Date Added 12/27 + * Now I remember what I was smoking.. (SVN 817) [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] diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 1949947f5..8613ca504 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -517,7 +517,10 @@ int inter_guildcastle_tosql(struct guild_castle *gc) if (gcopy == NULL) { 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 )) + return 0; + } memcpy(gcopy, gc, sizeof(struct guild_castle)); |