? diff ? all.diff ? can_unit_move_to_tile_with_notify1.diff Index: client/tilespec.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/tilespec.c,v retrieving revision 1.70 diff -u -r1.70 tilespec.c --- client/tilespec.c 2002/02/22 13:14:39 1.70 +++ client/tilespec.c 2002/02/22 15:51:09 @@ -769,12 +769,12 @@ } for (i=0; i<2; i++) { - char *name = i ? tt->special_2_name : tt->special_1_name; - if (name[0]) { + char *name = (i != 0) ? tt->special_2_name : tt->special_1_name; + if (name[0] != '\0') { tt->special[i].sprite = lookup_sprite_tag_alt(tt->special[i].graphic_str, tt->special[i].graphic_alt, - name[0], "tile_type special", name); + name[0] != '\0', "tile_type special", name); assert(tt->special[i].sprite != NULL); } else { tt->special[i].sprite = NULL; @@ -1095,7 +1095,7 @@ *solid_bg = 0; - if (!tile_get_known(x, y)) + if (tile_get_known(x, y) == TILE_UNKNOWN) return -1; pcity = map_get_city(x, y); @@ -1282,7 +1282,7 @@ int x1, y1, other; if (MAPSTEP(x1, y1, x, y, DIR4_TO_DIR8[dir])) - other = tile_get_known(x1, y1) ? ttype_near[DIR4_TO_DIR8[dir]]:T_UNKNOWN; + other = (tile_get_known(x1, y1) != TILE_UNKNOWN) ? ttype_near[DIR4_TO_DIR8[dir]]:T_UNKNOWN; else other = ttype_near[dir]; dither[dir] = get_dither(ttype, other); @@ -1439,34 +1439,34 @@ } if((contains_special(tspecial, S_ROAD) || contains_special(tspecial, S_RAILROAD)) && draw_roads_rails) { - int n, s, e, w; + bool n, s, e, w; n = contains_special(tspecial_near[DIR8_NORTH], S_RAILROAD); s = contains_special(tspecial_near[DIR8_SOUTH], S_RAILROAD); e = contains_special(tspecial_near[DIR8_EAST], S_RAILROAD); w = contains_special(tspecial_near[DIR8_WEST], S_RAILROAD); - rail_card_count = n + s + e + w; + rail_card_count = (n ? 1 : 0) + (s ? 1 : 0) + (e ? 1 : 0) + (w ? 1 : 0); rail_card_tileno = INDEX_NSEW(n,s,e,w); n = contains_special(tspecial_near[DIR8_NORTH], S_ROAD); s = contains_special(tspecial_near[DIR8_SOUTH], S_ROAD); e = contains_special(tspecial_near[DIR8_EAST], S_ROAD); w = contains_special(tspecial_near[DIR8_WEST], S_ROAD); - road_card_count = n + s + e + w; + road_card_count = (n ? 1 : 0) + (s ? 1 : 0) + (e ? 1 : 0) + (w ? 1 : 0); road_card_tileno = INDEX_NSEW(n,s,e,w); n = contains_special(tspecial_near[DIR8_NORTHEAST], S_RAILROAD); s = contains_special(tspecial_near[DIR8_SOUTHWEST], S_RAILROAD); e = contains_special(tspecial_near[DIR8_SOUTHEAST], S_RAILROAD); w = contains_special(tspecial_near[DIR8_NORTHWEST], S_RAILROAD); - rail_semi_count = n + s + e + w; + rail_semi_count = (n ? 1 : 0) + (s ? 1 : 0) + (e ? 1 : 0) + (w ? 1 : 0); rail_semi_tileno = INDEX_NSEW(n,s,e,w); n = contains_special(tspecial_near[DIR8_NORTHEAST], S_ROAD); s = contains_special(tspecial_near[DIR8_SOUTHWEST], S_ROAD); e = contains_special(tspecial_near[DIR8_SOUTHEAST], S_ROAD); w = contains_special(tspecial_near[DIR8_NORTHWEST], S_ROAD); - road_semi_count = n + s + e + w; + road_semi_count = (n ? 1 : 0) + (s ? 1 : 0) + (e ? 1 : 0) + (w ? 1 : 0); road_semi_tileno = INDEX_NSEW(n,s,e,w); if(contains_special(tspecial, S_RAILROAD)) { @@ -1529,14 +1529,14 @@ int adjacent = rail_card_tileno; if (draw_diagonal_roads) adjacent |= rail_semi_tileno; - if (!adjacent) + if (adjacent == 0) *sprs++ = sprites.rail.isolated; } else if (contains_special(tspecial, S_ROAD)) { int adjacent = (rail_card_tileno | road_card_tileno); if (draw_diagonal_roads) adjacent |= (rail_semi_tileno | road_semi_tileno); - if (!adjacent) + if (adjacent == 0) *sprs++ = sprites.road.isolated; } } @@ -1557,7 +1557,7 @@ * way we won't get the "unknown" dither along the edge of the * map. */ - int known[4]; + bool known[4]; for (dir = 0; dir < 4; dir++) { int x1, y1; @@ -1572,7 +1572,7 @@ INDEX_NSEW(!known[DIR4_NORTH], !known[DIR4_SOUTH], !known[DIR4_EAST], !known[DIR4_WEST]); - if (tileno) + if (tileno != 0) *sprs++ = sprites.tx.darkness[tileno]; } @@ -1667,15 +1667,16 @@ { tilespec_setup_style_tile(style, city_styles[style].graphic); - if( !city_styles[style].tiles_num ) { /* no tiles found, try alternate */ - + if (city_styles[style].tiles_num == 0) { + /* no tiles found, try alternate */ freelog(LOG_NORMAL, "No tiles for %s style, trying alternate %s style", city_styles[style].graphic, city_styles[style].graphic_alt); tilespec_setup_style_tile(style, city_styles[style].graphic_alt); } - if( !city_styles[style].tiles_num ) { /* no alternate, use default */ + if (city_styles[style].tiles_num == 0) { + /* no alternate, use default */ freelog(LOG_NORMAL, "No tiles for alternate %s style, using default tiles", @@ -1754,7 +1755,7 @@ struct unit *punit; struct city *pcity; - if(!tile_get_known(x, y)) { + if (tile_get_known(x, y) == TILE_UNKNOWN) { color=COLOR_STD_BLACK; } else if((pcity=map_get_city(x, y))) { if(pcity->owner==game.player_idx) Index: client/tilespec.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/tilespec.h,v retrieving revision 1.26 diff -u -r1.26 tilespec.h --- client/tilespec.h 2002/02/19 16:41:18 1.26 +++ client/tilespec.h 2002/02/22 15:51:09 @@ -44,7 +44,7 @@ int x, int y, bool citymode, int *solid_bg); int fill_tile_sprite_array(struct Sprite **sprs, int abs_x0, int abs_y0, - int citymode, int *solid_bg, struct player **pplayer); + bool citymode, int *solid_bg, struct player **pplayer); int fill_unit_sprite_array(struct Sprite **sprs, struct unit *punit, int *solid_bg); int fill_city_sprite_array_iso(struct Sprite **sprs, struct city *pcity); @@ -62,8 +62,10 @@ #define BIT_EAST (0x04) #define BIT_WEST (0x08) -#define INDEX_NSEW(n,s,e,w) ((!!(n))*BIT_NORTH | (!!(s))*BIT_SOUTH | \ - (!!(e))*BIT_EAST | (!!(w))*BIT_WEST) +#define INDEX_NSEW(n,s,e,w) (((n) ? BIT_NORTH : 0) | \ + ((s) ? BIT_SOUTH : 0) | \ + ((e) ? BIT_EAST : 0) | \ + ((w) ? BIT_WEST : 0)) #define NUM_TILES_PROGRESS 8 #define NUM_TILES_CITIZEN 11