Bug 2594: KONTAKTIERE vor STIRB

scripts/tests/e2/init.lua

@@ -1,4 +1,4 @@
--- require 'tests.e2.quit'
+require 'tests.e2.quit'
 require 'tests.e2.movement'
 require 'tests.e2.astral'
 require 'tests.e2.spells'

scripts/tests/e2/quit.lua

@@ -3,12 +3,12 @@ require "lunit"
 module("tests.e2.quit", package.seeall, lunit.testcase)
 
 function test_quit_faction()
-    local r = region.create(0, 0, "plain")
+    local r = region.create(47, 0, "plain")
     local f1 = faction.create("human")
     f1.password = "steamedhams"
     local f2 = faction.create("human")
-    local u1 = unit.create(f1, r, 10)
-    local u2 = unit.create(f2, r, 10)
+    local u1 = unit.create(f1, r, 8)
+    local u2 = unit.create(f2, r, 9)
     local u3 = unit.create(f1, r, 10)
     u1:clear_orders()
     u2:clear_orders()

src/laws.c

@@ -3892,7 +3892,6 @@ void init_processor(void)
     add_proc_order(p, K_GROUP, group_cmd, 0, NULL);
 
     p += 10;
-    add_proc_order(p, K_QUIT, quit_cmd, 0, NULL);
     add_proc_order(p, K_URSPRUNG, origin_cmd, 0, NULL);
     add_proc_order(p, K_ALLY, ally_cmd, 0, NULL);
     add_proc_order(p, K_PREFIX, prefix_cmd, 0, NULL);
@@ -3916,6 +3915,7 @@ void init_processor(void)
     p += 10;                      /* all claims must be done before we can USE */
     add_proc_region(p, enter_1, "Betreten (1. Versuch)");     /* for GIVE CONTROL */
     add_proc_order(p, K_USE, use_cmd, 0, "Benutzen");
+    add_proc_order(p, K_QUIT, quit_cmd, 0, "Stirb");
 
     p += 10;                      /* in case it has any effects on alliance victories */
     add_proc_order(p, K_GIVE, give_control_cmd, 0, "GIB KOMMANDO");
@@ -3950,6 +3950,7 @@ void init_processor(void)
     /* all recruitment must be finished before we can calculate 
      * promotion cost of ability */
     p += 10;
+    add_proc_global(p, quit, "Sterben");
     add_proc_order(p, K_PROMOTION, promotion_cmd, 0, "Heldenbefoerderung");
 
     p += 10;
@@ -3958,9 +3959,6 @@ void init_processor(void)
     }
     add_proc_postregion(p, maintain_buildings, "Gebaeudeunterhalt");
 
-    p += 10;                      /* QUIT fuer sich alleine */
-    add_proc_global(p, quit, "Sterben");
-
     if (!keyword_disabled(K_CAST)) {
         p += 10;
         add_proc_global(p, magic, "Zaubern");

src/laws.h

@@ -120,6 +120,8 @@ extern "C" {
 
     enum param_t findparam_ex(const char *s, const struct locale * lang);
 
+#define QUIT_WITH_TRANSFER
+
 #ifdef __cplusplus
 }
 #endif