Author: cazfi
Date: Wed Nov 16 17:50:10 2016
New Revision: 34527

URL: http://svn.gna.org/viewcvs/freeciv?rev=34527&view=rev
Log:
Do not return NULL as boolean from wonder_is_lost() nor wonder_is_built()

See bug #25301

Modified:
    branches/S2_5/common/improvement.c

Modified: branches/S2_5/common/improvement.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/improvement.c?rev=34527&r1=34526&r2=34527&view=diff
==============================================================================
--- branches/S2_5/common/improvement.c  (original)
+++ branches/S2_5/common/improvement.c  Wed Nov 16 17:50:10 2016
@@ -575,8 +575,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;
 }
@@ -588,8 +588,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

Reply via email to