swg-source/src
1
0
Fork 0
mirror of https://github.com/SWG-Source/src.git synced 2026-07-31 00:15:55 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into 'master'

Browse Source 
no more gcc warns except for pragma and the tmpnam warn...both of which aren't a big deal



See merge request !9
This commit is contained in:
DarthArgus
2015-10-14 13:41:04 -04:00
parent 585bacc483 220782606e
commit b98c89d9a7
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/client/application/Miff/src/linux/parser.yac
+1 -1
View File
@@ -27,7 +27,7 @@
#include <string.h>
#include <stdlib.h> /* for toupper() */
#include <wchar.h> /* for wide character (16bit) strings */
#include <ctype.h> /* for strtoupper and strtolower */
#include <stdio.h>
/*----------------------------------------------------------------**
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;