Minor warning-fixes and miscellaneous tidiness
This was SVN commit r2416.
This commit is contained in:
parent
32772dbf71
commit
d4617cbd3e
@ -89,6 +89,8 @@ void CTextureManager::LoadTerrainsFromXML(const char *filename)
|
||||
#define ELMT(x) int el_##x = XeroFile.getElementID(#x)
|
||||
#define ATTR(x) int at_##x = XeroFile.getAttributeID(#x)
|
||||
ELMT(terrain);
|
||||
#undef ELMT
|
||||
#undef ATTR
|
||||
|
||||
// Load terrains
|
||||
|
||||
@ -115,9 +117,6 @@ void CTextureManager::LoadTerrainsFromXML(const char *filename)
|
||||
// Keep reading - typos shouldn't be showstoppers
|
||||
}
|
||||
}
|
||||
|
||||
#undef EL
|
||||
#undef AT
|
||||
}
|
||||
|
||||
/*CTextureEntry* CTextureManager::AddTexture(const char* filename,int type)
|
||||
|
@ -56,6 +56,7 @@ CNetClient::~CNetClient()
|
||||
{
|
||||
delete it->second;
|
||||
}
|
||||
// (Isn't this an infinite loop?)
|
||||
}
|
||||
|
||||
void CNetClient::ScriptingInit()
|
||||
|
@ -13,7 +13,8 @@ by Rich Cross, rich@0ad.wildfiregames.com
|
||||
#define COVERLAY_H
|
||||
|
||||
#include "types.h"
|
||||
#include <CStr.h>
|
||||
|
||||
class CStr;
|
||||
|
||||
struct CColor
|
||||
{
|
||||
|
@ -34,9 +34,9 @@ bool CParserValue::func_name(type &ret) \
|
||||
// Get%type% from the CParserValue
|
||||
// func_name must belong to CParserFile
|
||||
#define FUNC_IMPL_GETARG(func_name, get_name, type) \
|
||||
bool CParserLine::func_name(const int & arg, type &ret) \
|
||||
bool CParserLine::func_name(size_t arg, type &ret) \
|
||||
{ \
|
||||
if (GetArgCount() <= (unsigned int)arg) \
|
||||
if (GetArgCount() <= arg) \
|
||||
return false; \
|
||||
return m_Arguments[arg].get_name(ret); \
|
||||
}
|
||||
|
@ -186,17 +186,17 @@ public:
|
||||
|
||||
// Methods for getting arguments
|
||||
// it returns success
|
||||
bool GetArgString (const int& arg, std::string &ret);
|
||||
bool GetArgBool (const int& arg, bool &ret);
|
||||
bool GetArgChar (const int& arg, char &ret);
|
||||
bool GetArgShort (const int& arg, short &ret);
|
||||
bool GetArgInt (const int& arg, int &ret);
|
||||
bool GetArgLong (const int& arg, long &ret);
|
||||
bool GetArgUnsignedShort (const int& arg, unsigned short &ret);
|
||||
bool GetArgUnsignedInt (const int& arg, unsigned int &ret);
|
||||
bool GetArgUnsignedLong (const int& arg, unsigned long &ret);
|
||||
bool GetArgFloat (const int& arg, float &ret);
|
||||
bool GetArgDouble (const int& arg, double &ret);
|
||||
bool GetArgString (size_t arg, std::string &ret);
|
||||
bool GetArgBool (size_t arg, bool &ret);
|
||||
bool GetArgChar (size_t arg, char &ret);
|
||||
bool GetArgShort (size_t arg, short &ret);
|
||||
bool GetArgInt (size_t arg, int &ret);
|
||||
bool GetArgLong (size_t arg, long &ret);
|
||||
bool GetArgUnsignedShort (size_t arg, unsigned short &ret);
|
||||
bool GetArgUnsignedInt (size_t arg, unsigned int &ret);
|
||||
bool GetArgUnsignedLong (size_t arg, unsigned long &ret);
|
||||
bool GetArgFloat (size_t arg, float &ret);
|
||||
bool GetArgDouble (size_t arg, double &ret);
|
||||
|
||||
// Get Argument count
|
||||
size_t GetArgCount() const { return m_Arguments.size(); }
|
||||
|
@ -1,27 +1,18 @@
|
||||
Microsoft Visual Studio Solution File, Format Version 8.00
|
||||
Project("{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}") = "FontBuilder", "FontBuilder.icproj", "{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FontBuilder", "FontBuilder.vcproj", "{D566B684-803B-4D6F-A617-829F050BE928}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfiguration) = preSolution
|
||||
Debug = Debug
|
||||
OldRelease = OldRelease
|
||||
Release = Release
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfiguration) = postSolution
|
||||
{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}.Debug.ActiveCfg = Debug|Win32
|
||||
{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}.Debug.Build.0 = Debug|Win32
|
||||
{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}.OldRelease.ActiveCfg = Release|Win32
|
||||
{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}.OldRelease.Build.0 = Release|Win32
|
||||
{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}.Release.ActiveCfg = Release|Win32
|
||||
{CFCF18FF-C3A4-4E76-BFA1-C5DB476E4687}.Release.Build.0 = Release|Win32
|
||||
{277A0C35-0B44-48FC-81FD-119AD97194EA}.Release.Build.0 = Release|Win32
|
||||
{277A0C35-0B44-48FC-81FD-119AD97194EA}.Release.ActiveCfg = Release|Win32
|
||||
{277A0C35-0B44-48FC-81FD-119AD97194EA}.OldRelease.Build.0 = Release|Win32
|
||||
{277A0C35-0B44-48FC-81FD-119AD97194EA}.OldRelease.ActiveCfg = Release|Win32
|
||||
{277A0C35-0B44-48FC-81FD-119AD97194EA}.Debug.Build.0 = Debug|Win32
|
||||
{277A0C35-0B44-48FC-81FD-119AD97194EA}.Debug.ActiveCfg = Debug|Win32
|
||||
{D566B684-803B-4D6F-A617-829F050BE928}.Debug.ActiveCfg = Debug|Win32
|
||||
{D566B684-803B-4D6F-A617-829F050BE928}.Debug.Build.0 = Debug|Win32
|
||||
{D566B684-803B-4D6F-A617-829F050BE928}.Release.ActiveCfg = Release|Win32
|
||||
{D566B684-803B-4D6F-A617-829F050BE928}.Release.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ExtensibilityGlobals) = postSolution
|
||||
EndGlobalSection
|
||||
|
@ -3,8 +3,7 @@
|
||||
ProjectType="Visual C++"
|
||||
Version="7.10"
|
||||
Name="FontBuilder"
|
||||
OwnerKey="{EAF909A5-FA59-4C3D-9431-0FCC20D5BCF9}"
|
||||
ProjectGUID="{277A0C35-0B44-48FC-81FD-119AD97194EA}"
|
||||
ProjectGUID="{D566B684-803B-4D6F-A617-829F050BE928}"
|
||||
RootNamespace="FontBuilder"
|
||||
Keyword="Win32Proj">
|
||||
<Platforms>
|
||||
|
Loading…
Reference in New Issue
Block a user