Author: cazfi
Date: Fri May 5 20:32:57 2017
New Revision: 35413
URL: http://svn.gna.org/viewcvs/freeciv?rev=35413&view=rev
Log:
Use '&&' instead of '*' in boolean context.
See hrm Bug #657355
Modified:
branches/S3_0/server/generator/fracture_map.c
Modified: branches/S3_0/server/generator/fracture_map.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S3_0/server/generator/fracture_map.c?rev=35413&r1=35412&r2=35413&view=diff
==============================================================================
--- branches/S3_0/server/generator/fracture_map.c (original)
+++ branches/S3_0/server/generator/fracture_map.c Fri May 5 20:32:57 2017
@@ -288,8 +288,8 @@
**************************************************************************/
void make_fracture_relief(void)
{
- int choose_mountain;
- int choose_hill;
+ bool choose_mountain;
+ bool choose_hill;
int landarea;
int total_mtns;
int iter;
@@ -310,14 +310,14 @@
if (not_placed(ptile) && hmap(ptile) > hmap_shore_level) { /* place on
land only */
/* mountains */
choose_mountain = (hmap(ptile) > local_ave_elevation(ptile) * 1.20)
- || (area_is_too_flat(ptile, hmap_mountain_level, hmap(ptile)) *
(fc_rand(10) < 4));
+ || (area_is_too_flat(ptile, hmap_mountain_level, hmap(ptile)) &&
(fc_rand(10) < 4));
choose_hill = (hmap(ptile) > local_ave_elevation(ptile) * 1.10)
- || (area_is_too_flat(ptile, hmap_mountain_level, hmap(ptile)) *
(fc_rand(10) < 4));
+ || (area_is_too_flat(ptile, hmap_mountain_level, hmap(ptile)) &&
(fc_rand(10) < 4));
/* The following avoids hills and mountains directly along the coast. */
if (count_terrain_class_near_tile(ptile, TRUE, TRUE, TC_OCEAN) > 0) {
- choose_mountain = 0;
- choose_hill = 0;
+ choose_mountain = FALSE;
+ choose_hill = FALSE;
}
if (choose_mountain) {
total_mtns++;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
