Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix so code compiles on older gnuc

This commit is contained in:
Mark Vejvoda 2010-06-12 19:49:00 +00:00
parent 3401d5a43a
commit 100e39e6e0
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/glest_game/global/config.h
View File

@ -14,6 +14,7 @@
#include "properties.h"
#include <vector>
//#include <utility>
#include "game_constants.h"
namespace Glest{ namespace Game{
@ -36,11 +37,6 @@ enum ConfigType {
class Config {
private:
//Properties properties;
//ConfigType cfgType;
//string fileName;
//bool fileLoaded;
std::pair<Properties,Properties> properties;
std::pair<ConfigType,ConfigType> cfgType;
std::pair<string,string> fileName;
@ -54,9 +50,9 @@ private:
char translateStringToCharKey(const string &value) const;
public:
static Config &getInstance(std::pair<ConfigType,ConfigType> type = std::pair<ConfigType,ConfigType>(cfgMainGame,cfgUserGame),
std::pair<string,string> file = std::pair<string,string>("glest.ini","glestuser.ini"),
std::pair<bool,bool> fileMustExist = std::pair<bool,bool>(true,false));
static Config &getInstance(std::pair<ConfigType,ConfigType> type = std::make_pair(cfgMainGame,cfgUserGame) ,
std::pair<string,string> file = std::make_pair("glest.ini","glestuser.ini") ,
std::pair<bool,bool> fileMustExist = std::make_pair(true,false) );
void save(const string &path="");
int getInt(const string &key,const char *defaultValueIfNotFound=NULL) const;