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

Merge branch 'master' into develop

This commit is contained in:
Enno Rehling 2020-09-24 19:30:16 +02:00
parent 912ce0f382 c7aab36c6e
commit d7d3b5d730
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/laws.c
View File

@ -3897,9 +3897,6 @@ void init_processor(void)
add_proc_region(p, enter_1, "Betreten (1. Versuch)"); /* for GIVE CONTROL */ 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 */
add_proc_order(p, K_GIVE, give_control_cmd, 0, "GIB KOMMANDO");
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");
@ -3918,7 +3915,10 @@ void init_processor(void)
add_proc_order(p, K_RESERVE, reserve_cmd, 0, "RESERVE (all)"); add_proc_order(p, K_RESERVE, reserve_cmd, 0, "RESERVE (all)");
add_proc_order(p, K_CLAIM, claim_cmd, 0, NULL); add_proc_order(p, K_CLAIM, claim_cmd, 0, NULL);
p += 10; /* rest rng again before economics */ p += 10; /* in case it has any effects on alliance victories */
add_proc_order(p, K_GIVE, give_control_cmd, 0, "GIB KOMMANDO");
p += 10; /* reset rng again before economics */
if (rule_force_leave(FORCE_LEAVE_ALL)) { if (rule_force_leave(FORCE_LEAVE_ALL)) {
add_proc_region(p, do_force_leave, "kick non-allies out of buildings/ships"); add_proc_region(p, do_force_leave, "kick non-allies out of buildings/ships");
} }