Author: cazfi
Date: Sat Oct 8 14:58:34 2016
New Revision: 34052
URL: http://svn.gna.org/viewcvs/freeciv?rev=34052&view=rev
Log:
Fixed compiler shadow warning from aisettler.c
See bug #25159
Modified:
branches/S2_6/ai/default/aisettler.c
Modified: branches/S2_6/ai/default/aisettler.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aisettler.c?rev=34052&r1=34051&r2=34052&view=diff
==============================================================================
--- branches/S2_6/ai/default/aisettler.c (original)
+++ branches/S2_6/ai/default/aisettler.c Sat Oct 8 14:58:34 2016
@@ -1186,8 +1186,8 @@
**************************************************************************/
void dai_auto_settler_reset(struct ai_type *ait, struct player *pplayer)
{
- bool close;
- struct ai_plr *ai = dai_plr_data_get(ait, pplayer, &close);
+ bool caller_closes;
+ struct ai_plr *ai = dai_plr_data_get(ait, pplayer, &caller_closes);
fc_assert_ret(ai != NULL);
fc_assert_ret(ai->settler != NULL);
@@ -1207,7 +1207,7 @@
tile_data_cache_hash_clear(ai->settler->tdc_hash);
- if (close) {
+ if (caller_closes) {
dai_data_phase_finished(ait, pplayer);
}
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
