diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-26 10:37:45 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2008-03-26 10:37:45 +0000 |
| commit | 49e9510c432987393d10ec1b8b1c2d416c9feb42 (patch) | |
| tree | 4d930ebf1094ad5972cb8ba20b89d12ce74d4f3c /src/char_sql/int_guild.c | |
| parent | fda87bd7ef5a71f4f5d5e604de1b15c58763efdd (diff) | |
| download | hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.tar.gz hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.tar.bz2 hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.tar.xz hercules-49e9510c432987393d10ec1b8b1c2d416c9feb42.zip | |
Adjusted eAthena code to compile cleanly in C++ mode.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@12436 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql/int_guild.c')
| -rw-r--r-- | src/char_sql/int_guild.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/char_sql/int_guild.c b/src/char_sql/int_guild.c index 93b915886..3ff05ddf1 100644 --- a/src/char_sql/int_guild.c +++ b/src/char_sql/int_guild.c @@ -59,7 +59,7 @@ static int guild_save_timer(int tid, unsigned int tick, int id, int data) state = 1; iter = guild_db_->iterator(guild_db_); - for( g = iter->first(iter,&key); iter->exists(iter); g = iter->next(iter,&key) ) + for( g = (struct guild*)iter->first(iter,&key); iter->exists(iter); g = (struct guild*)iter->next(iter,&key) ) { if( state == 0 && g->guild_id == last_id ) state++; //Save next guild in the list. @@ -374,7 +374,7 @@ struct guild * inter_guild_fromsql(int guild_id) if( guild_id <= 0 ) return NULL; - g = idb_get(guild_db_, guild_id); + g = (struct guild*)idb_get(guild_db_, guild_id); if( g ) return g; @@ -1852,7 +1852,7 @@ int mapif_parse_GuildCastleDataSave(int fd,int castle_id,int index,int value) case 1: if( gc.guild_id!=value ){ int gid=(value)?value:gc.guild_id; - struct guild *g=idb_get(guild_db_, gid); + struct guild *g = (struct guild*)idb_get(guild_db_, gid); if(log_inter) inter_log("guild %s (id=%d) %s castle id=%d\n", (g)?g->name:"??" ,gid, (value)?"occupy":"abandon", castle_id); |