remove obsolete commands (PRAY) and parameters

core/res/de/strings.xml

@@ -1925,9 +1925,6 @@
   <string name="GIB">
     <text locale="de">GIB</text>
   </string>
-  <string name="GNADE">
-    <text locale="de">GNADE</text>
-  </string>
   <string name="HELFE">
     <text locale="de">HELFE</text>
   </string>

core/res/en/strings.xml

@@ -1214,9 +1214,6 @@
   <string name="GIB">
     <text locale="en">GIVE</text>
   </string>
-  <string name="GNADE">
-    <text locale="en">MERCY</text>
-  </string>
   <string name="HELFE">
     <text locale="en">HELP</text>
   </string>
@@ -1277,9 +1274,6 @@
   <string name="TRAENKE">
     <text locale="en">POTIONS</text>
   </string>
-  <string name="UM">
-    <text locale="en">FOR</text>
-  </string>
   <string name="VOR">
     <text locale="en">BEFORE</text>
   </string>

core/res/fr/strings.xml

@@ -1222,9 +1222,6 @@
   <string name="GIB">
     <text locale="fr">DONNER</text>
   </string>
-  <string name="GNADE">
-    <text locale="fr">PITIE</text>
-  </string>
   <string name="HELFE">
     <text locale="fr">AIDE</text>
   </string>
@@ -1285,9 +1282,6 @@
   <string name="TRÄNKE">
     <text locale="fr">POTIONS</text>
   </string>
-  <string name="UM">
-    <text locale="fr">POUR</text>
-  </string>
   <string name="VOR">
     <text locale="fr">AVANT</text>
   </string>

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()

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 };

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
 }

src/config.pkg

@@ -7,3 +7,4 @@ module eressea {
     void config_parse @ parse(const char *json);
   }
 }
+

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)) {

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

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;

src/kernel/config.c

@@ -362,9 +362,6 @@ const char *parameters[MAXPARAMS] = {
   "HELFE",
   "FREMDES",
   "AURA",
-  "UM",
-  "BEISTAND",
-  "GNADE",
   "HINTER",
   "VOR",
   "ANZAHL",

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: */

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,