diff options
| author | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-08 14:08:32 +0000 |
|---|---|---|
| committer | FlavioJS <FlavioJS@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2007-11-08 14:08:32 +0000 |
| commit | b5be01c5baca2d51da4ec9a138e3bb57eea7cbb4 (patch) | |
| tree | b7f079f5317d736e49fdf8b12f6d3f18b2a98daf /src/char/int_guild.c | |
| parent | ad2a3a12e2d603e8ef2011d1121271b7ed2f05eb (diff) | |
| download | hercules-b5be01c5baca2d51da4ec9a138e3bb57eea7cbb4.tar.gz hercules-b5be01c5baca2d51da4ec9a138e3bb57eea7cbb4.tar.bz2 hercules-b5be01c5baca2d51da4ec9a138e3bb57eea7cbb4.tar.xz hercules-b5be01c5baca2d51da4ec9a138e3bb57eea7cbb4.zip | |
* Changed EXIT_SUCCESS back to 0 in console.c to avoid an unnecessary include.
* Fixed gm_account_db not being deallocated in login-converter.c.
* Refactoring names and documentation in db.h/db.c:
- changed 'struct dbt' to 'struct DBMap' and 'DB' to 'DBMap*'
- changed 'struct db' to 'struct DBMap_impl' and 'DB_impl' to 'DBMap_impl*'
- changed COUNT to DB_COUNTSTAT and made it's existence not depend on DB_ENABLE_STATS
- removed some @see links and corrected small typos in the documentation
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@11698 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char/int_guild.c')
| -rw-r--r-- | src/char/int_guild.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/char/int_guild.c b/src/char/int_guild.c index 563ad360e..685ef1d00 100644 --- a/src/char/int_guild.c +++ b/src/char/int_guild.c @@ -22,8 +22,8 @@ char guild_txt[1024] = "save/guild.txt"; char castle_txt[1024] = "save/castle.txt"; #ifndef TXT_SQL_CONVERT -static struct dbt *guild_db; -static struct dbt *castle_db; +static DBMap* guild_db; // int guild_id -> struct guild* +static DBMap* castle_db; // int castle_id -> struct guild_castle* static int guild_newid = 10000; @@ -376,8 +376,8 @@ int inter_guild_init() { inter_guild_readdb(); - guild_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); - castle_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_RELEASE_DATA,sizeof(int)); + guild_db = idb_alloc(DB_OPT_RELEASE_DATA); + castle_db = idb_alloc(DB_OPT_RELEASE_DATA); if ((fp = fopen(guild_txt,"r")) == NULL) return 1; |