swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-09-13 00:45:03 -04:00
Code Issues Projects Releases Wiki Activity

another warning bites the dust - all significant gcc warns should be done now, we're left only with clang detected warns

Browse Source
This commit is contained in:
DarthArgus
2015-10-14 12:38:27 -05:00
parent 68019340a1
commit 220782606e
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.cpp
+3 -2
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 = NULL;
if (m_baseData != NULL)
@@ -155,7 +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();
const TriggerVolumeData value = m_triggerVolumes[index]->getValue();
return value;
} // ServerTangibleObjectTemplate::getTriggerVolumes
engine/server/library/serverGame/src/shared/objectTemplate/ServerTangibleObjectTemplate.h
+1 -1
View File
@@ -84,7 +84,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;