Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

cleaning

This commit is contained in:
Enno Rehling 2010-02-22 07:58:59 +00:00
parent 6492051b78
commit 7b8c4a76dd
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/eressea/build.vcproj
View File

@ -2,7 +2,7 @@
<VisualStudioProject <VisualStudioProject
ProjectType="Visual C++" ProjectType="Visual C++"
Version="8.00" Version="8.00"
Name="build" Name="amalgamation-eressea"
ProjectGUID="{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}" ProjectGUID="{AD80EB0B-7CB4-42F2-9C95-8CCEF68DB387}"
RootNamespace="build" RootNamespace="build"
SccProjectName="Svn" SccProjectName="Svn"

5
src/eressea/main.c
View File

@ -383,12 +383,13 @@ my_lua_error(lua_State * L)
} }
static void static void
load_inifile(const char * filename) parse_config(const char * filename)
{ {
dictionary * d = iniparser_new(filename); dictionary * d = iniparser_new(filename);
if (d) { if (d) {
const char * str; const char * str;
load_inifile(d);
g_basedir = iniparser_getstring(d, "eressea:base", g_basedir); g_basedir = iniparser_getstring(d, "eressea:base", g_basedir);
lomem = iniparser_getint(d, "eressea:lomem", lomem)?1:0; lomem = iniparser_getint(d, "eressea:lomem", lomem)?1:0;
memdebug = iniparser_getint(d, "eressea:memcheck", memdebug); memdebug = iniparser_getint(d, "eressea:memcheck", memdebug);
@ -485,7 +486,7 @@ main(int argc, char *argv[])
log_open("eressea.log"); log_open("eressea.log");
locale_init(); locale_init();
load_inifile("eressea.ini"); parse_config("eressea.ini");
L = lua_init(); L = lua_init();
global.vm_state = L; global.vm_state = L;
if ((i=read_args(argc, argv, L))!=0) return i; if ((i=read_args(argc, argv, L))!=0) return i;