sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Dedicated server no longer depends on qt. Added code for utf-8 conversion on windows and linux (without qt). Some small issues remain (like the data-dir and charset for the server).

Browse Source
This commit is contained in:
lotodore
2007-10-01 00:33:05 +00:00
parent c17be5af25
commit b4a1ce8bd5
18 changed files with 465 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/config/configfile.cpp
+7 -13
View File
@@ -18,8 +18,7 @@
* 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
***************************************************************************/
#include "configfile.h"
#include <qttoolswrapper.h>
#include <qttoolsinterface.h>
#define MODUS 0711
@@ -28,8 +27,6 @@
#include <direct.h>
#endif
#include <boost/filesystem.hpp>
#include <iostream>
#include <sstream>
#include <cstdlib>
@@ -40,16 +37,16 @@
using namespace std;
class QtToolsWrapper;
QtToolsInterface *CreateQtToolsWrapper();
ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
{
myArgv = argv;
myArgv0 = argv[0];
int i;
myQtToolsInterface = new QtToolsWrapper;
myQtToolsInterface = CreateQtToolsWrapper();
for (i=1; i<argc; i++) {
if(strcmp(argv[i], "--nowriteaccess") == 0) { noWriteAccess = 1; }
@@ -145,12 +142,10 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
claNoWriteAccess = "1";
}
boost::filesystem::path startPath(argv[0]);
ostringstream tempIntToString;
tempIntToString << configRev;
configList.push_back(ConfigInfo("ConfigRevision", CONFIG_TYPE_INT, tempIntToString.str()));
configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, myQtToolsInterface->getDataPathStdString(startPath.remove_leaf().directory_string())));
configList.push_back(ConfigInfo("AppDataDir", CONFIG_TYPE_STRING, myQtToolsInterface->getDataPathStdString(argv[0])));
configList.push_back(ConfigInfo("Language", CONFIG_TYPE_INT, myQtToolsInterface->getDefaultLanguage()));
configList.push_back(ConfigInfo("ShowLeftToolBox", CONFIG_TYPE_INT, "1"));
configList.push_back(ConfigInfo("ShowRightToolBox", CONFIG_TYPE_INT, "1"));
@@ -266,7 +261,7 @@ ConfigFile::ConfigFile(int argc, char **argv) : noWriteAccess(0)
if (tmpStr) tempAppDataPath = tmpStr;
}
if (tempRevision < configRev || tempAppDataPath != myQtToolsInterface->getDataPathStdString(startPath.remove_leaf().directory_string()) ) { /*löschen()*/
if (tempRevision < configRev || tempAppDataPath != myQtToolsInterface->getDataPathStdString(argv[0]) ) { /*löschen()*/
myConfigState = OLD;
updateConfig(myConfigState) ;
}
@@ -381,7 +376,6 @@ void ConfigFile::writeBuffer() const {
void ConfigFile::updateConfig(ConfigState myConfigState) {
boost::recursive_mutex::scoped_lock lock(m_configMutex);
boost::filesystem::path startPath(myArgv[0]);
size_t i;
@@ -453,7 +447,7 @@ void ConfigFile::updateConfig(ConfigState myConfigState) {
TiXmlElement * confElement1 = new TiXmlElement( "AppDataDir" );
config->LinkEndChild( confElement1 );
confElement1->SetAttribute("value", myQtToolsInterface->getDataPathStdString(startPath.remove_leaf().directory_string()));
confElement1->SetAttribute("value", myQtToolsInterface->getDataPathStdString(myArgv0));
TiXmlHandle oldDocHandle( &oldDoc );
src/config/configfile.h
+1 -1
View File
@@ -80,7 +80,7 @@ private:
ConfigState myConfigState;
QtToolsInterface *myQtToolsInterface;
char **myArgv;
char *myArgv0;
};
#endif