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/map/map.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/map/map.c')
| -rw-r--r-- | src/map/map.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/map/map.c b/src/map/map.c index 590cafc5c..52153c55d 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -93,11 +93,11 @@ char *SCRIPT_CONF_NAME; char *MSG_CONF_NAME; // 極力 staticでロ?カルに?める -static struct dbt * id_db=NULL;// id -> struct block_list -static struct dbt * pc_db=NULL;// id -> struct map_session_data -static struct dbt * map_db=NULL; -static struct dbt * nick_db=NULL;// charid -> struct charid2nick (requested names of offline characters) -static struct dbt * charid_db=NULL;// charid -> struct map_session_data +static DBMap* id_db=NULL; // int id -> struct block_list* +static DBMap* pc_db=NULL; // int id -> struct map_session_data* +static DBMap* map_db=NULL; // unsigned int mapindex -> struct map_data* +static DBMap* nick_db=NULL; // int char_id -> struct charid2nick* (requested names of offline characters) +static DBMap* charid_db=NULL; // int char_id -> struct map_session_data* static int map_users=0; static struct block_list *objects[MAX_FLOORITEM]; @@ -3303,11 +3303,11 @@ int do_init(int argc, char *argv[]) inter_config_read(INTER_CONF_NAME); log_config_read(LOG_CONF_NAME); - id_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); - pc_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); //Added for reliable map_id2sd() use. [Skotlex] - map_db = db_alloc(__FILE__,__LINE__,DB_UINT,DB_OPT_BASE,sizeof(int)); - nick_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); - charid_db = db_alloc(__FILE__,__LINE__,DB_INT,DB_OPT_BASE,sizeof(int)); + id_db = idb_alloc(DB_OPT_BASE); + pc_db = idb_alloc(DB_OPT_BASE); //Added for reliable map_id2sd() use. [Skotlex] + map_db = uidb_alloc(DB_OPT_BASE); + nick_db = idb_alloc(DB_OPT_BASE); + charid_db = idb_alloc(DB_OPT_BASE); #ifndef TXT_ONLY map_sql_init(); #endif /* not TXT_ONLY */ |