some more to try...

This commit is contained in:
DarthArgus
2016-07-24 21:36:20 -07:00
parent e65b05ada9
commit 9d2013918a
5 changed files with 2516 additions and 2571 deletions
@@ -29,15 +29,15 @@ const TriggerVolumeData DefaultTriggerVolumeData;
bool ServerXpManagerObjectTemplate::ms_allowDefaultTemplateParams = true;
/**
* Class constructor.
*/
ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate(const std::string & filename)
//@BEGIN TFD INIT
: ServerUniverseObjectTemplate(filename)
,m_versionOk(true)
//@END TFD INIT
, m_versionOk(true)
, m_templateVersion(0)
//@END TFD INIT
{
} // ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate
@@ -46,8 +46,8 @@ ServerXpManagerObjectTemplate::ServerXpManagerObjectTemplate(const std::string &
*/
ServerXpManagerObjectTemplate::~ServerXpManagerObjectTemplate()
{
//@BEGIN TFD CLEANUP
//@END TFD CLEANUP
//@BEGIN TFD CLEANUP
//@END TFD CLEANUP
} // ServerXpManagerObjectTemplate::~ServerXpManagerObjectTemplate
/**
@@ -110,7 +110,7 @@ Tag ServerXpManagerObjectTemplate::getHighestTemplateVersion(void) const
*/
Object * ServerXpManagerObjectTemplate::createObject(void) const
{
// return new XpManagerObject(this);
// return new XpManagerObject(this);
return nullptr;
} // ServerXpManagerObjectTemplate::createObject
@@ -124,8 +124,8 @@ Object * ServerXpManagerObjectTemplate::createObject(void) const
*/
void ServerXpManagerObjectTemplate::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() != ServerXpManagerObjectTemplate_tag)
{
@@ -135,7 +135,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();
@@ -155,10 +155,8 @@ char paramName[MAX_NAME_SIZE];
file.exitForm();
m_templateVersion = file.getCurrentName();
}
if (getHighestTemplateVersion() != TAG(0,0,0,0))
if (getHighestTemplateVersion() != TAG(0, 0, 0, 0))
{
m_versionOk = false;
}
@@ -176,4 +174,4 @@ char paramName[MAX_NAME_SIZE];
return;
} // ServerXpManagerObjectTemplate::load
//@END TFD
//@END TFD