diff -Nur -X/home/thue/freeciv-dev/no.freeciv freeciv/common/capstr.c 32_players/common/capstr.c --- freeciv/common/capstr.c Sun Apr 30 15:53:33 2000 +++ 32_players/common/capstr.c Sun Apr 30 16:26:52 2000 @@ -71,7 +71,7 @@ */ #define CAPABILITY "+1.10 +fog_of_war +fortify_two_step +get_sabotage_list \ -ocean_reclamation +dipl_cli_pop_dlg advance_focus_packet" +ocean_reclamation +dipl_cli_pop_dlg advance_focus_packet +30players" /* "+1.10" is protocol for 1.10.0 stable release @@ -90,6 +90,8 @@ "advance_focus_packet" is a protocol extension that the server uses to tell the client that the server does not intend to move a unit further. + + "30players" is raising the MAX_NUM_PLAYERS value from 14 to 30. */ void init_our_capability(void) diff -Nur -X/home/thue/freeciv-dev/no.freeciv freeciv/common/map.h 32_players/common/map.h --- freeciv/common/map.h Sun Apr 30 15:53:33 2000 +++ 32_players/common/map.h Sun Apr 30 15:58:06 2000 @@ -56,12 +56,12 @@ enum tile_special_type special; struct city *city; struct unit_list units; - unsigned short known; /* A bitvector on the server side, an - enum known_type on the client side. - Player_no is index */ - unsigned short sent; /* Indicates if the client know the tile - as TILE_KNOWN_NODRAW. A bitvector like known. - Not used on the client side. */ + unsigned int known; /* A bitvector on the server side, an + enum known_type on the client side. + Player_no is index */ + unsigned int sent; /* Indicates if the client know the tile + as TILE_KNOWN_NODRAW. A bitvector like known. + Not used on the client side. */ short assigned; /* these can save a lot of CPU usage -- Syela */ struct city *worked; /* city working tile, or NULL if none */ signed short continent; diff -Nur -X/home/thue/freeciv-dev/no.freeciv freeciv/common/shared.h 32_players/common/shared.h --- freeciv/common/shared.h Sun Apr 30 15:53:34 2000 +++ 32_players/common/shared.h Sun Apr 30 15:58:06 2000 @@ -25,7 +25,7 @@ #define BROADCAST_EVENT -2 -#define MAX_NUM_PLAYERS 14 +#define MAX_NUM_PLAYERS 30 #define MAX_NUM_ITEMS 200 /* eg, unit_types */ #define MAX_NUM_TECH_LIST 10 #define MAX_LEN_NAME 32 diff -Nur -X/home/thue/freeciv-dev/no.freeciv freeciv/server/plrhand.c 32_players/server/plrhand.c --- freeciv/server/plrhand.c Sun Apr 30 15:53:41 2000 +++ 32_players/server/plrhand.c Sun Apr 30 16:07:57 2000 @@ -90,10 +90,13 @@ ((const struct player_score_entry *)a)->value); } -static char *greatness[] = { +static char *greatness[MAX_NUM_PLAYERS] = { N_("Magnificent"), N_("Glorious"), N_("Great"), N_("Decent"), N_("Mediocre"), N_("Hilarious"), N_("Worthless"), N_("Pathetic"), - N_("Useless"), "Useless", "Useless", "Useless", "Useless", "Useless" + N_("Useless"), "Useless", "Useless", "Useless", "Useless", "Useless", + "Useless", "Useless", "Useless", "Useless", "Useless", "Useless", + "Useless", "Useless", "Useless", "Useless", "Useless", "Useless", + "Useless", "Useless", "Useless", "Useless" }; static void historian_generic(enum historian_type which_news)