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

Do not try to load a default lua file. 

The default behavior is now that the game goes to the console without
loading setup.lua, unless setup.lua is specified in eressea.ini as the
script to be run.
Should add an option to override this from the command line, too.
This commit is contained in:
Enno Rehling 2014-02-17 11:51:57 -08:00
parent 5cf31189e6
commit 3a824eb859
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.c
View File

@ -38,7 +38,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include <iniparser.h> #include <iniparser.h>
static const char *logfile= "eressea.log"; static const char *logfile= "eressea.log";
static const char *luafile = "setup.lua"; static const char *luafile = 0;
static const char *entry_point = NULL; static const char *entry_point = NULL;
static const char *inifile = "eressea.ini"; static const char *inifile = "eressea.ini";
static int memdebug = 0; static int memdebug = 0;
@ -60,7 +60,7 @@ static void parse_config(const char *filename)
/* excerpt from [config] (the rest is used in bindings.c) */ /* excerpt from [config] (the rest is used in bindings.c) */
game_name = iniparser_getstring(d, "config:game", game_name); game_name = iniparser_getstring(d, "config:game", game_name);
} else { } else {
log_error("could not open configuration file %s\n", filename); log_warning("could not open configuration file %s\n", filename);
} }
global.inifile = d; global.inifile = d;
} }