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

Merge branch 'Verlasse-zu-spät-in-Befehlsreihenfolge' of github.com:CTD1/eressea-server-bugfixing into CTD1-Verlasse-zu-spät-in-Befehlsreihenfolge 

Conflicts:
	src/laws.c
This commit is contained in:
Enno Rehling 2014-08-08 00:34:55 +02:00
parent e6a162ebca db6179ddeb
commit 1bd78438f2
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

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

1
configure vendored
View File

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

10
src/laws.c
View File

@ -4606,7 +4606,7 @@ void init_processor(void)
add_proc_order(p, K_MAIL, &mail_cmd, 0, "Botschaften"); add_proc_order(p, K_MAIL, &mail_cmd, 0, "Botschaften");
p += 10; /* all claims must be done before we can USE */ 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"); add_proc_order(p, K_USE, &use_cmd, 0, "Benutzen");
p += 10; /* in case it has any effects on alliance victories */ 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 */ p += 10; /* in case it has any effects on alliance victories */
add_proc_order(p, K_LEAVE, &leave_cmd, 0, "Verlassen"); 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"); add_proc_region(p, &do_battle, "Attackieren");
if (!keyword_disabled(K_BESIEGE)) { if (!keyword_disabled(K_BESIEGE)) {
@ -4623,7 +4627,7 @@ void init_processor(void)
} }
p += 10; /* can't allow reserve before siege (weapons) */ 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)) { if (get_param_int(global.parameters, "rules.reserve.twophase", 0)) {
add_proc_order(p, K_RESERVE, &reserve_self, 0, "RESERVE (self)"); add_proc_order(p, K_RESERVE, &reserve_self, 0, "RESERVE (self)");
p += 10; p += 10;
@ -4664,7 +4668,7 @@ void init_processor(void)
add_proc_postregion(p, &split_allocations, "Produktion II"); add_proc_postregion(p, &split_allocations, "Produktion II");
p += 10; 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; p += 10;
add_proc_region(p, &sinkships, "Schiffe sinken"); add_proc_region(p, &sinkships, "Schiffe sinken");