Author: cazfi
Date: Thu Aug 11 04:52:10 2016
New Revision: 33563
URL: http://svn.gna.org/viewcvs/freeciv?rev=33563&view=rev
Log:
Fixed compiler warnings about comparisons of unsigned type 'citizen' against
negative values.
See bug #24948
Modified:
branches/S2_5/common/city.c
branches/S2_5/common/vision.c
branches/S2_5/server/cityturn.c
Modified: branches/S2_5/common/city.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/city.c?rev=33563&r1=33562&r2=33563&view=diff
==============================================================================
--- branches/S2_5/common/city.c (original)
+++ branches/S2_5/common/city.c Thu Aug 11 04:52:10 2016
@@ -2221,7 +2221,6 @@
* specialists or angry are unhappy. This is changed by luxuries and
* buildings later. */
*unhappy = (size - specialist_count - *content - *angry);
- fc_assert_action(*unhappy >= 0, *unhappy = 0);
/* No one is born happy. */
*happy = 0;
Modified: branches/S2_5/common/vision.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/vision.c?rev=33563&r1=33562&r2=33563&view=diff
==============================================================================
--- branches/S2_5/common/vision.c (original)
+++ branches/S2_5/common/vision.c Thu Aug 11 04:52:10 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_5/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/cityturn.c?rev=33563&r1=33562&r2=33563&view=diff
==============================================================================
--- branches/S2_5/server/cityturn.c (original)
+++ branches/S2_5/server/cityturn.c Thu Aug 11 04:52:10 2016
@@ -890,7 +890,7 @@
bool city_change_size(struct city *pcity, citizens size,
struct player *nationality)
{
- fc_assert_ret_val(size >= 0 && size <= MAX_CITY_SIZE, TRUE);
+ fc_assert_ret_val(size <= MAX_CITY_SIZE, TRUE);
if (size > city_size_get(pcity)) {
/* Increase city size until size reached, or increase fails */
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
