diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-17 13:23:34 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-17 13:23:34 +0000 |
| commit | 3a4984a967675b1fd10c84730994bf08766c639d (patch) | |
| tree | 00be3127a35d41ecbf1cb8f3b56922cd3575f36b /src/map/guild.c | |
| parent | 1110866d367cb7a158e0b4c9dc2a16e15d3ca90d (diff) | |
| download | hercules-3a4984a967675b1fd10c84730994bf08766c639d.tar.gz hercules-3a4984a967675b1fd10c84730994bf08766c639d.tar.bz2 hercules-3a4984a967675b1fd10c84730994bf08766c639d.tar.xz hercules-3a4984a967675b1fd10c84730994bf08766c639d.zip | |
* Added flag.server to indicate interserver sockets
- replaces the previous way (setting 'client_addr' to 0)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11930 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.c')
| -rw-r--r-- | src/map/guild.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/map/guild.c b/src/map/guild.c index ac5f67fa8..1e90226dc 100644 --- a/src/map/guild.c +++ b/src/map/guild.c @@ -233,7 +233,7 @@ struct guild_castle* guild_castle_search(int gcid) struct guild_castle* guild_mapindex2gc(short mapindex) { struct guild_castle* gc; - + DBIterator* iter = castle_db->iterator(castle_db); for( gc = iter->first(iter,NULL); iter->exists(iter); gc = iter->next(iter,NULL) ) { @@ -277,6 +277,7 @@ int guild_getindex(struct guild *g,int account_id,int char_id) int guild_getposition(struct guild* g, struct map_session_data* sd) { int i; + if( g == NULL && (g=guild_search(sd->status.guild_id)) == NULL ) return -1; |