Author: cazfi
Date: Thu Aug 11 04:52:05 2016
New Revision: 33562
URL: http://svn.gna.org/viewcvs/freeciv?rev=33562&view=rev
Log:
Fixed compiler warnings about comparisons of unsigned type 'citizen' against
negative values.
See bug #24948
Modified:
branches/S2_6/common/city.c
branches/S2_6/common/vision.c
branches/S2_6/server/cityturn.c
Modified: branches/S2_6/common/city.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/city.c?rev=33562&r1=33561&r2=33562&view=diff
==============================================================================
--- branches/S2_6/common/city.c (original)
+++ branches/S2_6/common/city.c Thu Aug 11 04:52:05 2016
@@ -2185,7 +2185,6 @@
* specialists or angry are unhappy. This is changed by luxuries and
* buildings later. */
*unhappy = (size - spes - *content - *angry);
- fc_assert_action(*unhappy >= 0, *unhappy = 0);
/* No one is born happy. */
*happy = 0;
Modified: branches/S2_6/common/vision.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/vision.c?rev=33562&r1=33561&r2=33562&view=diff
==============================================================================
--- branches/S2_6/common/vision.c (original)
+++ branches/S2_6/common/vision.c Thu Aug 11 04:52:05 2016
@@ -134,7 +134,6 @@
void vision_site_size_set(struct vision_site *psite, citizens size)
{
fc_assert_ret(psite != NULL);
- fc_assert_ret(size <= MAX_CITY_SIZE);
psite->size = size;
}
Modified: branches/S2_6/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/cityturn.c?rev=33562&r1=33561&r2=33562&view=diff
==============================================================================
--- branches/S2_6/server/cityturn.c (original)
+++ branches/S2_6/server/cityturn.c Thu Aug 11 04:52:05 2016
@@ -915,7 +915,7 @@
{
int change = size - city_size_get(pcity);
- fc_assert_ret_val(size >= 0 && size <= MAX_CITY_SIZE, TRUE);
+ fc_assert_ret_val(size <= MAX_CITY_SIZE, TRUE);
if (change != 0 && reason != NULL) {
script_server_signal_emit("city_size_change", 3,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
