josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix *SOME* build errors

Browse Source 
--HG--
branch : trunk
This commit is contained in:
Shauren
2010-09-02 18:20:59 +02:00
parent c47f45694f
commit e9ff90a967
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Globals/ObjectMgr.cpp
+3 -3
View File
@@ -8750,7 +8750,7 @@ void ObjectMgr::CheckScripts(ScriptsType type, std::set<int32>& ids)
void ObjectMgr::LoadDbScriptStrings() 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; std::set<int32> ids;
@@ -8771,7 +8771,7 @@ uint32 GetAreaTriggerScriptId(uint32 trigger_id)
return sObjectMgr.GetAreaTriggerScriptId(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 // 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 // start/end reversed for negative values
@@ -8781,7 +8781,7 @@ bool LoadTrinityStrings(DatabaseType& db, char const* table,int32 start_value, i
return false; return false;
} }
return sObjectMgr.LoadTrinityStrings(db,table,start_value,end_value); return sObjectMgr.LoadTrinityStrings(table, start_value, end_value);
} }
uint32 GetScriptId(const char *name) uint32 GetScriptId(const char *name)
src/server/game/Instances/InstanceSaveMgr.cpp
+1 -1
View File
@@ -240,7 +240,7 @@ void InstanceSaveManager::_DelHelper(const char *fields, const char *table, cons
for (size_t i = 0; i < fieldTokens.size(); i++) for (size_t i = 0; i < fieldTokens.size(); i++)
{ {
std::string fieldValue = fields[i].GetCppString(); std::string fieldValue = fields[i].GetCppString();
db.escape_string(fieldValue); CharacterDatabase.escape_string(fieldValue);
ss << (i != 0 ? " AND " : "") << fieldTokens[i] << " = '" << fieldValue << "'"; ss << (i != 0 ? " AND " : "") << fieldTokens[i] << " = '" << fieldValue << "'";
} }
CharacterDatabase.PExecute("DELETE FROM %s WHERE %s", table, ss.str().c_str()); CharacterDatabase.PExecute("DELETE FROM %s WHERE %s", table, ss.str().c_str());