[Freeciv-Dev] (PR#36522) adding a third terrain layer
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36522
This patch adds a third terrain layer, and makes the blending layer
configurable.
-jason
Index: data/trident.tilespec
===
--- data/trident.tilespec (revision 12674)
+++ data/trident.tilespec (working copy)
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = +tilespec4.2007.Feb.18
+options = +tilespec4.2007.Feb.20
; A simple name for the tileset specified by this file:
name = Trident
@@ -39,6 +39,9 @@
unit_offset_x = 0
unit_offset_y = 0
+; The layer in which blending is used (see terrains below)
+blend_layer = -1
+
; offset the citybar text by this amount (from the city tile origin)
citybar_offset_y = 27
Index: data/isophex.tilespec
===
--- data/isophex.tilespec (revision 12674)
+++ data/isophex.tilespec (working copy)
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = +tilespec4.2007.Feb.18
+options = +tilespec4.2007.Feb.20
; A simple name for the tileset specified by this file:
name = isophex
@@ -36,6 +36,9 @@
unit_offset_x = 21
unit_offset_y = 13
+; The layer in which blending is used (see terrains below)
+blend_layer = 0
+
; offset the citybar text by this amount (from the city tile origin)
citybar_offset_y = 20
Index: data/amplio.tilespec
===
--- data/amplio.tilespec (revision 12674)
+++ data/amplio.tilespec (working copy)
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = +tilespec4.2007.Feb.18
+options = +tilespec4.2007.Feb.20
; A simple name for the tileset specified by this file:
name = amplio
@@ -40,6 +40,9 @@
unit_offset_x = 19
unit_offset_y = 18
+; The layer in which blending is used (see terrains below)
+blend_layer = 0
+
;Enable citybar
is_full_citybar = 1
; offset the citybar text by this amount (from the city tile origin)
Index: data/isotrident.tilespec
===
--- data/isotrident.tilespec (revision 12674)
+++ data/isotrident.tilespec (working copy)
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = +tilespec4.2007.Feb.18
+options = +tilespec4.2007.Feb.20
; A simple name for the tileset specified by this file:
name = MacroIsoTrident
@@ -39,6 +39,9 @@
unit_offset_x = 21
unit_offset_y = 13
+; The layer in which blending is used (see terrains below)
+blend_layer = 0
+
; offset the citybar text by this amount (from the city tile origin)
citybar_offset_y = 20
Index: data/hex2t.tilespec
===
--- data/hex2t.tilespec (revision 12674)
+++ data/hex2t.tilespec (working copy)
@@ -2,7 +2,7 @@
[tilespec]
; Format and options of this tilespec file:
-options = +tilespec4.2007.Feb.18
+options = +tilespec4.2007.Feb.20
; A simple name for the tileset specified by this file:
@@ -43,6 +43,9 @@
unit_offset_x = 4
unit_offset_y = 57
+; The layer in which blending is used (see terrains below)
+blend_layer = 0
+
; offset the citybar text by this amount (from the city tile origin)
citybar_offset_y = 48
Index: client/tilespec.c
===
--- client/tilespec.c (revision 12674)
+++ client/tilespec.c (working copy)
@@ -84,7 +84,7 @@
CELL_SINGLE, CELL_RECT
};
-#define MAX_NUM_LAYERS 2
+#define MAX_NUM_LAYERS 3
struct terrain_drawing_data {
char *name;
@@ -372,6 +372,8 @@
int city_flag_offset_x, city_flag_offset_y;
int unit_offset_x, unit_offset_y;
+ int blend_layer;
+
int citybar_offset_y;
#define NUM_CORNER_DIRS 4
@@ -407,7 +409,7 @@
struct tileset *tileset;
-#define TILESPEC_CAPSTR +tilespec4.2007.Feb.18 duplicates_ok
+#define TILESPEC_CAPSTR +tilespec4.2007.Feb.20 duplicates_ok
/*
* Tilespec capabilities acceptable to this program:
*
@@ -785,11 +787,9 @@
if (draw-mine_tag) {
free(draw-mine_tag);
}
- if (draw-is_blended t-is_isometric) {
- for (i = 0; i 4; i++) {
- if (draw-blend[i]) {
- free_sprite(draw-blend[i]);
- }
+ for (i = 0; i 4; i++) {
+ if (draw-blend[i]) {
+ free_sprite(draw-blend[i]);
}
}
for (i = 0; i draw-num_layers; i++) {
@@ -1379,6 +1379,8 @@
t-unit_offset_x = secfile_lookup_int(file, tilespec.unit_offset_x);
t-unit_offset_y = secfile_lookup_int(file, tilespec.unit_offset_y);
+ t-blend_layer = secfile_lookup_int(file, tilespec.blend_layer);
+
t-citybar_offset_y
= secfile_lookup_int(file, tilespec.citybar_offset_y);
@@ -1400,7 +1402,8 @@
/* Terrain layer info. */
for (i = 0; i MAX_NUM_LAYERS; i++) {
-char *style = secfile_lookup_str(file, layer%d.match_style, i);
+char *style = secfile_lookup_str_default(file, none,
+ layer%d.match_style, i);
[Freeciv-Dev] Re: (PR#36516) AutoReply: soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 Sorry, patch is broken, use this one instead. On 21/02/07, The default queue [EMAIL PROTECTED] wrote: Greetings, This message has been automatically generated in response to the creation of a trouble ticket regarding: soviet.nation patch, a summary of which appears below. There is no need to reply to this message right now. Your ticket has been assigned an ID of (PR#36516). Please include the string: (PR#36516) in the subject line of all future correspondence about this issue. To do so, you may reply to this message. Thank you, - Hi, I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). Thanks, Daniil. diff -ru freeciv-2.1.0-beta3.old/data/nation/soviet.ruleset freeciv-2.1.0-beta3/data/nation/soviet.ruleset --- freeciv-2.1.0-beta3.old/data/nation/soviet.ruleset 2007-02-17 06:26:21.0 +0200 +++ freeciv-2.1.0-beta3/data/nation/soviet.ruleset 2007-02-21 09:10:29.0 +0200 @@ -15,8 +15,12 @@ Nikita Khruschov, Leonid Brezhnev, Yuriy Andropov, - Nadezhda Krupskaya -leader_sex=Male, Male, Male, Male, Male, Female + Konstantin Chernenko, + Mikhail Gorbachev, + Nadezhda Krupskaya, + Alexandra Kollontai +leader_sex=Male, Male, Male, Male, Male, Male, + Male, Female, Female flag=soviet flag_alt = - city_style = European ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 [EMAIL PROTECTED] - Wed Feb 21 06:52:22 2007]: Hi, I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). Thanks, Daniil. Thanks for the patch! More influential females are always welcome. I'd avoid adding Gorbachev though, since he is alive. See doc/README.nations for details about Freeciv nation policy. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 True. I prefer 'none' though. But if you can argue that Gorbachev is an important enough character in Soviet history, I can agree to put him in. :) ~Daniel On 2/21/07, Daniil Ivanov [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 Hi, It says: Only one living person per nation is permitted. Thanks, Daniil. On 21/02/07, Daniel Markstedt [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 [EMAIL PROTECTED] - Wed Feb 21 06:52:22 2007]: Hi, I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). Thanks, Daniil. Thanks for the patch! More influential females are always welcome. I'd avoid adding Gorbachev though, since he is alive. See doc/README.nations for details about Freeciv nation policy. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] How can I change the language?
Hello, I would like to set the language of FreeCiv (FreeCiv GTK-version, running under Windows XP) to German, but I don't know how. I didn't find information how to do so in the manual either. Can you tell me? Thanks, Andreas Duering ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 Hi, It says: Only one living person per nation is permitted. Thanks, Daniil. On 21/02/07, Daniel Markstedt [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 [EMAIL PROTECTED] - Wed Feb 21 06:52:22 2007]: Hi, I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). Thanks, Daniil. Thanks for the patch! More influential females are always welcome. I'd avoid adding Gorbachev though, since he is alive. See doc/README.nations for details about Freeciv nation policy. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] How can I change the language?
Please consult the FAQ: http://freeciv.wikia.com/wiki/FAQ#How_can_i_change_the_language_of_my_client.2Fserver.3F ~Daniel On 2/21/07, Andreas Düring [EMAIL PROTECTED] wrote: Hello, I would like to set the language of FreeCiv (FreeCiv GTK-version, running under Windows XP) to German, but I don't know how. I didn't find information how to do so in the manual either. Can you tell me? Thanks, Andreas Duering ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#35985) [art] civicon cityicon
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35985 On 2/21/07, Christian Prochaska [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=35985 [dmarks - Di 20. Feb 2007, 23:11:20]: BTW, any way of forcing the win32 builds to use the executable's ICO instead of civicon.png as window manager icon? The Windows window manager can scale its native format with anti-aliasing, while the Linux-style window manager icon looks craptacular (no anti-aliasing at all) whatever you do. You can tell the difference very well, since the ICO shows up in the taskbar for a second or so while starting up, before the Freeciv code changes it to the PNG. ~Daniel The attached patch makes sure that the icon of the executable is used in all clients on Windows (this also solves PR#36346). Nice! Does this affect the icon in the city window too? ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#35985) [art] civicon cityicon
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35985
[dmarks - Mi 21. Feb 2007, 12:59:16]:
On 2/21/07, Christian Prochaska [EMAIL PROTECTED] wrote:
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35985
[dmarks - Di 20. Feb 2007, 23:11:20]:
BTW, any way of forcing the win32 builds to use the executable's ICO
instead of civicon.png as window manager icon? The Windows window
manager can scale its native format with anti-aliasing, while the
Linux-style window manager icon looks craptacular (no anti-aliasing at
all) whatever you do. You can tell the difference very well, since the
ICO shows up in the taskbar for a second or so while starting up,
before the Freeciv code changes it to the PNG.
~Daniel
The attached patch makes sure that the icon of the executable is used in
all clients on Windows (this also solves PR#36346).
Nice! Does this affect the icon in the city window too?
~Daniel
No, that was missing. Updated patch attached.
Index: client/gui-gtk-2.0/citydlg.c
===
--- client/gui-gtk-2.0/citydlg.c (revision 12681)
+++ client/gui-gtk-2.0/citydlg.c (working copy)
@@ -1194,8 +1194,11 @@
gtk_widget_realize(pdialog-shell);
+ /* keep the icon of the executable on Windows (see PR#36491) */
+#ifndef WIN32_NATIVE
gtk_window_set_icon(GTK_WINDOW(pdialog-shell),
sprite_get_pixbuf(get_icon_sprite(tileset, ICON_CITYDLG)));
+#endif
/* Set old size. The size isn't saved in any way. */
if (citydialog_width citydialog_height) {
Index: client/gui-gtk-2.0/gui_main.c
===
--- client/gui-gtk-2.0/gui_main.c (revision 12681)
+++ client/gui-gtk-2.0/gui_main.c (working copy)
@@ -1409,9 +1409,12 @@
tileset_load_tiles(tileset);
+ /* keep the icon of the executable on Windows (see PR#36491) */
+#ifndef WIN32_NATIVE
/* Only call this after tileset_load_tiles is called. */
gtk_window_set_icon(GTK_WINDOW(toplevel),
sprite_get_pixbuf(get_icon_sprite(tileset, ICON_FREECIV)));
+#endif
setup_widgets();
load_cursors();
Index: client/gui-gtk-2.0/mapview.c
===
--- client/gui-gtk-2.0/mapview.c (revision 12681)
+++ client/gui-gtk-2.0/mapview.c (working copy)
@@ -794,6 +794,9 @@
reset_unit_table();
blank_max_unit_size();
+ /* keep the icon of the executable on Windows (see PR#36491) */
+#ifndef WIN32_NATIVE
gtk_window_set_icon(GTK_WINDOW(toplevel),
sprite_get_pixbuf(get_icon_sprite(tileset, ICON_FREECIV)));
+#endif
}
Index: client/gui-win32/gui_stuff.c
===
--- client/gui-win32/gui_stuff.c (revision 12681)
+++ client/gui-win32/gui_stuff.c (working copy)
@@ -259,7 +259,7 @@
wndclass-cbClsExtra=0;
wndclass-cbWndExtra=0;
wndclass-lpfnWndProc=(WNDPROC) layout_wnd_proc;
- wndclass-hIcon=NULL;
+ wndclass-hIcon=LoadIcon(GetModuleHandle(NULL), SDL_app);
wndclass-hCursor=LoadCursor(NULL,IDC_ARROW);
wndclass-hInstance=freecivhinst;
wndclass-hbrBackground=CreateSolidBrush(GetSysColor(15));
Index: win32/clienticon.rc
===
--- win32/clienticon.rc (revision 12681)
+++ win32/clienticon.rc (working copy)
@@ -1,3 +1,4 @@
#include windows.h
-client_icon ICON client.ico
+/* must be named SDL_app to work with the SDL client */
+SDL_app ICON client.ico
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#23961) AutoReply: Freeciv bug.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=23961 In the new release (beta 3) the control of awac is impossible, just like in beta2. Also: the air units seem to be useless. Bombers, Fighters and Missiles can only travel between friendly cities. Are unable to attack! Regards. The default queue wrote: Greetings, This message has been automatically generated in response to the creation of a trouble ticket regarding: Freeciv 2.1.0 Beta2 bug., a summary of which appears below. There is no need to reply to this message right now. Your ticket has been assigned an ID of (PR#23961). Please include the string: (PR#23961) in the subject line of all future correspondence about this issue. To do so, you may reply to this message. Thank you, - Ii is impossible to control Awacs. Try to select the AWAC in city Reggioo di Calabria and give an order e.g. Go. Regards. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 On Tue, 20 Feb 2007 22:52:23 -0800 Daniil Ivanov wrote: I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). M.S. Gorbachov is currently living person. Chernenko was, well, not so good _leader_. That is why they were not in list. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 Okay. On 21/02/07, Egor Vyscrebentsov [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 On Tue, 20 Feb 2007 22:52:23 -0800 Daniil Ivanov wrote: I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). M.S. Gorbachov is currently living person. Chernenko was, well, not so good _leader_. That is why they were not in list. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#23961) AutoReply: Freeciv bug.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=23961 Fernando Goncalves wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=23961 In the new release (beta 3) the control of awac is impossible, just like in beta2. Also: the air units seem to be useless. Bombers, Fighters and Missiles can only travel between friendly cities. Are unable to attack! Regards. You can attack with them. You just can't do a 'goto' route with them, you have to use the keypad to move them. (Yes this is a bug.) -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
