Author: cazfi
Date: Wed Nov 16 17:49:57 2016
New Revision: 34525
URL: http://svn.gna.org/viewcvs/freeciv?rev=34525&view=rev
Log:
Do not return NULL as boolean from wonder_is_lost() nor wonder_is_built()
See bug #25301
Modified:
trunk/common/improvement.c
Modified: trunk/common/improvement.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/improvement.c?rev=34525&r1=34524&r2=34525&view=diff
==============================================================================
--- trunk/common/improvement.c (original)
+++ trunk/common/improvement.c Wed Nov 16 17:49:57 2016
@@ -757,8 +757,8 @@
bool wonder_is_lost(const struct player *pplayer,
const struct impr_type *pimprove)
{
- fc_assert_ret_val(NULL != pplayer, NULL);
- fc_assert_ret_val(is_wonder(pimprove), NULL);
+ fc_assert_ret_val(NULL != pplayer, FALSE);
+ fc_assert_ret_val(is_wonder(pimprove), FALSE);
return pplayer->wonders[improvement_index(pimprove)] == WONDER_LOST;
}
@@ -770,8 +770,8 @@
bool wonder_is_built(const struct player *pplayer,
const struct impr_type *pimprove)
{
- fc_assert_ret_val(NULL != pplayer, NULL);
- fc_assert_ret_val(is_wonder(pimprove), NULL);
+ fc_assert_ret_val(NULL != pplayer, FALSE);
+ fc_assert_ret_val(is_wonder(pimprove), FALSE);
return WONDER_BUILT(pplayer->wonders[improvement_index(pimprove)]);
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
