summaryrefslogtreecommitdiff
path: root/src/map/map.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/map/map.c')
-rw-r--r--src/map/map.c160
1 files changed, 76 insertions, 84 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 496802d28..0dab56d21 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1490,7 +1490,7 @@ static DBData create_charid2nick(DBKey key, va_list args)
{
struct charid2nick *p;
CREATE(p, struct charid2nick, 1);
- return iDB->ptr2data(p);
+ return DB->ptr2data(p);
}
/// Adds(or replaces) the nick of charid to nick_db and fullfils pending requests.
@@ -1526,7 +1526,7 @@ void map_delnickdb(int charid, const char* name)
struct map_session_data* sd;
DBData data;
- if (!nick_db->remove(nick_db, iDB->i2key(charid), &data) || (p = iDB->data2ptr(&data)) == NULL)
+ if (!nick_db->remove(nick_db, DB->i2key(charid), &data) || (p = DB->data2ptr(&data)) == NULL)
return;
while( p->requests ) {
@@ -1647,7 +1647,7 @@ int map_quit(struct map_session_data *sd) {
if( sd->bg_id )
bg_team_leave(sd,1);
- iPc->itemcd_do(sd,false);
+ pc->itemcd_do(sd,false);
for( i = 0; i < sd->queues_count; i++ ) {
struct hQueue *queue;
@@ -1711,8 +1711,8 @@ int map_quit(struct map_session_data *sd) {
for( i = 0; i < EQI_MAX; i++ ) {
if( sd->equip_index[ i ] >= 0 )
- if( !iPc->isequip( sd , sd->equip_index[ i ] ) )
- iPc->unequipitem( sd , sd->equip_index[ i ] , 2 );
+ if( !pc->isequip( sd , sd->equip_index[ i ] ) )
+ pc->unequipitem( sd , sd->equip_index[ i ] , 2 );
}
// Return loot to owner
@@ -1751,9 +1751,9 @@ int map_quit(struct map_session_data *sd) {
}
}
- iParty->booking_delete(sd); // Party Booking [Spiria]
- iPc->makesavestatus(sd);
- iPc->clean_skilltree(sd);
+ party->booking_delete(sd); // Party Booking [Spiria]
+ pc->makesavestatus(sd);
+ pc->clean_skilltree(sd);
chrif_save(sd,1);
unit_free_pc(sd);
return 0;
@@ -2751,7 +2751,7 @@ static DBData create_map_data_other_server(DBKey key, va_list args)
mdos=(struct map_data_other_server *)aCalloc(1,sizeof(struct map_data_other_server));
mdos->index = mapindex;
memcpy(mdos->name, mapindex_id2name(mapindex), MAP_NAME_LENGTH);
- return iDB->ptr2data(mdos);
+ return DB->ptr2data(mdos);
}
/*==========================================
@@ -2781,7 +2781,7 @@ int map_setipport(unsigned short mapindex, uint32 ip, uint16 port)
*/
int map_eraseallipport_sub(DBKey key, DBData *data, va_list va)
{
- struct map_data_other_server *mdos = iDB->data2ptr(data);
+ struct map_data_other_server *mdos = DB->data2ptr(data);
if(mdos->cell == NULL) {
db_remove(map_db,key);
aFree(mdos);
@@ -3526,82 +3526,71 @@ void map_reloadnpc(bool clear)
#endif
}
-int inter_config_read(char *cfgName)
-{
+int inter_config_read(char *cfgName) {
char line[1024],w1[1024],w2[1024];
FILE *fp;
- fp=fopen(cfgName,"r");
- if(fp==NULL){
+ if( !( fp = fopen(cfgName,"r") ) ){
ShowError("File not found: %s\n",cfgName);
return 1;
}
- while(fgets(line, sizeof(line), fp))
- {
+ while(fgets(line, sizeof(line), fp)) {
if(line[0] == '/' && line[1] == '/')
continue;
+
if( sscanf(line,"%[^:]: %[^\r\n]",w1,w2) < 2 )
continue;
-
+ /* table names */
if(strcmpi(w1,"item_db_db")==0)
strcpy(iMap->item_db_db,w2);
- else
- if(strcmpi(w1,"mob_db_db")==0)
- strcpy(iMap->mob_db_db,w2);
- else
- if(strcmpi(w1,"item_db2_db")==0)
- strcpy(iMap->item_db2_db,w2);
- else
- if(strcmpi(w1,"item_db_re_db")==0)
- strcpy(iMap->item_db_re_db,w2);
- else
- if(strcmpi(w1,"mob_db2_db")==0)
- strcpy(iMap->mob_db2_db,w2);
- else
- //Map Server SQL DB
- if(strcmpi(w1,"map_server_ip")==0)
- strcpy(map_server_ip, w2);
- else
- if(strcmpi(w1,"map_server_port")==0)
- map_server_port=atoi(w2);
- else
- if(strcmpi(w1,"map_server_id")==0)
- strcpy(map_server_id, w2);
- else
- if(strcmpi(w1,"map_server_pw")==0)
- strcpy(map_server_pw, w2);
- else
- if(strcmpi(w1,"map_server_db")==0)
- strcpy(map_server_db, w2);
- else
- if(strcmpi(w1,"default_codepage")==0)
- strcpy(default_codepage, w2);
- else
- if(strcmpi(w1,"use_sql_db")==0) {
- iMap->db_use_sqldbs = config_switch(w2);
- ShowStatus ("Using SQL dbs: %s\n",w2);
- } else
- if(strcmpi(w1,"log_db_ip")==0)
- strcpy(log_db_ip, w2);
- else
- if(strcmpi(w1,"log_db_id")==0)
- strcpy(log_db_id, w2);
- else
- if(strcmpi(w1,"log_db_pw")==0)
- strcpy(log_db_pw, w2);
- else
- if(strcmpi(w1,"log_db_port")==0)
- log_db_port = atoi(w2);
- else
- if(strcmpi(w1,"log_db_db")==0)
- strcpy(log_db_db, w2);
- else
- if( mapreg_config_read(w1,w2) )
- continue;
- //support the import command, just like any other config
- else
- if(strcmpi(w1,"import")==0)
- inter_config_read(w2);
+ else if(strcmpi(w1,"mob_db_db")==0)
+ strcpy(iMap->mob_db_db,w2);
+ else if(strcmpi(w1,"item_db2_db")==0)
+ strcpy(iMap->item_db2_db,w2);
+ else if(strcmpi(w1,"item_db_re_db")==0)
+ strcpy(iMap->item_db_re_db,w2);
+ else if(strcmpi(w1,"mob_db2_db")==0)
+ strcpy(iMap->mob_db2_db,w2);
+ else if(strcmpi(w1,"mob_skill_db_db")==0)
+ strcpy(iMap->mob_skill_db_db,w2);
+ else if(strcmpi(w1,"mob_skill_db2_db")==0)
+ strcpy(iMap->mob_skill_db2_db,w2);
+ else if(strcmpi(w1,"interreg_db")==0)
+ strcpy(iMap->interreg_db,w2);
+ /* map sql stuff */
+ else if(strcmpi(w1,"map_server_ip")==0)
+ strcpy(map_server_ip, w2);
+ else if(strcmpi(w1,"map_server_port")==0)
+ map_server_port=atoi(w2);
+ else if(strcmpi(w1,"map_server_id")==0)
+ strcpy(map_server_id, w2);
+ else if(strcmpi(w1,"map_server_pw")==0)
+ strcpy(map_server_pw, w2);
+ else if(strcmpi(w1,"map_server_db")==0)
+ strcpy(map_server_db, w2);
+ else if(strcmpi(w1,"default_codepage")==0)
+ strcpy(default_codepage, w2);
+ else if(strcmpi(w1,"use_sql_db")==0) {
+ iMap->db_use_sqldbs = config_switch(w2);
+ ShowStatus ("Using SQL dbs: %s\n",w2);
+ }
+ /* sql log db */
+ else if(strcmpi(w1,"log_db_ip")==0)
+ strcpy(log_db_ip, w2);
+ else if(strcmpi(w1,"log_db_id")==0)
+ strcpy(log_db_id, w2);
+ else if(strcmpi(w1,"log_db_pw")==0)
+ strcpy(log_db_pw, w2);
+ else if(strcmpi(w1,"log_db_port")==0)
+ log_db_port = atoi(w2);
+ else if(strcmpi(w1,"log_db_db")==0)
+ strcpy(log_db_db, w2);
+ /* mapreg */
+ else if( mapreg_config_read(w1,w2) )
+ continue;
+ /* import */
+ else if(strcmpi(w1,"import")==0)
+ inter_config_read(w2);
}
fclose(fp);
@@ -4961,7 +4950,7 @@ void read_map_zone_db(void) {
* @see DBApply
*/
int map_db_final(DBKey key, DBData *data, va_list ap) {
- struct map_data_other_server *mdos = iDB->data2ptr(data);
+ struct map_data_other_server *mdos = DB->data2ptr(data);
if(mdos && iMalloc->verify_ptr(mdos) && mdos->cell == NULL)
aFree(mdos);
@@ -4974,7 +4963,7 @@ int map_db_final(DBKey key, DBData *data, va_list ap) {
*/
int nick_db_final(DBKey key, DBData *data, va_list args)
{
- struct charid2nick* p = iDB->data2ptr(data);
+ struct charid2nick* p = DB->data2ptr(data);
struct charid_request* req;
if( p == NULL )
@@ -5021,7 +5010,7 @@ int cleanup_sub(struct block_list *bl, va_list ap) {
*/
static int cleanup_db_sub(DBKey key, DBData *data, va_list va)
{
- return iMap->cleanup_sub(iDB->data2ptr(data), va);
+ return iMap->cleanup_sub(DB->data2ptr(data), va);
}
/*==========================================
@@ -5070,8 +5059,8 @@ void do_final(void)
do_final_itemdb();
do_final_storage();
guild->final();
- iParty->do_final_party();
- iPc->do_final_pc();
+ party->do_final_party();
+ pc->do_final_pc();
do_final_pet();
do_final_mob();
homun->final();
@@ -5267,17 +5256,20 @@ void map_cp_defaults(void) {
void map_hp_symbols(void) {
/* full interfaces */
HPM->share(atcommand,"atcommand");
+ HPM->share(battle,"battle");
+ HPM->share(bg,"battlegrounds");
HPM->share(buyingstore,"buyingstore");
HPM->share(clif,"clif");
HPM->share(guild,"guild");
+ HPM->share(homun,"homun");
HPM->share(ircbot,"ircbot");
HPM->share(logs,"logs");
HPM->share(script,"script");
HPM->share(searchstore,"searchstore");
HPM->share(skill,"skill");
HPM->share(vending,"vending");
- HPM->share(iPc,"iPc");
- HPM->share(iParty,"iParty");
+ HPM->share(pc,"pc");
+ HPM->share(party,"party");
HPM->share(iMap,"iMap");
/* partial */
HPM->share(mapit,"mapit");
@@ -5493,9 +5485,9 @@ int do_init(int argc, char *argv[])
skill->init();
read_map_zone_db();/* read after item and skill initalization */
do_init_mob();
- iPc->do_init_pc();
+ pc->do_init_pc();
do_init_status();
- iParty->do_init_party();
+ party->do_init_party();
guild->init();
do_init_storage();
do_init_pet();
@@ -5634,7 +5626,7 @@ void map_defaults(void) {
iMap->map_foreachregen = map_map_foreachregen;
iMap->map_foreachiddb = map_map_foreachiddb;
- iMap->foreachinrange = iMap->foreachinrange;
+ iMap->foreachinrange = map_foreachinrange;
iMap->foreachinshootrange = map_foreachinshootrange;
iMap->foreachinarea=map_foreachinarea;
iMap->forcountinrange=map_forcountinrange;
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-04-28 12:41:43 +0000