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

mostly template initializations to prevent undefined behavior in the

Browse Source 
(unlikely) chance some of these properties are used
This commit is contained in:
DarthArgus
2016-07-24 21:25:03 -07:00
parent 5084c72fbe
commit e65b05ada9
55 changed files with 5565 additions and 6231 deletions
Download Patch File Download Diff File Expand all files Collapse all files
engine/server/library/serverGame/src/shared/objectTemplate/ServerStaticObjectTemplate.cpp
+11 -16
View File
@@ -22,20 +22,20 @@
const std::string DefaultString("");
const StringId DefaultStringId("", 0);
const Vector DefaultVector(0,0,0);
const Vector DefaultVector(0, 0, 0);
const TriggerVolumeData DefaultTriggerVolumeData;
bool ServerStaticObjectTemplate::ms_allowDefaultTemplateParams = true;
/**
* Class constructor.
*/
ServerStaticObjectTemplate::ServerStaticObjectTemplate(const std::string & filename)
//@BEGIN TFD INIT
: ServerObjectTemplate(filename)
,m_versionOk(true)
//@END TFD INIT
, m_versionOk(true)
, m_templateVersion(0)
//@END TFD INIT
{
} // ServerStaticObjectTemplate::ServerStaticObjectTemplate
@@ -44,8 +44,8 @@ ServerStaticObjectTemplate::ServerStaticObjectTemplate(const std::string & filen
*/
ServerStaticObjectTemplate::~ServerStaticObjectTemplate()
{
//@BEGIN TFD CLEANUP
//@END TFD CLEANUP
//@BEGIN TFD CLEANUP
//@END TFD CLEANUP
} // ServerStaticObjectTemplate::~ServerStaticObjectTemplate
/**
@@ -114,8 +114,6 @@ Object * ServerStaticObjectTemplate::createObject(void) const
//@BEGIN TFD
bool ServerStaticObjectTemplate::getClientOnlyBuildout() const
{
const ServerStaticObjectTemplate * base = nullptr;
if (m_baseData != nullptr)
{
@@ -141,7 +139,6 @@ bool ServerStaticObjectTemplate::getClientOnlyBuildout() const
return value;
} // ServerStaticObjectTemplate::getClientOnlyBuildout
/**
* Loads the template data from an iff file. We should already be in the form
* for this template.
@@ -150,8 +147,8 @@ bool ServerStaticObjectTemplate::getClientOnlyBuildout() const
*/
void ServerStaticObjectTemplate::load(Iff &file)
{
static const int MAX_NAME_SIZE = 256;
char paramName[MAX_NAME_SIZE];
static const int MAX_NAME_SIZE = 256;
char paramName[MAX_NAME_SIZE];
if (file.getCurrentName() != ServerStaticObjectTemplate_tag)
{
@@ -161,7 +158,7 @@ char paramName[MAX_NAME_SIZE];
file.enterForm();
m_templateVersion = file.getCurrentName();
if (m_templateVersion == TAG(D,E,R,V))
if (m_templateVersion == TAG(D, E, R, V))
{
file.enterForm();
file.enterChunk();
@@ -181,10 +178,8 @@ char paramName[MAX_NAME_SIZE];
file.exitForm();
m_templateVersion = file.getCurrentName();
}
if (getHighestTemplateVersion() != TAG(0,0,0,1))
if (getHighestTemplateVersion() != TAG(0, 0, 0, 1))
{
m_versionOk = false;
}
@@ -208,4 +203,4 @@ char paramName[MAX_NAME_SIZE];
return;
} // ServerStaticObjectTemplate::load
//@END TFD
//@END TFD