diff options
| author | Nay <dnpd.dd@gmail.com> | 2011-11-26 03:19:37 +0000 |
|---|---|---|
| committer | Nay <dnpd.dd@gmail.com> | 2011-11-26 03:19:37 +0000 |
| commit | 846870bf6c47fbbdefef39c35ff11159b850082b (patch) | |
| tree | d2a850d832e9242fb5ca1cf22df29f8cab851406 /src/server/game/AI | |
| parent | 31533a342a56b1db22b50fe9f6c4c24c380cd507 (diff) | |
| parent | c105be95a5b9f42d0d85fc2d3c5563a928321eb4 (diff) | |
Merge branch 'master' into 4.x
Conflicts:
src/server/shared/Database/Implementation/CharacterDatabase.cpp
Diffstat (limited to 'src/server/game/AI')
| -rw-r--r-- | src/server/game/AI/SmartScripts/SmartScriptMgr.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp index fc3db7a0fe6..011ed75205d 100644 --- a/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp +++ b/src/server/game/AI/SmartScripts/SmartScriptMgr.cpp @@ -68,10 +68,12 @@ void SmartWaypointMgr::LoadFromDB() path = new WPPath; last_id = 1; } + if (last_id != id) { sLog->outErrorDb("SmartWaypointMgr::LoadFromDB: Path entry %u, unexpected point id %u, expected %u.", entry, id, last_id); } + last_id++; (*path)[id] = wp; |