diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/ai/aitech.c freeciv/ai/aitech.c --- FreecivCVS/ai/aitech.c Wed May 24 15:12:55 2000 +++ freeciv/ai/aitech.c Sat Jul 22 10:58:12 2000 @@ -99,9 +99,9 @@ **************************************************************************/ static int get_wonder_tech(struct player *plr) { - int tech = A_NONE; + int tech; int building = get_nation_by_plr(plr)->goals.wonder; - + if (!improvement_exists(building)) return A_NONE; if (game.global_wonders[building] || wonder_obsolete(building)) @@ -192,13 +192,15 @@ static void ai_select_tech(struct player *pplayer, struct ai_choice *choice, struct ai_choice *gol) { - int i, j, k; + int i, j, k, c; int values[A_LAST]; int goal_values[A_LAST]; int prereq[A_LAST]; unsigned char cache[A_LAST][A_LAST]; - - int c = MAX(1, city_list_size(&pplayer->cities)); + + if((c = city_list_size(&pplayer->cities)) < 1) + c = 1; /* using MAX would mean double invocation of city_list_size() */ + memset(values, 0, sizeof(values)); memset(goal_values, 0, sizeof(goal_values)); memset(cache, 0, sizeof(cache)); diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-mui/mapclass.c freeciv/client/gui-mui/mapclass.c --- FreecivCVS/client/gui-mui/mapclass.c Sun Jul 16 18:50:26 2000 +++ freeciv/client/gui-mui/mapclass.c Sat Jul 22 10:56:45 2000 @@ -26,7 +26,6 @@ #include #include "fcintl.h" -#include "log.h" #include "map.h" #include "game.h" #include "spaceship.h" diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/client/gui-mui/mapctrl.c freeciv/client/gui-mui/mapctrl.c --- FreecivCVS/client/gui-mui/mapctrl.c Sun Jul 16 18:50:26 2000 +++ freeciv/client/gui-mui/mapctrl.c Sat Jul 22 10:56:45 2000 @@ -22,7 +22,6 @@ #include "capability.h" #include "game.h" -#include "log.h" #include "map.h" #include "player.h" #include "support.h" diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/map.c freeciv/common/map.c --- FreecivCVS/common/map.c Mon Jul 17 10:13:01 2000 +++ freeciv/common/map.c Sat Jul 22 11:00:21 2000 @@ -1171,8 +1171,8 @@ ***************************************************************/ enum known_type tile_is_known(int x, int y) { - return ((map.tiles+map_adjust_x(x)+ - map_adjust_y(y)*map.xsize)->known); + return (enum known_type) ((map.tiles+map_adjust_x(x)+ + map_adjust_y(y)*map.xsize)->known); } /*************************************************************** diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/common/shared.c freeciv/common/shared.c --- FreecivCVS/common/shared.c Thu Jun 22 22:22:37 2000 +++ freeciv/common/shared.c Sat Jul 22 10:56:45 2000 @@ -380,7 +380,7 @@ va_start(ap, format); ret = my_vsnprintf(str+len, n-len, format, ap); va_end(ap); - return ret + len; + return (int) (ret + len); } /*************************************************************************** diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/civserver.c freeciv/server/civserver.c --- FreecivCVS/server/civserver.c Sat Jul 15 11:45:47 2000 +++ freeciv/server/civserver.c Sat Jul 22 10:56:45 2000 @@ -166,7 +166,7 @@ char *gamelog_filename=NULL; char *load_filename=NULL; char *script_filename=NULL; - char *option=NULL; + char *option; int save_counter=0; int loglevel=LOG_NORMAL; struct timer *eot_timer; /* time server processing at end-of-turn */ @@ -760,7 +760,7 @@ check for cease-fires running out; update reputation; update cancelling reasons **************************************************************************/ -static void update_diplomatics() +static void update_diplomatics(void) { int p, p2; @@ -1929,10 +1929,8 @@ { int x,y; int playerid = pplayer->player_no; - struct tile *ptile; for (x = 0; x < map.xsize; x++) for (y = 0; y < map.ysize; y++) { - ptile = map_get_tile(x,y); map_change_seen(x, y, playerid, -1); if (map_get_seen(x, y, playerid) == 0) update_player_tile_last_seen(pplayer, x, y); diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/console.c freeciv/server/console.c --- FreecivCVS/server/console.c Mon Jul 17 10:50:39 2000 +++ freeciv/server/console.c Sat Jul 22 10:56:45 2000 @@ -102,7 +102,7 @@ printf("%s", buf); } console_prompt_is_showing = 0; - return strlen(buf); + return (int) strlen(buf); } /************************************************************************ diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/gotohand.c freeciv/server/gotohand.c --- FreecivCVS/server/gotohand.c Wed Jul 19 03:08:07 2000 +++ freeciv/server/gotohand.c Sat Jul 22 10:56:45 2000 @@ -1316,7 +1316,7 @@ unsigned int fuelindex[MAXFUEL+1]; /* +1: stack top pointer */ struct refuel *prefuel, *pgoal; struct refuel start; - unsigned int found_goal = 0; + int found_goal = 0; unsigned int fullmoves = get_unit_type(punit->type)->move_rate/3; unsigned int fullfuel = get_unit_type(punit->type)->fuel; int turns = 0; diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/mapgen.c freeciv/server/mapgen.c --- FreecivCVS/server/mapgen.c Tue Jun 13 15:05:31 2000 +++ freeciv/server/mapgen.c Sat Jul 22 11:02:13 2000 @@ -138,7 +138,11 @@ **************************************************************************/ static void make_desert(int x, int y, int height, int diff) { - if (abs(full_map(x, y)-height)map.ysize*42/100 && y50) map_set_terrain(x, y, T_JUNGLE); - else + else map_set_terrain(x, y, T_FOREST); - if (abs(full_map(x, y)-height)5) make_forest(x-1,y, height, diff-5); - if (myrand(10)>5) make_forest(x,y-1, height, diff-5); - if (myrand(10)>5) make_forest(x+1,y, height, diff-5); - if (myrand(10)>5) make_forest(x,y+1, height, diff-5); - } + + /* abs is often a macro, so prevent double function invocation */ + i = full_map(x, y)-height; + if (abs(i)5) make_forest(x-1,y, height, diff-5); + if (myrand(10)>5) make_forest(x,y-1, height, diff-5); + if (myrand(10)>5) make_forest(x+1,y, height, diff-5); + if (myrand(10)>5) make_forest(x,y+1, height, diff-5); + } + forests++; } } @@ -180,7 +190,7 @@ static void make_forests(void) { int x,y; - int forestsize=25; + int forestsize; forestsize=(map.xsize*map.ysize*map.forestsize)/1000; do { x=myrand(map.xsize); diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/maphand.c freeciv/server/maphand.c --- FreecivCVS/server/maphand.c Sun Jul 9 21:49:12 2000 +++ freeciv/server/maphand.c Sat Jul 22 11:04:01 2000 @@ -280,7 +280,6 @@ { int dx,dy,abs_x,abs_y; int playerid = pplayer->player_no; - struct tile *ptile; struct city *pcity; send_NODRAW_tiles(pplayer,x,y,len); connection_do_buffer(pplayer->conn); @@ -289,7 +288,6 @@ for (dy = y-len;dy <= y+len;dy++) { if (is_real_tile(dx,dy)) { abs_y = map_adjust_y(dy); - ptile = map_get_tile(abs_x,abs_y); freelog (LOG_DEBUG, "Unfogging %i,%i. Previous fog: %i.", abs_x, abs_y, map_get_seen(abs_x, abs_y, playerid)); @@ -362,14 +360,12 @@ { int dx, dy, abs_x, abs_y, seen; int playerid = pplayer->player_no; - struct tile *ptile; connection_do_buffer(pplayer->conn); for (dx = x-len;dx <= x+len;dx++) { abs_x = map_adjust_x(dx); for (dy = y-len;dy <= y+len;dy++) { if (is_real_tile(dx,dy)) { abs_y = map_adjust_y(dy); - ptile = map_get_tile(abs_x,abs_y); freelog (LOG_DEBUG, "Fogging %i,%i. Previous fog: %i.", abs_x, abs_y, map_get_seen(abs_x, abs_y, playerid)); map_change_seen(abs_x, abs_y, playerid, -1); @@ -934,8 +930,9 @@ ***************************************************************/ int map_get_known(int x, int y, struct player *pplayer) { - return ((map.tiles+map_adjust_x(x)+ - map_adjust_y(y)*map.xsize)->known)&(1u<player_no); + return (int) (((map.tiles+map_adjust_x(x)+ + map_adjust_y(y)*map.xsize)->known) & + (1u<player_no)); } /*************************************************************** @@ -1052,8 +1049,9 @@ ***************************************************************/ int map_get_sent(int x, int y, struct player *pplayer) { - return ((map.tiles+map_adjust_x(x)+ - map_adjust_y(y)*map.xsize)->sent)&(1u<player_no); + return (int) (((map.tiles+map_adjust_x(x)+ + map_adjust_y(y)*map.xsize)->sent) & + (1u<player_no)); } /*************************************************************** diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/plrhand.c freeciv/server/plrhand.c --- FreecivCVS/server/plrhand.c Thu Jul 20 01:04:13 2000 +++ freeciv/server/plrhand.c Sat Jul 22 10:56:45 2000 @@ -1769,9 +1769,11 @@ get_government_name(preq->government)); if (!pplayer->ai.control) { + int i; /* Keep luxuries if we have any. Try to max out science. -GJW */ - pplayer->economic.science = MIN (100 - pplayer->economic.luxury, - get_government_max_rate (pplayer->government)); + i = get_government_max_rate (pplayer->government); + if((pplayer->economic.science = 100 - pplayer->economic.luxury) > i) + pplayer->economic.science = i; pplayer->economic.tax = 100 - (pplayer->economic.luxury + pplayer->economic.science); }