Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added elemental_db config on inter_athena.conf

Browse Source
This commit is contained in:
Cahyadi Ramadhan Togihon 2013-10-03 15:50:49 +07:00
parent b8ded6b509
commit f25ca39814
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/inter_athena.conf
View File

@ -101,6 +101,7 @@ homunculus_db: homunculus
skill_homunculus_db: skill_homunculus skill_homunculus_db: skill_homunculus
mercenary_db: mercenary mercenary_db: mercenary
mercenary_owner_db: mercenary_owner mercenary_owner_db: mercenary_owner
elemental_db: elemental
ragsrvinfo_db: ragsrvinfo ragsrvinfo_db: ragsrvinfo
// Map Database Tables // Map Database Tables

6
src/char/char.c
View File

@ -66,6 +66,7 @@ char homunculus_db[256] = "homunculus";
char skill_homunculus_db[256] = "skill_homunculus"; char skill_homunculus_db[256] = "skill_homunculus";
char mercenary_db[256] = "mercenary"; char mercenary_db[256] = "mercenary";
char mercenary_owner_db[256] = "mercenary_owner"; char mercenary_owner_db[256] = "mercenary_owner";
char elemental_db[256] = "elemental";
char ragsrvinfo_db[256] = "ragsrvinfo"; char ragsrvinfo_db[256] = "ragsrvinfo";
// show loading/saving messages // show loading/saving messages
@ -4892,8 +4893,7 @@ void sql_config_read(const char* cfgName)
return; return;
} }
while(fgets(line, sizeof(line), fp)) while(fgets(line, sizeof(line), fp)) {
{
if(line[0] == '/' && line[1] == '/') if(line[0] == '/' && line[1] == '/')
continue; continue;
@ -4958,6 +4958,8 @@ void sql_config_read(const char* cfgName)
safestrncpy(mercenary_db,w2,sizeof(mercenary_db)); safestrncpy(mercenary_db,w2,sizeof(mercenary_db));
else if(!strcmpi(w1,"mercenary_owner_db")) else if(!strcmpi(w1,"mercenary_owner_db"))
safestrncpy(mercenary_owner_db,w2,sizeof(mercenary_owner_db)); safestrncpy(mercenary_owner_db,w2,sizeof(mercenary_owner_db));
else if(!strcmpi(w1,"elemental_db"))
safestrncpy(elemental_db,w2,sizeof(elemental_db));
//support the import command, just like any other config //support the import command, just like any other config
else if(!strcmpi(w1,"import")) else if(!strcmpi(w1,"import"))
sql_config_read(w2); sql_config_read(w2);

1
src/char/char.h
View File

@ -81,6 +81,7 @@ extern char homunculus_db[256];
extern char skill_homunculus_db[256]; extern char skill_homunculus_db[256];
extern char mercenary_db[256]; extern char mercenary_db[256];
extern char mercenary_owner_db[256]; extern char mercenary_owner_db[256];
extern char elemental_db[256];
extern char ragsrvinfo_db[256]; extern char ragsrvinfo_db[256];
extern int db_use_sqldbs; // added for sql item_db read for char server [Valaris] extern int db_use_sqldbs; // added for sql item_db read for char server [Valaris]

14
src/char/int_elemental.c
View File

@ -20,9 +20,9 @@ bool mapif_elemental_save(struct s_elemental* ele) {
if( ele->elemental_id == 0 ) { // Create new DB entry if( ele->elemental_id == 0 ) { // Create new DB entry
if( SQL_ERROR == Sql_Query(sql_handle, if( SQL_ERROR == Sql_Query(sql_handle,
"INSERT INTO `elemental` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`atk1`,`atk2`,`matk`,`aspd`,`def`,`mdef`,`flee`,`hit`,`life_time`)" "INSERT INTO `%s` (`char_id`,`class`,`mode`,`hp`,`sp`,`max_hp`,`max_sp`,`atk1`,`atk2`,`matk`,`aspd`,`def`,`mdef`,`flee`,`hit`,`life_time`)"
"VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')", "VALUES ('%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%d','%u')",
ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time) ) elemental_db, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time) )
{ {
Sql_ShowDebug(sql_handle); Sql_ShowDebug(sql_handle);
flag = false; flag = false;
@ -30,9 +30,9 @@ bool mapif_elemental_save(struct s_elemental* ele) {
else else
ele->elemental_id = (int)Sql_LastInsertId(sql_handle); ele->elemental_id = (int)Sql_LastInsertId(sql_handle);
} else if( SQL_ERROR == Sql_Query(sql_handle, } else if( SQL_ERROR == Sql_Query(sql_handle,
"UPDATE `elemental` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d'," "UPDATE `%s` SET `char_id` = '%d', `class` = '%d', `mode` = '%d', `hp` = '%d', `sp` = '%d',"
"`max_hp` = '%d', `max_sp` = '%d', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d'," "`max_hp` = '%d', `max_sp` = '%d', `atk1` = '%d', `atk2` = '%d', `matk` = '%d', `aspd` = '%d', `def` = '%d',"
"`mdef` = '%d', `flee` = '%d', `hit` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'", "`mdef` = '%d', `flee` = '%d', `hit` = '%d', `life_time` = '%u' WHERE `ele_id` = '%d'",elemental_db,
ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2, ele->char_id, ele->class_, ele->mode, ele->hp, ele->sp, ele->max_hp, ele->max_sp, ele->atk, ele->atk2,
ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time, ele->elemental_id) ) ele->matk, ele->amotion, ele->def, ele->mdef, ele->flee, ele->hit, ele->life_time, ele->elemental_id) )
{ // Update DB entry { // Update DB entry
@ -50,8 +50,8 @@ bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) {
ele->char_id = char_id; ele->char_id = char_id;
if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `mode`, `hp`, `sp`, `max_hp`, `max_sp`, `atk1`, `atk2`, `matk`, `aspd`," if( SQL_ERROR == Sql_Query(sql_handle, "SELECT `class`, `mode`, `hp`, `sp`, `max_hp`, `max_sp`, `atk1`, `atk2`, `matk`, `aspd`,"
"`def`, `mdef`, `flee`, `hit`, `life_time` FROM `elemental` WHERE `ele_id` = '%d' AND `char_id` = '%d'", "`def`, `mdef`, `flee`, `hit`, `life_time` FROM `%s` WHERE `ele_id` = '%d' AND `char_id` = '%d'",
ele_id, char_id) ) { elemental_db, ele_id, char_id) ) {
Sql_ShowDebug(sql_handle); Sql_ShowDebug(sql_handle);
return false; return false;
} }
@ -84,7 +84,7 @@ bool mapif_elemental_load(int ele_id, int char_id, struct s_elemental *ele) {
} }
bool mapif_elemental_delete(int ele_id) { bool mapif_elemental_delete(int ele_id) {
if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `elemental` WHERE `ele_id` = '%d'", ele_id) ) { if( SQL_ERROR == Sql_Query(sql_handle, "DELETE FROM `%s` WHERE `ele_id` = '%d'", elemental_db, ele_id) ) {
Sql_ShowDebug(sql_handle); Sql_ShowDebug(sql_handle);
return false; return false;
} }