diff options
| -rw-r--r-- | src/server/game/Globals/ObjectMgr.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Instances/InstanceSaveMgr.cpp | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp index a44c5197eec..fe6d7f85076 100644 --- a/src/server/game/Globals/ObjectMgr.cpp +++ b/src/server/game/Globals/ObjectMgr.cpp @@ -8750,7 +8750,7 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids) void ObjectMgr::LoadDbScriptStrings() { - LoadTrinityStrings(WorldDatabase,"db_script_string",MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID); + LoadTrinityStrings("db_script_string",MIN_DB_SCRIPT_STRING_ID,MAX_DB_SCRIPT_STRING_ID); std::set<int32> ids; @@ -8771,7 +8771,7 @@ uint32 GetAreaTriggerScriptId(uint32 trigger_id) return sObjectMgr.GetAreaTriggerScriptId(trigger_id); } -bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value, int32 end_value) +bool LoadTrinityStrings(char const* table, int32 start_value, int32 end_value) { // MAX_DB_SCRIPT_STRING_ID is max allowed negative value for scripts (scrpts can use only more deep negative values // start/end reversed for negative values @@ -8781,7 +8781,7 @@ bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value, i return false; } - return sObjectMgr.LoadTrinityStrings(db,table,start_value,end_value); + return sObjectMgr.LoadTrinityStrings(table, start_value, end_value); } uint32 GetScriptId(const char *name) diff --git a/src/server/game/Instances/InstanceSaveMgr.cpp b/src/server/game/Instances/InstanceSaveMgr.cpp index d6a4af533f5..b206e3afc95 100644 --- a/src/server/game/Instances/InstanceSaveMgr.cpp +++ b/src/server/game/Instances/InstanceSaveMgr.cpp @@ -240,7 +240,7 @@ void InstanceSaveManager::_DelHelper(const char *fields, const char *table, cons for (size_t i = 0; i < fieldTokens.size(); i++) { std::string fieldValue = fields[i].GetCppString(); - db.escape_string(fieldValue); + CharacterDatabase.escape_string(fieldValue); ss << (i != 0 ? " AND " : "") << fieldTokens[i] << " = '" << fieldValue << "'"; } CharacterDatabase.PExecute("DELETE FROM %s WHERE %s", table, ss.str().c_str()); |