seefoe/src
1
0
Fork 0
mirror of https://bitbucket.org/seefoe/src.git synced 2026-10-17 07:03:11 -04:00
Code Issues Projects Releases Wiki Activity

fix all the warnings

Browse Source
This commit is contained in:
DarthArgus
2016-12-04 00:56:24 +00:00
parent 066eac440e
commit 12cf580937
4 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp
+3 -3
View File
@@ -124,7 +124,7 @@ Object * ServerTangibleObjectTemplate::createObject(void) const
} // ServerTangibleObjectTemplate::createObject
//@BEGIN TFD
const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int index) const
const TriggerVolumeData ServerTangibleObjectTemplate::getTriggerVolumes(int index) const
{
const ServerTangibleObjectTemplate * base = nullptr;
if (m_baseData != nullptr)
@@ -155,8 +155,8 @@ const TriggerVolumeData & ServerTangibleObjectTemplate::getTriggerVolumes(int in
}
DEBUG_FATAL(index < 0 || static_cast<size_t>(index) >= m_triggerVolumes.size(), ("template param index out of range"));
const TriggerVolumeData & value = m_triggerVolumes[index]->getValue();
return value;
return m_triggerVolumes[index]->getValue();
} // ServerTangibleObjectTemplate::getTriggerVolumes
size_t ServerTangibleObjectTemplate::getTriggerVolumesCount(void) const
engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h
+1 -1
View File
@@ -87,7 +87,7 @@ public:
};
public:
const TriggerVolumeData & getTriggerVolumes(int index) const;
const TriggerVolumeData getTriggerVolumes(int index) const;
size_t getTriggerVolumesCount(void) const;
CombatSkeleton getCombatSkeleton(bool testData = false) const;
int getMaxHitPoints(bool testData = false) const;