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

add missing file, fix factions that lack a locale.

This commit is contained in:
Enno Rehling 2014-11-23 21:15:09 +01:00
parent f92df416ff
commit 7b2d1991d8
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/eressea/rules.lua Normal file
View File

@ -0,0 +1,9 @@
local rules = {}
if config.rules then
rules = require('eressea.' .. config.rules)
eressea.log.info('loaded ' .. #rules .. ' modules for ' .. config.rules)
else
eressea.log.warning('no rule modules loaded, specify a game in eressea.ini or with -r')
end
return rules

1
src/kernel/save.c
View File

@ -1291,6 +1291,7 @@ faction *readfaction(struct gamedata * data)
READ_STR(data->store, name, sizeof(name)); READ_STR(data->store, name, sizeof(name));
f->locale = get_locale(name); f->locale = get_locale(name);
if (!f->locale) f->locale = default_locale;
READ_INT(data->store, &f->lastorders); READ_INT(data->store, &f->lastorders);
READ_INT(data->store, &f->age); READ_INT(data->store, &f->age);
READ_STR(data->store, name, sizeof(name)); READ_STR(data->store, name, sizeof(name));