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

Merge branch 'bug-2059-force-leave' of github.com:badgerman/eressea into bug-2059-force-leave 

Conflicts:
	src/laws.c
	src/laws.test.c
This commit is contained in:
Enno Rehling 2015-01-13 07:48:46 +01:00
parent 4f2d9260d1 d968aa2ed5
commit 73e1632dee
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/laws.c
View File

@ -4277,20 +4277,24 @@ void force_leave(region *r) {
unit *u;
for (u = r->units; u; u = u->next) {
unit *uo = NULL;
message *msg = NULL;
if (u->building) {
uo = building_owner(u->building);
msg = msg_message("force_leave_building", "unit owner building", u, uo, u->building);
}
if (u->ship && r->land) {
uo = ship_owner(u->ship);
msg = msg_message("force_leave_ship", "unit owner ship", u, uo, u->ship);
}
if (uo && !help_enter(uo, u)) {
leave(u, false);
message *msg = NULL;
if (u->building) {
msg = msg_message("force_leave_building", "unit owner building", u, uo, u->building);
}
else {
msg = msg_message("force_leave_ship", "unit owner ship", u, uo, u->ship);
}
if (msg) {
ADDMSG(&u->faction->msgs, msg);
}
leave(u, false);
}
}
}