Author: sveinung
Date: Fri May 5 13:00:48 2017
New Revision: 35411
URL: http://svn.gna.org/viewcvs/freeciv?rev=35411&view=rev
Log:
A non Spy is spent, not caught. It can't escape.
See hrm Feature #657298
Modified:
branches/S2_6/server/diplomats.c
Modified: branches/S2_6/server/diplomats.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/diplomats.c?rev=35411&r1=35410&r2=35411&view=diff
==============================================================================
--- branches/S2_6/server/diplomats.c (original)
+++ branches/S2_6/server/diplomats.c Fri May 5 13:00:48 2017
@@ -1562,8 +1562,10 @@
}
}
- /* FIXME: Reason should be ULR_USED for diplomats? */
- wipe_unit(pdiplomat, ULR_CAUGHT, NULL);
+ wipe_unit(pdiplomat,
+ /* A non Spy can't escape. It is therefore spent, not caught. */
+ unit_has_type_flag(pdiplomat, UTYF_SPY) ? ULR_CAUGHT : ULR_USED,
+ NULL);
}
/**************************************************************************
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
