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

fix config.xml for test games 

update log levels for some common messages.
This commit is contained in:
Enno Rehling 2014-06-02 05:42:56 +02:00
parent 1f41131593
commit 08c3d08d7d
4 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
conf/e2/catalog.xml
View File

@ -1,4 +1,3 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<!DOCTYPE catalog <!DOCTYPE catalog
PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN" PUBLIC "-//OASIS/DTD Entity Resolution XML Catalog V1.0//EN"

1
game-e2/config.xml
View File

@ -19,7 +19,6 @@
<xi:include href="config:///core/prefixes.xml"/> <xi:include href="config:///core/prefixes.xml"/>
<xi:include href="config:///core/ships.xml"/> <xi:include href="config:///core/ships.xml"/>
<xi:include href="config:///core/common/buildings.xml"/> <xi:include href="config:///core/common/buildings.xml"/>
<xi:include href="config:///core/equipment.xml"/>
<xi:include href="config:///game/familiars.xml"/> <xi:include href="config:///game/familiars.xml"/>
<xi:include href="config:///core/terrains.xml"/> <xi:include href="config:///core/terrains.xml"/>
<xi:include href="config:///game/terrains.xml"/> <xi:include href="config:///game/terrains.xml"/>

1
game-e3/config.xml
View File

@ -12,7 +12,6 @@
<xi:include href="config:///core/spoils.xml"/> <xi:include href="config:///core/spoils.xml"/>
<xi:include href="config:///core/prefixes.xml"/> <xi:include href="config:///core/prefixes.xml"/>
<xi:include href="config:///core/common/buildings.xml"/> <xi:include href="config:///core/common/buildings.xml"/>
<xi:include href="config:///core/equipment.xml"/>
<xi:include href="config:///game/familiars.xml"/> <xi:include href="config:///game/familiars.xml"/>
<xi:include href="config:///game/ships.xml"/> <xi:include href="config:///game/ships.xml"/>

6
src/kernel/save.c
View File

@ -225,7 +225,7 @@ static faction *factionorders(void)
const char *pass = getstrtoken(); const char *pass = getstrtoken();
if (!checkpasswd(f, (const char *)pass, true)) { if (!checkpasswd(f, (const char *)pass, true)) {
log_warning("Invalid password for faction %s\n", itoa36(fid)); log_debug("Invalid password for faction %s\n", itoa36(fid));
ADDMSG(&f->msgs, msg_message("wrongpasswd", "faction password", ADDMSG(&f->msgs, msg_message("wrongpasswd", "faction password",
f->no, pass)); f->no, pass));
return 0; return 0;
@ -806,7 +806,7 @@ void write_unit(struct gamedata *data, const unit * u)
if (++p < MAXPERSISTENT) { if (++p < MAXPERSISTENT) {
writeorder(data, ord, u->faction->locale); writeorder(data, ord, u->faction->locale);
} else { } else {
log_error("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
break; break;
} }
} }
@ -817,7 +817,7 @@ void write_unit(struct gamedata *data, const unit * u)
if (++p < MAXPERSISTENT) { if (++p < MAXPERSISTENT) {
writeorder(data, ord, u->faction->locale); writeorder(data, ord, u->faction->locale);
} else { } else {
log_error("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT); log_warning("%s had %d or more persistent orders\n", unitname(u), MAXPERSISTENT);
break; break;
} }
} }