Merge branch 'Verlasse-zu-spät-in-Befehlsreihenfolge' of github.com:C…

…TD1/eressea-server-bugfixing into CTD1-Verlasse-zu-spät-in-Befehlsreihenfolge

Conflicts:
	src/laws.c

.gitignore

@@ -1,3 +1,5 @@
+eressea.ini
+
 # SlickEdit
 *.vtg
 *.vpwhistu

configure

@@ -1,4 +1,5 @@
 #!/bin/sh
 git submodule update --init
+ln -sf conf/eressea.ini
 s/cmake-init
 echo "configuration complete. run s/build to build the server"

src/laws.c

@@ -4606,7 +4606,7 @@ void init_processor(void)
     add_proc_order(p, K_MAIL, &mail_cmd, 0, "Botschaften");
 
     p += 10;                      /* all claims must be done before we can USE */
-    add_proc_region(p, &enter_1, "Betreten (1. Versuch)");
+    add_proc_region(p, &enter_1, "Betreten (1. Versuch)");     /* for GIVE CONTROL */
     add_proc_order(p, K_USE, &use_cmd, 0, "Benutzen");
 
     p += 10;                      /* in case it has any effects on alliance victories */
@@ -4615,6 +4615,10 @@ void init_processor(void)
     p += 10;                      /* in case it has any effects on alliance victories */
     add_proc_order(p, K_LEAVE, &leave_cmd, 0, "Verlassen");
 
+    p += 10;
+    add_proc_region(p, &enter_1, "Betreten (2. Versuch)"); /* to allow a buildingowner to enter the castle pre combat */
+
+    p += 10;
     add_proc_region(p, &do_battle, "Attackieren");
 
     if (!keyword_disabled(K_BESIEGE)) {
@@ -4623,7 +4627,7 @@ void init_processor(void)
     }
 
     p += 10;                      /* can't allow reserve before siege (weapons) */
-    add_proc_region(p, &enter_1, "Betreten (2. Versuch)");
+    add_proc_region(p, &enter_1, "Betreten (3. Versuch)");
     if (get_param_int(global.parameters, "rules.reserve.twophase", 0)) {
         add_proc_order(p, K_RESERVE, &reserve_self, 0, "RESERVE (self)");
         p += 10;
@@ -4664,7 +4668,7 @@ void init_processor(void)
     add_proc_postregion(p, &split_allocations, "Produktion II");
 
     p += 10;
-    add_proc_region(p, &enter_2, "Betreten (3. Versuch)");
+    add_proc_region(p, &enter_2, "Betreten (4. Versuch)"); /* Once again after QUIT */
 
     p += 10;
     add_proc_region(p, &sinkships, "Schiffe sinken");