mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
[10488] Fix checking text id's for creature_movement_template
Signed-off-by: NoFantasy <nofantasy@nf.no>
This commit is contained in:
parent
8b10ac9474
commit
9aa683f0e9
2 changed files with 45 additions and 1 deletions
|
|
@ -599,4 +599,48 @@ void WaypointManager::CheckTextsExistance(std::set<int32>& ids)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
WaypointPathTemplateMap::const_iterator wptItr = m_pathTemplateMap.begin();
|
||||||
|
for ( ; wptItr != m_pathTemplateMap.end(); ++wptItr)
|
||||||
|
{
|
||||||
|
for (size_t i = 0; i < wptItr->second.size(); ++i)
|
||||||
|
{
|
||||||
|
WaypointBehavior* be = wptItr->second[i].behavior;
|
||||||
|
if (!be)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
// Now we check text existence and put all zero texts ids to the end of array
|
||||||
|
|
||||||
|
// Counting leading zeros for futher textid shift
|
||||||
|
int zeroCount = 0;
|
||||||
|
for (int j = 0; j < MAX_WAYPOINT_TEXT; ++j)
|
||||||
|
{
|
||||||
|
if (!be->textid[j])
|
||||||
|
{
|
||||||
|
++zeroCount;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
if (!sObjectMgr.GetMangosStringLocale(be->textid[j]))
|
||||||
|
{
|
||||||
|
sLog.outErrorDb("Some waypoint has textid%u with not existing %u text.", j, be->textid[j]);
|
||||||
|
be->textid[j] = 0;
|
||||||
|
++zeroCount;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
ids.erase(be->textid[j]);
|
||||||
|
|
||||||
|
// Shifting check
|
||||||
|
if (zeroCount)
|
||||||
|
{
|
||||||
|
// Correct textid but some zeros leading, so move it forward.
|
||||||
|
be->textid[j-zeroCount] = be->textid[j];
|
||||||
|
be->textid[j] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "10487"
|
#define REVISION_NR "10488"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue