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

Merge pull request #245 from badgerman/feature/bug-1950-flee-and-guard 

Bug 1950: fleeing units can guard the same turn.
This commit is contained in:
Enno Rehling 2015-07-02 18:12:03 +02:00
parent 98c161869f a2376290d8
commit 13ed70f2fd
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/laws.c
View File

@ -2675,7 +2675,7 @@ enum { E_GUARD_OK, E_GUARD_UNARMED, E_GUARD_NEWBIE, E_GUARD_FLEEING };
static int can_start_guarding(const unit * u)
{
if (u->status >= ST_FLEE)
if (u->status >= ST_FLEE || fval(u, UFL_FLEEING))
return E_GUARD_FLEEING;
if (fval(u_race(u), RCF_UNARMEDGUARD))
return E_GUARD_OK;