swg-source-1.2/src-1.2
1
0
Fork 0
mirror of https://bitbucket.org/theswgsource/src-1.2.git synced 2026-09-12 22:45:02 -04:00
Code Issues Projects Releases Wiki Activity

fix more warnings

Browse Source
This commit is contained in:
DarthArgus
2014-10-27 18:59:37 -07:00
parent 9e6f200300
commit 7b6271b48d
26 changed files with 71 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/object/CreatureObject.cpp
+7 -12
View File
@@ -4301,12 +4301,14 @@ static const int internalTagBufLen = strlen(internalTagBuf);
do
{
newMod.mod.tag = Crc::calculate(&internalTagBuf[0]);
char * c = &internalTagBuf[internalTagBufLen-1];
while (++(*c) == '9' + 1)
{
*c-- = '0';
if ((internalTagBufLen - 1) > 0) {
char * c = &internalTagBuf[internalTagBufLen - 1];
while (++(*c) == '9' + 1)
{
*c-- = '0';
}
insertResult = m_attributeModList.insert(newMod.mod.tag, newMod);
}
insertResult = m_attributeModList.insert(newMod.mod.tag, newMod);
} while (!insertResult.second);
// clear any flags that assume we have a valid tag.
@@ -5488,13 +5490,6 @@ int CreatureObject::getInstrumentAudioId() const
return audioId;
}
// last, check the look at target if no weapon is equipped
if (!hasWeapon)
{
int audioId = internalGetInstrumentAudioId(getLookAtTarget());
if(audioId)
return audioId;
}
return 0;
}