diff --git a/core/res/de/strings.xml b/core/res/de/strings.xml
index 895d26f53..8e10adf44 100644
--- a/core/res/de/strings.xml
+++ b/core/res/de/strings.xml
@@ -1925,9 +1925,6 @@
GIB
-
- GNADE
-
HELFE
diff --git a/core/res/en/strings.xml b/core/res/en/strings.xml
index 18b164aa8..b77660069 100644
--- a/core/res/en/strings.xml
+++ b/core/res/en/strings.xml
@@ -1214,9 +1214,6 @@
GIVE
-
- MERCY
-
HELP
@@ -1277,9 +1274,6 @@
POTIONS
-
- FOR
-
BEFORE
diff --git a/core/res/fr/strings.xml b/core/res/fr/strings.xml
index fea603a8b..312078f7a 100644
--- a/core/res/fr/strings.xml
+++ b/core/res/fr/strings.xml
@@ -1222,9 +1222,6 @@
DONNER
-
- PITIE
-
AIDE
@@ -1285,9 +1282,6 @@
POTIONS
-
- POUR
-
AVANT
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 064728317..f2faa2bc4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -52,6 +52,7 @@ TOLUA_BINDING(log.pkg util/log.h)
TOLUA_BINDING(locale.pkg bind_locale.h)
TOLUA_BINDING(config.pkg bind_config.h)
TOLUA_BINDING(process.pkg bind_process.h)
+TOLUA_BINDING(game.pkg bind_eressea.h config.h)
TOLUA_BINDING(eressea.pkg bind_eressea.h)
TOLUA_BINDING(settings.pkg bind_settings.h)
ENDIF()
diff --git a/src/bind_eressea.c b/src/bind_eressea.c
index ba22b8c7e..d6f1d1eb5 100755
--- a/src/bind_eressea.c
+++ b/src/bind_eressea.c
@@ -29,7 +29,7 @@ int eressea_read_orders(const char * filename) {
return readorders(filename);
}
-int eressea_export_json(const char * filename, unsigned int flags) {
+int eressea_export_json(const char * filename, int flags) {
FILE *F = fopen(filename, "wt");
if (F) {
stream out = { 0 };
diff --git a/src/bind_eressea.h b/src/bind_eressea.h
index fd1b5788d..e08015c24 100755
--- a/src/bind_eressea.h
+++ b/src/bind_eressea.h
@@ -9,7 +9,7 @@ int eressea_read_game(const char * filename);
int eressea_write_game(const char * filename);
int eressea_read_orders(const char * filename);
-int eressea_export_json(const char * filename, unsigned int flags);
+int eressea_export_json(const char * filename, int flags);
int eressea_import_json(const char * filename);
#ifdef __cplusplus
}
diff --git a/src/config.pkg b/src/config.pkg
index e73d11602..26f67c481 100644
--- a/src/config.pkg
+++ b/src/config.pkg
@@ -7,3 +7,4 @@ module eressea {
void config_parse @ parse(const char *json);
}
}
+
diff --git a/src/json.c b/src/json.c
index 9a43879ab..181d7f593 100644
--- a/src/json.c
+++ b/src/json.c
@@ -55,7 +55,7 @@ int json_import(struct stream * out) {
return 0;
}
-int json_export(stream * out, unsigned int flags) {
+int json_export(stream * out, int flags) {
cJSON *json, *root = cJSON_CreateObject();
assert(out && out->api);
if (regions && (flags & EXPORT_REGIONS)) {
diff --git a/src/json.h b/src/json.h
index 19828b866..a6f5595c4 100644
--- a/src/json.h
+++ b/src/json.h
@@ -7,7 +7,7 @@
#define EXPORT_UNITS 1<<2
struct stream;
-int json_export(struct stream * out, unsigned int flags);
+int json_export(struct stream * out, int flags);
int json_import(struct stream * out);
#endif
diff --git a/src/kernel/battle.c b/src/kernel/battle.c
index 3e1235231..9a5facbb2 100644
--- a/src/kernel/battle.c
+++ b/src/kernel/battle.c
@@ -2616,7 +2616,6 @@ static void reorder_fleeing(region * r)
static void aftermath(battle * b)
{
- int i;
region *r = b->region;
ship *sh;
side *s;
@@ -2631,20 +2630,6 @@ static void aftermath(battle * b)
for (df = s->fighters; df; df = df->next) {
unit *du = df->unit;
int dead = dead_fighters(df);
- int pr_mercy = 0;
-
- /* Regeneration durch PR_MERCY */
- if (dead > 0 && pr_mercy) {
- for (i = 0; i != dead; ++i) {
- if (rng_int() % 100 < pr_mercy) {
- ++df->alive;
- ++s->alive;
- ++s->battle->alive;
- /* do not change dead here, or loop will not terminate! recalculate later */
- }
- }
- dead = dead_fighters(df);
- }
/* tote insgesamt: */
s->dead += dead;
diff --git a/src/kernel/config.c b/src/kernel/config.c
index a92386433..6c6426eb3 100644
--- a/src/kernel/config.c
+++ b/src/kernel/config.c
@@ -362,9 +362,6 @@ const char *parameters[MAXPARAMS] = {
"HELFE",
"FREMDES",
"AURA",
- "UM",
- "BEISTAND",
- "GNADE",
"HINTER",
"VOR",
"ANZAHL",
diff --git a/src/kernel/save.h b/src/kernel/save.h
index 0b5f48e1c..c7654788a 100644
--- a/src/kernel/save.h
+++ b/src/kernel/save.h
@@ -34,7 +34,7 @@ extern "C" {
int readorders(const char *filename);
int creategame(void);
- extern int readgame(const char *filename, int backup);
+ int readgame(const char *filename, int backup);
int writegame(const char *filename);
/* Versionsänderungen: */
diff --git a/src/kernel/types.h b/src/kernel/types.h
index a3f2ca94a..4693c4b58 100644
--- a/src/kernel/types.h
+++ b/src/kernel/types.h
@@ -123,9 +123,6 @@ typedef enum {
P_HELP,
P_FOREIGN,
P_AURA,
- P_FOR,
- P_AID,
- P_MERCY,
P_AFTER,
P_BEFORE,
P_NUMBER,