abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

Minor bug fixes

Browse Source 
This was SVN commit r7411.
This commit is contained in:
Ykkrosh 2010-03-29 10:22:34 +00:00
parent 13302cc133
commit 38feae61fb
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/simulation2/components/CCmpTemplateManager.cpp
View File

@ -213,7 +213,7 @@ bool CCmpTemplateManager::LoadTemplateFile(const std::wstring& templateName, int
if (!LoadTemplateFile(baseName, depth+1))
{
LOGERROR(L"Failed to load entity template '%ls'", baseName.c_str());
return NULL;
return false;
}
// Copy a subset to the requested template
CopyPreviewSubset(m_TemplateFileData[templateName], m_TemplateFileData[baseName]);
@ -228,7 +228,7 @@ bool CCmpTemplateManager::LoadTemplateFile(const std::wstring& templateName, int
if (!LoadTemplateFile(baseName, depth+1))
{
LOGERROR(L"Failed to load entity template '%ls'", baseName.c_str());
return NULL;
return false;
}
// Copy a subset to the requested template
CopyFoundationSubset(m_TemplateFileData[templateName], m_TemplateFileData[baseName]);

1
source/simulation2/system/Message.h
View File

@ -26,6 +26,7 @@ class CMessage
protected:
CMessage() { }
public:
virtual ~CMessage() { }
virtual EMessageTypeId GetType() const = 0;
virtual const char* GetScriptHandlerName() const = 0;
virtual const char* GetScriptGlobalHandlerName() const = 0;