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

Yet more warnings resolved; SDL gamma option added to command line.

Browse Source 
This was SVN commit r261.
This commit is contained in:
MarkT 2004-05-24 21:28:49 +00:00
parent 011bd189ea
commit 6ef97a6e9a
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/lib/sysdep/win/wfam.cpp
View File

@ -17,7 +17,9 @@
#include "precompiled.h"
#include "wfam.h"
// TODO Jan: Where is this file?
//#include "wfam.h"
#include "win_internal.h"
#if 0

12
source/main.cpp
View File

@ -339,7 +339,13 @@ void ParseArgs(int argc, char* argv[])
g_MapFile=argv[i]+3;
}
break;
case 'g':
if( argv[i][2] == '=' )
{
g_Gamma = (float)atof( argv[i] + 3 );
if( g_Gamma == 0.0f ) g_Gamma = 1.0f;
}
break;
case 'n':
if (strncmp(argv[i]+1,"novbo",5)==0) {
g_NoGLVBO=true;
@ -549,6 +555,10 @@ in_add_handler(terr_handler);
#endif
}
// TODO MT: Move this to atexit() code? Capture original gamma ramp at initialization and restore it?
SDL_SetGamma( 1.0f, 1.0f, 1.0f );
#ifndef NO_GUI
g_GUI.Destroy();
delete CGUI::GetSingletonPtr(); // again, we should have all singleton deletes somewhere

28
source/ps/Parser.cpp
View File

@ -33,7 +33,7 @@ bool CParserValue::func_name(type &ret) \
#define FUNC_IMPL_GETARG(func_name, get_name, type) \
bool CParserLine::func_name(const int & arg, type &ret) \
{ \
if (GetArgCount() <= arg) \
if (GetArgCount() <= (unsigned int)arg) \
return false; \
return m_Arguments[arg].get_name(ret); \
}
@ -115,7 +115,7 @@ bool CParserValue::GetDouble(_double &ret)
{
// locals
_double TempRet = 0.0;
int Size = m_String.size();
int Size = (int)m_String.size();
int i;
bool AtLeastOne = false; // Checked if at least one of the loops
// run, otherwise "." would parse OK
@ -129,7 +129,7 @@ bool CParserValue::GetDouble(_double &ret)
}
// find decimal position
DecimalPos = m_String.find(".");
DecimalPos = (int)m_String.find(".");
if (DecimalPos == string::npos)
DecimalPos = Size;
@ -326,7 +326,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
// Divide string into smaller vectors, seperators are unusual signs
// * * * *
for (i=0; i<strLine.size(); ++i)
for (i=0; i<(int)strLine.size(); ++i)
{
// Check if we're trying to use some kind of type
if (!Extract)
@ -343,7 +343,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
if (strLine[i] == '\"')
{
// Extract a string, search for another "
int pos = strLine.find("\"", i+1);
int pos = (int)strLine.find("\"", i+1);
// If matching can't be found,
// the parsing will fail!
@ -524,7 +524,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
// --- New node is set!
// Make sure they are large enough
if (LastValidProgress.size() < Lane+1)
if ((int)LastValidProgress.size() < Lane+1)
{
LastValidProgress.resize(Lane+1);
LastValidMatch.resize(Lane+1);
@ -534,7 +534,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
// Store last valid progress
LastValidProgress[Lane] = Progress;
LastValidMatch[Lane] = Match;
LastValidArgCount[Lane] = m_Arguments.size();
LastValidArgCount[Lane] = (int)m_Arguments.size();
++Lane;
@ -562,7 +562,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
{
// Find blank space if any!
// and jump to the next non-blankspace
if (Progress < Segments.size())
if (Progress < (int)Segments.size())
{
// Skip blankspaces AND tabs!
while (Segments[Progress].size()==1 &&
@ -572,7 +572,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
++Progress;
// Check length
if (Progress >= Segments.size())
if (Progress >= (int)Segments.size())
{
break;
}
@ -582,7 +582,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
else
// CHECK LETTER IF IT'S CORRECT
{
if (Progress < Segments.size())
if (Progress < (int)Segments.size())
{
// This should be 1-Letter long
if (Segments[Progress].size() != 1)
@ -618,7 +618,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
// that invalidates the match
// String end?
if (Progress >= Segments.size())
if (Progress >= (int)Segments.size())
{
Match = false;
}
@ -679,7 +679,7 @@ bool CParserLine::ParseString(const CParser& Parser, string strLine)
// Reset, probably is but still
value.m_String = string();
for (i=Progress; i<Segments.size(); ++i)
for (i=Progress; i<(int)Segments.size(); ++i)
{
value.m_String += Segments[i];
@ -814,7 +814,7 @@ bool CParser::InputTaskType(const string& strName, const string& strSyntax)
// Loop through the string and construct nodes in the binary tree
// when applicable
for (i=0; i<strSyntax.size(); ++i)
for (i=0; i<(int)strSyntax.size(); ++i)
{
// Extract is a variable that is true when we want to extract
// parts that is longer than one character.
@ -987,7 +987,7 @@ bool CParser::InputTaskType(const string& strName, const string& strSyntax)
CurNode->m_String = strSyntax.substr(ExtractPos+4, Pos-(ExtractPos+4));
// Now update position
i = Pos;
i = (int)Pos;
}
else
{