[Freeciv-Dev] (PR#40034) [Patch] Fix SDL -client compilation

[Marko Lindqvist]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40034 >

 TRUNK and S2_2:
  - Include game.h in a number of c -files that require it

 S2_1:
 - Replace reference to non-existent variable with correct one


 Will commit immediately.


 - ML


diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/cma_fe.c freeciv/client/gui-sdl/cma_fe.c
--- freeciv/client/gui-sdl/cma_fe.c	2008-01-15 04:54:53.000000000 +0200
+++ freeciv/client/gui-sdl/cma_fe.c	2008-01-22 03:30:14.000000000 +0200
@@ -20,6 +20,9 @@
 /* utility */
 #include "fcintl.h"
 
+/* common */
+#include "game.h"
+
 /* client */
 #include "civclient.h" /* can_client_issue_orders() */
 
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/dialogs.c freeciv/client/gui-sdl/dialogs.c
--- freeciv/client/gui-sdl/dialogs.c	2008-01-15 04:54:53.000000000 +0200
+++ freeciv/client/gui-sdl/dialogs.c	2008-01-22 03:31:09.000000000 +0200
@@ -32,6 +32,7 @@
 
 /* common */
 #include "combat.h"
+#include "game.h"
 #include "government.h"
 #include "movement.h"
 #include "unitlist.h"
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/gui_main.c freeciv/client/gui-sdl/gui_main.c
--- freeciv/client/gui-sdl/gui_main.c	2008-01-15 04:54:53.000000000 +0200
+++ freeciv/client/gui-sdl/gui_main.c	2008-01-22 03:31:39.000000000 +0200
@@ -46,6 +46,7 @@
 #include "netintf.h"
 
 /* common */
+#include "game.h"
 #include "unitlist.h"
 
 /* client */
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/mapctrl.c freeciv/client/gui-sdl/mapctrl.c
--- freeciv/client/gui-sdl/mapctrl.c	2008-01-15 04:54:53.000000000 +0200
+++ freeciv/client/gui-sdl/mapctrl.c	2008-01-22 03:32:07.000000000 +0200
@@ -29,6 +29,7 @@
 #include "log.h"
 
 /* common */
+#include "game.h"
 #include "unit.h"
 #include "unitlist.h"
 
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/menu.c freeciv/client/gui-sdl/menu.c
--- freeciv/client/gui-sdl/menu.c	2008-01-15 04:54:53.000000000 +0200
+++ freeciv/client/gui-sdl/menu.c	2008-01-22 03:34:43.000000000 +0200
@@ -30,6 +30,7 @@
 #include "log.h"
 
 /* common */
+#include "game.h"
 #include "unitlist.h"
 
 /* client */
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/plrdlg.c freeciv/client/gui-sdl/plrdlg.c
--- freeciv/client/gui-sdl/plrdlg.c	2008-01-15 04:54:54.000000000 +0200
+++ freeciv/client/gui-sdl/plrdlg.c	2008-01-22 03:35:10.000000000 +0200
@@ -21,6 +21,9 @@
 #include "astring.h"
 #include "fcintl.h"
 
+/* common */
+#include "game.h"
+
 /* client */
 #include "civclient.h"
 #include "climisc.h"

diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/menu.c freeciv/client/gui-sdl/menu.c
--- freeciv/client/gui-sdl/menu.c	2008-01-15 04:04:33.000000000 +0200
+++ freeciv/client/gui-sdl/menu.c	2008-01-22 03:58:21.000000000 +0200
@@ -1064,7 +1064,7 @@
                       _("Form Traderoute with %s ( %d R&G + %d trade ) (R)"),
                       city_name(pHomecity),
                       revenue,
-                      trade_between_cities(pHomecity, pCity));
+                      trade_between_cities(pHomecity, pTile->city));
         } else {
           revenue = (revenue + 2) / 3;
           my_snprintf(cBuf, sizeof(cBuf),

_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev