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

- Fixed char-sql compilation

Browse Source 
- Added support for reading the item_db_db inter config settings (char-sql)
- Fixed some compile warnings (functions with no arguments should have a (void) instead of ()).


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@8546 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex
2006-08-30 13:56:27 +00:00
parent dfac028631
commit 0f8fb18252
6 changed files with 22 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/char_sql/char.c
View File

@@ -4016,6 +4016,10 @@ void sql_config_read(const char *cfgName){ /* Kalaspuff, to get login_db */
}else if(strcmpi(w1,"use_sql_db")==0){ // added for sql item_db read for char server [Valaris]
db_use_sqldbs = config_switch(w2);
ShowStatus("Using SQL dbs: %s\n",w2);
}else if(strcmpi(w1,"item_db_db")==0){
strcpy(item_db_db,w2);
}else if(strcmpi(w1,"item_db2_db")==0){
strcpy(item_db2_db,w2);
} else if(strcmpi(w1,"connection_ping_interval")==0) {
connection_ping_interval = config_switch(w2);
//custom columns for login database

22
src/char_sql/itemdb.c
View File

@@ -19,6 +19,7 @@
//#define ITEMDB_OVERRIDE_NAME_VERBOSE 1
char item_db_db[256]="item_db"; // added to specify item_db sql table [Valaris]
char item_db2_db[256]="item_db2";
static struct dbt* item_db;
@@ -168,8 +169,8 @@ static int itemdb_read_sqldb(void) // sql item_db read, shortened version of map
sprintf(tmp_sql, "SELECT * FROM `%s`", item_db_name[i]);
// Execute the query; if the query execution succeeded...
if (mysql_query(&mmysql_handle, tmp_sql) == 0) {
sql_res = mysql_store_result(&mmysql_handle);
if (mysql_query(&mysql_handle, tmp_sql) == 0) {
sql_res = mysql_store_result(&mysql_handle);
// If the storage of the query result succeeded...
if (sql_res) {
@@ -203,14 +204,14 @@ static int itemdb_read_sqldb(void) // sql item_db read, shortened version of map
ShowStatus("Done reading '"CL_WHITE"%lu"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n", ln, item_db_name[i]);
ln = 0;
} else {
ShowSQL("DB error (%s) - %s\n",item_db_name[i], mysql_error(&mmysql_handle));
ShowSQL("DB error (%s) - %s\n",item_db_name[i], mysql_error(&mysql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
}
// Free the query result
mysql_free_result(sql_res);
} else {
ShowSQL("DB error (%s) - %s\n",item_db_name[i], mysql_error(&mmysql_handle));
ShowSQL("DB error (%s) - %s\n",item_db_name[i], mysql_error(&mysql_handle));
ShowDebug("at %s:%d - %s\n", __FILE__,__LINE__,tmp_sql);
}
}
@@ -218,17 +219,6 @@ static int itemdb_read_sqldb(void) // sql item_db read, shortened version of map
return 0;
}
static int itemdb_final(DBKey key,void *data,va_list ap)
{
struct item_data *id = (struct item_data*)data;
if(id->use_script)
aFree(id->use_script);
if(id->equip_script)
aFree(id->equip_script);
return 0;
}
/*==========================================
*
*------------------------------------------
@@ -236,7 +226,7 @@ static int itemdb_final(DBKey key,void *data,va_list ap)
void do_final_itemdb(void)
{
if(item_db){
item_db->destroy(item_db,itemdb_final);
item_db->destroy(item_db,NULL);
item_db=NULL;
}
}

2
src/char_sql/itemdb.h
View File

@@ -29,6 +29,8 @@ struct item_data {
int type;
};
extern char item_db_db[256];
extern char item_db2_db[256];
struct item_data* itemdb_search(int nameid);
#define itemdb_type(n) itemdb_search(n)->type