diff options
| author | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-12 09:55:13 +0000 |
|---|---|---|
| committer | ultramage <ultramage@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-12-12 09:55:13 +0000 |
| commit | ed87621c65d7c13ddd4993101a5b7c2287b6609e (patch) | |
| tree | a035e4d010d2b9a690c82114dff33dfa36d9f889 /src/map/guild.h | |
| parent | 1c5fab35e935b870939bcae24ea95e957ed76d5a (diff) | |
| download | hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.tar.gz hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.tar.bz2 hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.tar.xz hercules-ed87621c65d7c13ddd4993101a5b7c2287b6609e.zip | |
* Some preparations for the guild script update
- cleaned up npc event execution code
- cleaned up guild data loading/saving code; to be improved later
- removed dummy 'account name' expulsion list management code
- removed columns 'rsv1' and 'rsv2' from guild member data
- removed columns 'rsv1' 'rsv2' 'rsv3' and 'acc' from guild expulsion data
- added upgrade_svn11895.sql for SQL
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11895 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/guild.h')
| -rw-r--r-- | src/map/guild.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/map/guild.h b/src/map/guild.h index 61c9e1778..bfa359fb1 100644 --- a/src/map/guild.h +++ b/src/map/guild.h @@ -18,8 +18,7 @@ int guild_skill_get_max(int id); int guild_checkskill(struct guild *g,int id); int guild_check_skill_require(struct guild *g,int id); // [Komurka] int guild_checkcastles(struct guild *g); // [MouseJstr] -int guild_isallied(struct guild *g, struct guild_castle *gc); -int guild_idisallied(int guild_id, int guild_id2); //Checks alliance based on guild Ids. [Skotlex] +bool guild_isallied(int guild_id, int guild_id2); //Checks alliance based on guild Ids. [Skotlex] void do_init_guild(void); struct guild *guild_search(int guild_id); |