Merge branch 'master' of https://github.com/andreasrosdal/freeciv-web

freeciv-web/src/main/webapp/index.html

@@ -6,6 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta name="description" content="Freeciv is a Free and Open Source empire-building strategy game made with HTML5 which you can play in your browser, tablet or mobile device!">
     <meta name="author" content="The Freeciv project">
+    <meta name="google-site-verification" content="Dz5U0ImteDS6QJqksSs6Nq7opQXZaHLntcSUkshCF8I" />
 
     <!-- Le styles -->
     <link href="css/bootstrap.min.css" rel="stylesheet">

freeciv/apply_patches.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PATCHLIST="caravan_fixes1 city_fixes city_impr_fix2 city_name_bugfix city-naming-change city_fixes2 citytools_changes client-fixes current_research_cost diplchanges goto_1 goto_attack1 goto_fix_1 goto_fix_2 govt-fix map-settings map_size_change metachange metatype packets middle_click_info orders_aborted orders_invalid2 text_fixes tileset_hack turnchange unithand-change2 webclient-ai-attitude freeciv-svn-webclient-changes network-rewrite-1 fcnet_packets misc_devversion_sync specs_format scenario_ruleset tile_bases_roads savegame savegame2 GOoutOfSight"
+PATCHLIST="caravan_fixes1 city_fixes city_impr_fix2 city_name_bugfix city-naming-change city_fixes2 citytools_changes client-fixes current_research_cost diplchanges goto_1 goto_attack1 goto_fix_1 goto_fix_2 govt-fix map-settings map_size_change metachange metatype packets middle_click_info orders_aborted orders_invalid2 text_fixes tileset_hack turnchange unithand-change2 webclient-ai-attitude freeciv-svn-webclient-changes network-rewrite-1 fcnet_packets misc_devversion_sync specs_format scenario_ruleset tile_bases_roads savegame savegame2"
 
 apply_patch() {
   patch -u -p1 -d freeciv < patches/$1.patch

freeciv/patches/tile_bases_roads.patch

@@ -1,7 +1,7 @@
 diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
---- freeciv/common/packets.def	2012-08-27 22:37:05.000000000 +0300
-+++ freeciv/common/packets.def	2012-08-27 22:47:26.000000000 +0300
-@@ -388,8 +388,8 @@
+--- freeciv/common/packets.def	2013-05-26 23:49:30.059232854 +0300
++++ freeciv/common/packets.def	2013-05-26 23:49:56.083233730 +0300
+@@ -400,8 +400,8 @@
    TERRAIN terrain;
    RESOURCE resource;
    BOOL special[S_LAST];
@@ -13,9 +13,9 @@ diff -Nurd -X.diff_ignore freeciv/common/packets.def freeciv/common/packets.def
    STRING label[MAX_LEN_NAME];
  end
 diff -Nurd -X.diff_ignore freeciv/server/maphand.c freeciv/server/maphand.c
---- freeciv/server/maphand.c	2012-08-27 22:36:56.000000000 +0300
-+++ freeciv/server/maphand.c	2012-08-27 23:32:42.000000000 +0300
-@@ -413,6 +413,34 @@
+--- freeciv/server/maphand.c	2013-05-26 23:49:30.095232856 +0300
++++ freeciv/server/maphand.c	2013-05-26 23:51:26.539236775 +0300
+@@ -476,6 +476,34 @@
  }
 
  /**************************************************************************
@@ -50,7 +50,7 @@ diff -Nurd -X.diff_ignore freeciv/server/maphand.c freeciv/server/maphand.c
    Send tile information to all the clients in dest which know and see
    the tile. If dest is NULL, sends to all clients (game.est_connections)
    which know and see tile.
-@@ -468,8 +496,8 @@
+@@ -534,8 +562,8 @@
        tile_special_type_iterate(spe) {
  	info.special[spe] = BV_ISSET(ptile->special, spe);
        } tile_special_type_iterate_end;
@@ -61,7 +61,7 @@ diff -Nurd -X.diff_ignore freeciv/server/maphand.c freeciv/server/maphand.c
 
        if (ptile->label != NULL) {
          strncpy(info.label, ptile->label, sizeof(info.label));
-@@ -502,8 +530,8 @@
+@@ -570,8 +598,8 @@
        tile_special_type_iterate(spe) {
  	info.special[spe] = BV_ISSET(plrtile->special, spe);
        } tile_special_type_iterate_end;
@@ -72,7 +72,7 @@ diff -Nurd -X.diff_ignore freeciv/server/maphand.c freeciv/server/maphand.c
 
        /* Labels never change, so they are not subject to fog of war */
        if (ptile->label != NULL) {
-@@ -514,6 +542,8 @@
+@@ -582,6 +610,8 @@
 
        send_packet_tile_info(pconn, &info);
      } else if (send_unknown) {
@@ -81,16 +81,16 @@ diff -Nurd -X.diff_ignore freeciv/server/maphand.c freeciv/server/maphand.c
        info.known = TILE_UNKNOWN;
        info.continent = 0;
        info.owner = MAP_TILE_OWNER_NULL;
-@@ -525,8 +555,15 @@
+@@ -594,8 +624,15 @@
        tile_special_type_iterate(spe) {
          info.special[spe] = FALSE;
        } tile_special_type_iterate_end;
 -      BV_CLR_ALL(info.bases);
 -      BV_CLR_ALL(info.roads);
 +      i = 0;
-+      base_type_iterate(pbase) {
++      for (i = 0; i < game.control.num_base_types; i++) {
 +        info.bases[i++] = '0';
-+      } base_type_iterate_end;
++      }
 +      info.bases[i] = '\0';
 +      for (i = 0; i < game.control.num_road_types; i++) {
 +        info.roads[i++] = '0';

freeciv/version.txt

@@ -1,4 +1,4 @@
-# Patches are against freeciv trunk revision 22889.
+# Patches are against freeciv trunk revision 22904.
 
 ORIGCAPSTR="+Freeciv.Devel-2.6-2013.May.02-2"
 WEBCAPSTR="+Freeciv.Web.Devel-2.6-2013.May.25"