diff options
| author | Shocker <shocker@freakz.ro> | 2013-02-10 20:21:18 +0200 |
|---|---|---|
| committer | Shocker <shocker@freakz.ro> | 2013-02-10 20:21:18 +0200 |
| commit | a0cb102538dae7fa2d173b4d1990a4aef8e5d55c (patch) | |
| tree | 65d0903a31cae86467f7551653ef6f1c743cde9e /src/server/game/Achievements/AchievementMgr.cpp | |
| parent | 82f7b337b2dafd16506033cdbfecc979bc6f7119 (diff) | |
| parent | 984e1feadfae97c7616c54f9ac731cc6db4f2e15 (diff) | |
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'src/server/game/Achievements/AchievementMgr.cpp')
| -rw-r--r-- | src/server/game/Achievements/AchievementMgr.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Achievements/AchievementMgr.cpp b/src/server/game/Achievements/AchievementMgr.cpp index d754ef967e6..c71b85b2d27 100644 --- a/src/server/game/Achievements/AchievementMgr.cpp +++ b/src/server/game/Achievements/AchievementMgr.cpp @@ -3151,14 +3151,14 @@ void AchievementGlobalMgr::LoadAchievementCriteriaData() } uint32 dataType = fields[1].GetUInt8(); - const char* scriptName = fields[4].GetCString(); + std::string scriptName = fields[4].GetString(); uint32 scriptId = 0; - if (strcmp(scriptName, "")) // not empty + if (scriptName.length()) // not empty { if (dataType != ACHIEVEMENT_CRITERIA_DATA_TYPE_SCRIPT) sLog->outError(LOG_FILTER_SQL, "Table `achievement_criteria_data` has ScriptName set for non-scripted data type (Entry: %u, type %u), useless data.", criteria_id, dataType); else - scriptId = sObjectMgr->GetScriptId(scriptName); + scriptId = sObjectMgr->GetScriptId(scriptName.c_str()); } AchievementCriteriaData data(dataType, fields[2].GetUInt32(), fields[3].GetUInt32(), scriptId); |
