summaryrefslogtreecommitdiff
path: root/src/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc12
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc3
-rw-r--r--src/plugins/HPMHooking/HPMHooking_map.Hooks.inc81
-rw-r--r--src/plugins/db2sql.c11
4 files changed, 3 insertions, 104 deletions
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
index b7973cd59..258fc0512 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HPMHooksCore.inc
@@ -2689,14 +2689,10 @@ struct {
struct HPMHookPoint *HP_itemdb_validate_entry_post;
struct HPMHookPoint *HP_itemdb_readdb_additional_fields_pre;
struct HPMHookPoint *HP_itemdb_readdb_additional_fields_post;
- struct HPMHookPoint *HP_itemdb_readdb_sql_sub_pre;
- struct HPMHookPoint *HP_itemdb_readdb_sql_sub_post;
struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_pre;
struct HPMHookPoint *HP_itemdb_readdb_libconfig_sub_post;
struct HPMHookPoint *HP_itemdb_readdb_libconfig_pre;
struct HPMHookPoint *HP_itemdb_readdb_libconfig_post;
- struct HPMHookPoint *HP_itemdb_readdb_sql_pre;
- struct HPMHookPoint *HP_itemdb_readdb_sql_post;
struct HPMHookPoint *HP_itemdb_unique_id_pre;
struct HPMHookPoint *HP_itemdb_unique_id_post;
struct HPMHookPoint *HP_itemdb_read_pre;
@@ -3473,8 +3469,6 @@ struct {
struct HPMHookPoint *HP_mob_parse_row_mobskilldb_post;
struct HPMHookPoint *HP_mob_readskilldb_pre;
struct HPMHookPoint *HP_mob_readskilldb_post;
- struct HPMHookPoint *HP_mob_read_sqlskilldb_pre;
- struct HPMHookPoint *HP_mob_read_sqlskilldb_post;
struct HPMHookPoint *HP_mob_readdb_race2_pre;
struct HPMHookPoint *HP_mob_readdb_race2_post;
struct HPMHookPoint *HP_mob_readdb_itemratio_pre;
@@ -8460,14 +8454,10 @@ struct {
int HP_itemdb_validate_entry_post;
int HP_itemdb_readdb_additional_fields_pre;
int HP_itemdb_readdb_additional_fields_post;
- int HP_itemdb_readdb_sql_sub_pre;
- int HP_itemdb_readdb_sql_sub_post;
int HP_itemdb_readdb_libconfig_sub_pre;
int HP_itemdb_readdb_libconfig_sub_post;
int HP_itemdb_readdb_libconfig_pre;
int HP_itemdb_readdb_libconfig_post;
- int HP_itemdb_readdb_sql_pre;
- int HP_itemdb_readdb_sql_post;
int HP_itemdb_unique_id_pre;
int HP_itemdb_unique_id_post;
int HP_itemdb_read_pre;
@@ -9244,8 +9234,6 @@ struct {
int HP_mob_parse_row_mobskilldb_post;
int HP_mob_readskilldb_pre;
int HP_mob_readskilldb_post;
- int HP_mob_read_sqlskilldb_pre;
- int HP_mob_read_sqlskilldb_post;
int HP_mob_readdb_race2_pre;
int HP_mob_readdb_race2_post;
int HP_mob_readdb_itemratio_pre;
diff --git a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
index 3ecb82965..f793c9505 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.HookingPoints.inc
@@ -1369,10 +1369,8 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(itemdb->gendercheck, HP_itemdb_gendercheck) },
{ HP_POP(itemdb->validate_entry, HP_itemdb_validate_entry) },
{ HP_POP(itemdb->readdb_additional_fields, HP_itemdb_readdb_additional_fields) },
- { HP_POP(itemdb->readdb_sql_sub, HP_itemdb_readdb_sql_sub) },
{ HP_POP(itemdb->readdb_libconfig_sub, HP_itemdb_readdb_libconfig_sub) },
{ HP_POP(itemdb->readdb_libconfig, HP_itemdb_readdb_libconfig) },
- { HP_POP(itemdb->readdb_sql, HP_itemdb_readdb_sql) },
{ HP_POP(itemdb->unique_id, HP_itemdb_unique_id) },
{ HP_POP(itemdb->read, HP_itemdb_read) },
{ HP_POP(itemdb->destroy_item_data, HP_itemdb_destroy_item_data) },
@@ -1771,7 +1769,6 @@ struct HookingPointData HookingPoints[] = {
{ HP_POP(mob->readchatdb, HP_mob_readchatdb) },
{ HP_POP(mob->parse_row_mobskilldb, HP_mob_parse_row_mobskilldb) },
{ HP_POP(mob->readskilldb, HP_mob_readskilldb) },
- { HP_POP(mob->read_sqlskilldb, HP_mob_read_sqlskilldb) },
{ HP_POP(mob->readdb_race2, HP_mob_readdb_race2) },
{ HP_POP(mob->readdb_itemratio, HP_mob_readdb_itemratio) },
{ HP_POP(mob->load, HP_mob_load) },
diff --git a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
index 645873e13..b0bc853b3 100644
--- a/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
+++ b/src/plugins/HPMHooking/HPMHooking_map.Hooks.inc
@@ -35631,33 +35631,6 @@ void HP_itemdb_readdb_additional_fields(int itemid, config_setting_t *it, int n,
}
return;
}
-int HP_itemdb_readdb_sql_sub(Sql *handle, int n, const char *source) {
- int hIndex = 0;
- int retVal___ = 0;
- if( HPMHooks.count.HP_itemdb_readdb_sql_sub_pre ) {
- int (*preHookFunc) (Sql *handle, int *n, const char *source);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_sub_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_sub_pre[hIndex].func;
- retVal___ = preHookFunc(handle, &n, source);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.itemdb.readdb_sql_sub(handle, n, source);
- }
- if( HPMHooks.count.HP_itemdb_readdb_sql_sub_post ) {
- int (*postHookFunc) (int retVal___, Sql *handle, int *n, const char *source);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_sub_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_sub_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, handle, &n, source);
- }
- }
- return retVal___;
-}
int HP_itemdb_readdb_libconfig_sub(config_setting_t *it, int n, const char *source) {
int hIndex = 0;
int retVal___ = 0;
@@ -35712,33 +35685,6 @@ int HP_itemdb_readdb_libconfig(const char *filename) {
}
return retVal___;
}
-int HP_itemdb_readdb_sql(const char *tablename) {
- int hIndex = 0;
- int retVal___ = 0;
- if( HPMHooks.count.HP_itemdb_readdb_sql_pre ) {
- int (*preHookFunc) (const char *tablename);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_pre[hIndex].func;
- retVal___ = preHookFunc(tablename);
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.itemdb.readdb_sql(tablename);
- }
- if( HPMHooks.count.HP_itemdb_readdb_sql_post ) {
- int (*postHookFunc) (int retVal___, const char *tablename);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_itemdb_readdb_sql_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_itemdb_readdb_sql_post[hIndex].func;
- retVal___ = postHookFunc(retVal___, tablename);
- }
- }
- return retVal___;
-}
uint64 HP_itemdb_unique_id(struct map_session_data *sd) {
int hIndex = 0;
uint64 retVal___ = 0;
@@ -46372,33 +46318,6 @@ void HP_mob_readskilldb(void) {
}
return;
}
-int HP_mob_read_sqlskilldb(void) {
- int hIndex = 0;
- int retVal___ = 0;
- if( HPMHooks.count.HP_mob_read_sqlskilldb_pre ) {
- int (*preHookFunc) (void);
- *HPMforce_return = false;
- for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_sqlskilldb_pre; hIndex++ ) {
- preHookFunc = HPMHooks.list.HP_mob_read_sqlskilldb_pre[hIndex].func;
- retVal___ = preHookFunc();
- }
- if( *HPMforce_return ) {
- *HPMforce_return = false;
- return retVal___;
- }
- }
- {
- retVal___ = HPMHooks.source.mob.read_sqlskilldb();
- }
- if( HPMHooks.count.HP_mob_read_sqlskilldb_post ) {
- int (*postHookFunc) (int retVal___);
- for(hIndex = 0; hIndex < HPMHooks.count.HP_mob_read_sqlskilldb_post; hIndex++ ) {
- postHookFunc = HPMHooks.list.HP_mob_read_sqlskilldb_post[hIndex].func;
- retVal___ = postHookFunc(retVal___);
- }
- }
- return retVal___;
-}
bool HP_mob_readdb_race2(char *fields[], int columns, int current) {
int hIndex = 0;
bool retVal___ = false;
diff --git a/src/plugins/db2sql.c b/src/plugins/db2sql.c
index 50781f319..6d4a7789c 100644
--- a/src/plugins/db2sql.c
+++ b/src/plugins/db2sql.c
@@ -290,11 +290,6 @@ void totable(void) {
"\n",tosql.db_name,tosql.db_name,tosql.db_name);
}
void do_db2sql(void) {
- if( map->db_use_sql_item_db ) {
- ShowInfo("db2sql: this should not be used with 'db_use_sql_item_db' enabled, skipping...\n");
- return;
- }
-
/* link */
itemdb_readdb_libconfig_sub = itemdb->readdb_libconfig_sub;
itemdb->readdb_libconfig_sub = db2sql;
@@ -305,7 +300,7 @@ void do_db2sql(void) {
return;
}
- tosql.db_name = map->item_db_db;
+ tosql.db_name = "item_db";
totable();
memset(&tosql.buf, 0, sizeof(tosql.buf) );
@@ -320,7 +315,7 @@ void do_db2sql(void) {
return;
}
- tosql.db_name = map->item_db_db;
+ tosql.db_name = "item_db";
totable();
itemdb->clear(false);
@@ -333,7 +328,7 @@ void do_db2sql(void) {
return;
}
- tosql.db_name = map->item_db2_db;
+ tosql.db_name = "item_db2";
totable();
itemdb->clear(false);
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2025-05-02 15:50:34 +0000