[Freeciv-Dev] (PR#34285) art: tech icons for two civ2 techs
http://bugs.freeciv.org/Ticket/Display.html?id=34285 > Tech icons for two techs that are disabled in the default ruleset, but used in the civ2 ruleset: Environmentalism and Fundamentalism. Derived from PD images by the US Navy (the former) and Oliver Wolters (the latter). ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#34276) clients default to the wrong port
http://bugs.freeciv.org/Ticket/Display.html?id=34276 > On 1/22/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=34276 > > > On 1/22/07, Daniel Markstedt <[EMAIL PROTECTED]> wrote: > > > > The default port has changed from to 5556, but the clients > > (tested with GTK2 and SDL) still default to . > > You probably have old port number stored in ~/.civclientrc > > > - ML > > Then I suppose this is bound to happen for everyone who updates. Suggest making a FAQ entry on it! ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#34276) clients default to the wrong port
http://bugs.freeciv.org/Ticket/Display.html?id=34276 > On 1/22/07, Daniel Markstedt <[EMAIL PROTECTED]> wrote: > > The default port has changed from to 5556, but the clients > (tested with GTK2 and SDL) still default to . You probably have old port number stored in ~/.civclientrc - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34276) clients default to the wrong port
http://bugs.freeciv.org/Ticket/Display.html?id=34276 > The default port has changed from to 5556, but the clients (tested with GTK2 and SDL) still default to . ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#34129) gui-sdl compile problem: round()
http://bugs.freeciv.org/Ticket/Display.html?id=34129 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > [EMAIL PROTECTED] - So 21. Jan 2007, 11:11:03]: > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > wrote: > > > > > > > [EMAIL PROTECTED] - Sa 20. Jan 2007, 13:33:05]: > > > > > > > > 'man round' says "Compile with -std=c99; link with -lm." But when > > I > > > > try to set '-std=c99', log.c no longer compiles. > > > > > > > > > > What's the error message? And how does the compiler command look > > like? > > > Here it reads: > > > > > > if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl -Wall -Wpointer-arith > > > -Wcast-align -Wmissing-prototypes -Wmissing-declarations > > > -DLOCALEDIR="\"/usr/local/share/locale\"" > > > -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" > > > -std=c99 -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes > > > -Wmissing-declarations -I/usr/include/SDL -D_GNU_SOURCE=1 > > -D_REENTRANT > > > -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o log.o > > log.c; \ > > > then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f > > ".deps/log.Tpo"; > > > exit 1; fi > > > > if gcc -DHAVE_CONFIG_H -I. -I../../src.patched/utility -I.. -I../intl > > -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes > > -Wmissing-declarations -DLOCALEDIR="\"/usr/local/share/locale\"" > > -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" > > -std=c99 -Werror -Wall -Wpointer-arith -Wcast-align > > -Wmissing-prototypes -Wmissing-declarations -I/usr/include/SDL > > -D_REENTRANT -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o > > log.o ../../src.patched/utility/log.c; \ > > then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f > > ".deps/log.Tpo"; exit 1; fi > > cc1: warnings being treated as errors > > ../../src.patched/utility/log.c: In function 'log_init': > > ../../src.patched/utility/log.c:186: warning: implicit declaration of > > function 'strdup' > > ../../src.patched/utility/log.c:186: warning: assignment makes pointer > > from integer without a cast > > make[3]: *** [log.o] Error 1 > > > > > > - ML > > > > Does it work when you add "-D_GNU_SOURCE=1" to the CFLAGS? Yes, it compiles even without your patch. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34272) [Patch] Deep Ocean gfx fallback
http://bugs.freeciv.org/Ticket/Display.html?id=34272 > Most tilesets handle Deep Ocean from #34265 using ocean graphics as fallback. Amplio and Isotrident however use wrong colour blending between Ocean and Deep Ocean tiles in that case. Attached patch defines Deep Ocean gfx separately for them, pointing to the Ocean gfx in the end. Blending is disabled for Deep Ocean. This fixes major problem between Ocean and Deep Ocean tiles, but brings minor problem between Deep Ocean and land tiles. This is most noticeable at poles. I plan to commit first this and later #34265. - ML diff -Nurd -X.diff_ignore freeciv/data/amplio/terrain1.spec freeciv/data/amplio/terrain1.spec --- freeciv/data/amplio/terrain1.spec 2006-07-17 23:56:22.0 +0300 +++ freeciv/data/amplio/terrain1.spec 2007-01-22 00:36:36.0 +0200 @@ -123,6 +123,7 @@ 15, 2, "mask.tile" 15, 2, "t.unknown1" 15, 3, "t.ocean1" + 15, 3, "t.deep1" 15, 4, "user.attention" 15, 5, "tx.fog" } diff -Nurd -X.diff_ignore freeciv/data/amplio/terrain2.spec freeciv/data/amplio/terrain2.spec --- freeciv/data/amplio/terrain2.spec 2006-07-17 23:56:22.0 +0300 +++ freeciv/data/amplio/terrain2.spec 2007-01-22 00:29:37.0 +0200 @@ -178,4 +178,41 @@ 2, 11, "t.ocean_cell_r101" 2, 13, "t.ocean_cell_r011" 2, 15, "t.ocean_cell_r111" + +; Deep Ocean fallback to same tiles as Ocean. + 0, 0, "t.deep_cell_u000" + 0, 2, "t.deep_cell_u100" + 0, 4, "t.deep_cell_u010" + 0, 6, "t.deep_cell_u110" + 0, 8, "t.deep_cell_u001" + 0, 10, "t.deep_cell_u101" + 0, 12, "t.deep_cell_u011" + 0, 14, "t.deep_cell_u111" + + 1, 0, "t.deep_cell_d000" + 1, 2, "t.deep_cell_d100" + 1, 4, "t.deep_cell_d010" + 1, 6, "t.deep_cell_d110" + 1, 8, "t.deep_cell_d001" + 1, 10, "t.deep_cell_d101" + 1, 12, "t.deep_cell_d011" + 1, 14, "t.deep_cell_d111" + + 2, 0, "t.deep_cell_l000" + 2, 2, "t.deep_cell_l100" + 2, 4, "t.deep_cell_l010" + 2, 6, "t.deep_cell_l110" + 2, 8, "t.deep_cell_l001" + 2, 10, "t.deep_cell_l101" + 2, 12, "t.deep_cell_l011" + 2, 14, "t.deep_cell_l111" + + 2, 1, "t.deep_cell_r000" + 2, 3, "t.deep_cell_r100" + 2, 5, "t.deep_cell_r010" + 2, 7, "t.deep_cell_r110" + 2, 9, "t.deep_cell_r001" + 2, 11, "t.deep_cell_r101" + 2, 13, "t.deep_cell_r011" + 2, 15, "t.deep_cell_r111" } diff -Nurd -X.diff_ignore freeciv/data/amplio.tilespec freeciv/data/amplio.tilespec --- freeciv/data/amplio.tilespec 2007-01-10 18:13:52.0 +0200 +++ freeciv/data/amplio.tilespec 2007-01-22 01:04:31.0 +0200 @@ -150,6 +150,13 @@ layer0_match_type = "ocean" layer0_cell_type = "rect" +[terrain_deep] +is_blended = 0 +num_layers = 1 +layer0_match_style = "bool" +layer0_match_type = "ocean" +layer0_cell_type = "rect" + [terrain_plains] is_blended = 1 num_layers = 1 diff -Nurd -X.diff_ignore freeciv/data/isotrident/terrain1.spec freeciv/data/isotrident/terrain1.spec --- freeciv/data/isotrident/terrain1.spec 2006-07-17 23:56:23.0 +0300 +++ freeciv/data/isotrident/terrain1.spec 2007-01-22 01:32:50.0 +0200 @@ -135,6 +135,7 @@ 0, 2, "mask.tile" 0, 2, "t.unknown1" 0, 3, "t.ocean1" + 0, 3, "t.deep1" 0, 4, "user.attention" 0, 5, "tx.fog" } diff -Nurd -X.diff_ignore freeciv/data/isotrident/terrain2.spec freeciv/data/isotrident/terrain2.spec --- freeciv/data/isotrident/terrain2.spec 2006-07-17 23:56:23.0 +0300 +++ freeciv/data/isotrident/terrain2.spec 2007-01-22 01:40:54.0 +0200 @@ -174,4 +174,41 @@ 2, 11, "t.ocean_cell_r101" 2, 13, "t.ocean_cell_r011" 2, 15, "t.ocean_cell_r111" + +; Deep Ocean fallback to Ocean tiles + 0, 0, "t.deep_cell_u000" + 0, 2, "t.deep_cell_u100" + 0, 4, "t.deep_cell_u010" + 0, 6, "t.deep_cell_u110" + 0, 8, "t.deep_cell_u001" + 0, 10, "t.deep_cell_u101" + 0, 12, "t.deep_cell_u011" + 0, 14, "t.deep_cell_u111" + + 1, 0, "t.deep_cell_d000" + 1, 2, "t.deep_cell_d100" + 1, 4, "t.deep_cell_d010" + 1, 6, "t.deep_cell_d110" + 1, 8, "t.deep_cell_d001" + 1, 10, "t.deep_cell_d101" + 1, 12, "t.deep_cell_d011" + 1, 14, "t.deep_cell_d111" + + 2, 0, "t.deep_cell_l000" + 2, 2, "t.deep_cell_l100" + 2, 4, "t.deep_cell_l010" + 2, 6, "t.deep_cell_l110" + 2, 8, "t.deep_cell_l001" + 2, 10, "t.deep_cell_l101" + 2, 12, "t.deep_cell_l011" + 2, 14, "t.deep_cell_l111" + + 2, 1, "t.deep_cell_r000" + 2, 3, "t.deep_cell_r100" + 2, 5, "t.deep_cell_r010" + 2, 7, "t.deep_cell_r110" + 2, 9, "t.deep_cell_r001" + 2, 11, "t.deep_cell_r101" + 2, 13, "t.deep_cell_r011" + 2, 15, "t.deep_cell_r111" } diff -Nurd -X.diff_ignore freeciv/data/isotrident.tilespec freeciv/data/isotrident.tilespec --- freeciv/data/isotrident.tilespec 2007-01-10 18:13:52.0 +0200 +++ freeciv/data/isotrident.tilespec 2007-01-22 01:32:19.0 +0200 @@ -147,6 +147,13 @@ layer0_match_type = "ocean" layer0_cell_type = "rect" +[terrain_deep] +is_blended = 0 +num_layers = 1 +layer0_match_style = "bool" +layer0_match_type = "ocean" +layer0_cell_type = "rect" + [terrain_plains] is_blended = 1 num_layers = 1
[Freeciv-Dev] (PR#34265) [Patch] Deep ocean
http://bugs.freeciv.org/Ticket/Display.html?id=34265 > Ruleset patch for deep ocean. This is just for testing gfx for two different ocean types. Ocean types have no functional difference. They only will look different when we get working gfx. This cannot be committed until tilesets work correctly at least using fallbacks. Current tilespecs are such that coast is drawn between Ocean and Deep Ocean. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34262) [Patch] Rename match_type "other" -> "land"
http://bugs.freeciv.org/Ticket/Display.html?id=34262 > Most tilesets have two layer0 match_type: "ocean" and "other". This patch renames "other" as "land". Even if some terrain type later needs special match_type, it has to come in addition to "land", since drawing second ocean type correctly will require common match_type for all land terrain types. - ML diff -Nurd -X.diff_ignore freeciv/data/amplio.tilespec freeciv/data/amplio.tilespec --- freeciv/data/amplio.tilespec 2007-01-10 18:13:52.0 +0200 +++ freeciv/data/amplio.tilespec 2007-01-21 23:37:37.0 +0200 @@ -92,7 +92,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -101,31 +101,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "forest" layer1_match_style = "bool" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_hills] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "hills" layer1_match_style = "bool" mine_sprite = "tx.mine" @@ -133,12 +133,12 @@ [terrain_jungle] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_mountains] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_type = "mountains" layer1_match_style = "bool" mine_sprite = "tx.mine" @@ -153,14 +153,14 @@ [terrain_plains] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_swamp] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_tundra] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" diff -Nurd -X.diff_ignore freeciv/data/hex2t.tilespec freeciv/data/hex2t.tilespec --- freeciv/data/hex2t.tilespec 2007-01-10 18:13:52.0 +0200 +++ freeciv/data/hex2t.tilespec 2007-01-21 23:42:40.0 +0200 @@ -109,7 +109,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -118,31 +118,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "forest" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_hills] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "steep" mine_sprite = "tx.mine" @@ -150,14 +150,14 @@ [terrain_jungle] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "none" layer1_match_type = "jungle" [terrain_mountains] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "steep" mine_sprite = "tx.mine" @@ -172,14 +172,14 @@ [terrain_plains] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_swamp] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [terrain_tundra] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" diff -Nurd -X.diff_ignore freeciv/data/isophex.tilespec freeciv/data/isophex.tilespec --- freeciv/data/isophex.tilespec 2007-01-10 18:13:52.0 +0200 +++ freeciv/data/isophex.tilespec 2007-01-21 23:41:20.0 +0200 @@ -100,7 +100,7 @@ [layer0] match_style = "BOOL" -match_types = "ocean", "other" +match_types = "ocean", "land" [layer1] match_style = "BOOL" @@ -109,31 +109,31 @@ [terrain_arctic] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_desert] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" mine_sprite = "tx.oil_mine" [terrain_forest] is_blended = 1 num_layers = 2 -layer0_match_type = "other" +layer0_match_type = "land" layer1_match_style = "bool" layer1_match_type = "forest" [terrain_grassland] is_blended = 1 num_layers = 1 -layer0_match_type = "other" +layer0_match_type = "land" [
[Freeciv-Dev] (PR#34259) [Patch] Error msg for missing gfx tag when match_style = full
http://bugs.freeciv.org/Ticket/Display.html?id=34259 >
Print error message about missing terrain graphics tags also when
terrain is using match_style = full.
- ML
diff -Nurd -X.diff_ignore freeciv/client/tilespec.c freeciv/client/tilespec.c
--- freeciv/client/tilespec.c 2006-07-25 13:42:32.0 +0300
+++ freeciv/client/tilespec.c 2007-01-21 22:57:49.0 +0200
@@ -2740,7 +2740,10 @@
x[dir], y[dir], W / 2, H / 2,
t->sprites.mask.tile,
xo[dir], yo[dir]);
- }
+ } else {
+ freelog(LOG_ERROR, _("Terrain graphics tag %s missing."),
+ buffer1);
+}
draw->layer[l].cells[i] = sprite;
break;
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#18466) Gfx problem with two sea types
http://bugs.freeciv.org/Ticket/Display.html?id=18466 > On 1/21/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote: > > On 1/21/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote: > > > > http://bugs.freeciv.org/Ticket/Display.html?id=18466 > > > > > On 7/10/06, Marko Lindqvist <[EMAIL PROTECTED]> wrote: > > > I don't think it's possible with current codebase to create > > > graphics that actually work with two separate ocean types. Either coast > > > gets drawn between ocean types or coast is not drawn correctly. > > > > Screenshot attached. There is coast drawn between sea types and no > > coast between deep sea and land. That is because coast is always drawn > > between coastal sea and another terrain type and never between deep > > ocean and another terrain type. > > Ok, setting same match_type in layer0 for both sea types disables > coast drawing between them. Setting second layer for deep ocean, but > not for coastal sea, makes blending between them to work correctly. > Now only problem is that there is no coast drawn between deep ocean > and land where they are next to each other. After reading some source code (README.graphics does not document this) I think that matching_style = "full" can be used to achieve what I want. So far I have found out that client is not giving any error messages when something is wrong in tileset using matching_style = full. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#18466) Gfx problem with two sea types
http://bugs.freeciv.org/Ticket/Display.html?id=18466 > On 1/21/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=18466 > > > On 7/10/06, Marko Lindqvist <[EMAIL PROTECTED]> wrote: > > I don't think it's possible with current codebase to create > > graphics that actually work with two separate ocean types. Either coast > > gets drawn between ocean types or coast is not drawn correctly. > > Screenshot attached. There is coast drawn between sea types and no > coast between deep sea and land. That is because coast is always drawn > between coastal sea and another terrain type and never between deep > ocean and another terrain type. Ok, setting same match_type in layer0 for both sea types disables coast drawing between them. Setting second layer for deep ocean, but not for coastal sea, makes blending between them to work correctly. Now only problem is that there is no coast drawn between deep ocean and land where they are next to each other. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#34081) [Patch] Read base flags from ruleset
http://bugs.freeciv.org/Ticket/Display.html?id=34081 >
On 1/21/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
>
> On 1/19/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
> >
> > Applies on top of #33876.
>
> - Improvet ruleset comments
> - Send information to client
- Updated against latest version of #33876
- Each base now has special section name in ruleset ([fortress] and
[airbase]) instead of [base_]. Previous generic format was just
silly considering all the limitations base implementation currently
has.
- ML
diff -Nurd -X.diff_ignore freeciv/client/packhand.c freeciv/client/packhand.c
--- freeciv/client/packhand.c 2007-01-21 00:49:15.0 +0200
+++ freeciv/client/packhand.c 2007-01-21 17:52:58.0 +0200
@@ -2441,6 +2441,26 @@
tileset_setup_resource(tileset, presource);
}
+/
+ Handle a packet about a particular base type.
+/
+void handle_ruleset_base(struct packet_ruleset_base *p)
+{
+ struct base_type *pbase = base_type_get_by_id(p->id);
+
+ if (!pbase) {
+freelog(LOG_ERROR,
+"Received bad base id %d in handle_ruleset_base",
+p->id);
+return;
+ }
+
+ sz_strlcpy(pbase->name_orig, p->name);
+ pbase->name = Q_(pbase->name_orig);
+
+ pbase->flags = p->flags;
+}
+
/**
Handle the terrain control ruleset packet sent by the server.
**/
diff -Nurd -X.diff_ignore freeciv/common/base.c freeciv/common/base.c
--- freeciv/common/base.c 2007-01-21 17:52:40.0 +0200
+++ freeciv/common/base.c 2007-01-21 18:11:34.0 +0200
@@ -19,52 +19,59 @@
#include "base.h"
+static struct base_type base_types[BASE_LAST];
+
+static const char *base_type_flag_names[] = {
+ "NoAggressive", "DefenseBonus", "NoStackDeath", "Watchtower",
+ "ClaimTerritory", "DiplomatDefense", "Refuel", "NoHPLoss",
+ "AttackUnreachable", "ParadropFrom"
+};
+
/
Check if base provides effect
/
-bool base_flag(Base_type_id base_type, enum base_flag_id flag)
+bool base_flag(const struct base_type *pbase, enum base_flag_id flag)
{
- switch(base_type) {
- case BASE_FORTRESS:
-/* Fortress */
-switch(flag) {
-case BF_NOT_AGGRESSIVE:
-case BF_DEFENSE_BONUS:
-case BF_WATCHTOWER:
-case BF_CLAIM_TERRITORY:
-case BF_NO_STACK_DEATH:
-case BF_DIPLOMAT_DEFENSE:
- return TRUE;
+ return BV_ISSET(pbase->flags, flag);
+}
-case BF_REFUEL:
-case BF_NO_HP_LOSS:
-case BF_ATTACK_UNREACHABLE:
-case BF_PARADROP_FROM:
-case BF_LAST:
- return FALSE;
+/**
+ Convert base flag names to enum; case insensitive;
+ returns BF_LAST if can't match.
+**/
+enum base_flag_id base_flag_from_str(const char *s)
+{
+ enum base_flag_id i;
+
+ assert(ARRAY_SIZE(base_type_flag_names) == BF_LAST);
+
+ for(i = 0; i < BF_LAST; i++) {
+if (mystrcasecmp(base_type_flag_names[i], s)==0) {
+ return i;
}
-break;
+ }
+ return BF_LAST;
+}
+
+/
+ Returns base type structure for an ID value.
+/
+struct base_type *base_type_get_by_id(Base_type_id id)
+{
+ if (id < 0 || id >= BASE_LAST) {
+return NULL;
+ }
+ return &base_types[id];
+}
- case BASE_AIRBASE:
-/* Airbase */
-switch(flag) {
-case BF_NO_STACK_DEATH:
-case BF_DIPLOMAT_DEFENSE:
-case BF_REFUEL:
-case BF_NO_HP_LOSS:
-case BF_ATTACK_UNREACHABLE:
-case BF_PARADROP_FROM:
- return TRUE;
+/
+ Inialize base_type structures.
+/
+void base_types_init(void)
+{
+ int i;
-case BF_NOT_AGGRESSIVE:
-case BF_DEFENSE_BONUS:
-case BF_WATCHTOWER:
-case BF_CLAIM_TERRITORY:
-case BF_LAST:
- return FALSE;
-}
-break;
+ for (i = 0; i < ARRAY_SIZE(base_types); i++) {
+base_types[i].id = i;
}
-
- return FALSE;
}
diff -Nurd -X.diff_ignore freeciv/common/base.h freeciv/common/base.h
--- freeciv/common/base.h 2007-01-21 17:52:40.0 +0200
+++ freeciv/common/base.h 2007-01-21 18:13:54.0 +0200
@@ -15,7 +15,7 @@
#include "fc_types.h"
-enum base_type_id { BASE_FORTRESS, BASE_AIRBASE };
+enum base_type_id { BASE_FORTRESS = 0, BASE_AIRBASE, BASE_LAST };
typedef enum base_type_id Base_type_id;
@@ -34,6 +3
[Freeciv-Dev] (PR#34246) SDL client: pixel border in buildings.png isn't recognized
http://bugs.freeciv.org/Ticket/Display.html?id=34246 > > [cproc - So 21. Jan 2007, 15:25:56]: > > > [dmarks - So 21. Jan 2007, 15:08:55]: > > > > The recently committed buildings.png has a one pixel border grid, > > which the SDL client cannot handle. To reproduce, just open up the > > Research window and look at a tech that allows the construction of a > > wonder. > > > > ~Daniel > > > > I guess it's because the [grid_main] part is missing in buildings.spec. > > Actually it's "pixel_border = 0" in wonders.spec. If I set it to "1" it works. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#33876) [Patch] tile_has_base_flag()
http://bugs.freeciv.org/Ticket/Display.html?id=33876 >
On 1/20/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
>
> On 1/19/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
> >
> > On 1/17/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
> > >
> > > This adds new module base.[ch]. It contains one function,
> > > base_has_effect(). New function tile_has_base_effect() in tile.c uses
> > > it. tile_has_base_effect() is called from number of places instead of
> > > directly checking if tile contains fortress/airbase.
> >
> > Eventually all these effects will be base flags. Namespaces changed
> > accordingly.
>
> Updated agaisnt svn
Changed base_type_id values to have descriptive names. No point in
starting generalization from them.
- ML
diff -Nurd -X.diff_ignore freeciv/common/aicore/pf_tools.c freeciv/common/aicore/pf_tools.c
--- freeciv/common/aicore/pf_tools.c 2007-01-21 00:49:21.0 +0200
+++ freeciv/common/aicore/pf_tools.c 2007-01-21 17:44:06.0 +0200
@@ -21,6 +21,7 @@
#include "log.h"
#include "mem.h"
+#include "base.h"
#include "game.h"
#include "movement.h"
@@ -571,7 +572,7 @@
return FALSE;
}
- if (tile_has_special(ptile, S_AIRBASE)) {
+ if (tile_has_base_flag(ptile, BF_REFUEL)) {
/* All airbases are considered non-dangerous, although non-allied ones
* are inaccessible. */
return FALSE;
diff -Nurd -X.diff_ignore freeciv/common/base.c freeciv/common/base.c
--- freeciv/common/base.c 1970-01-01 02:00:00.0 +0200
+++ freeciv/common/base.c 2007-01-21 17:45:37.0 +0200
@@ -0,0 +1,70 @@
+/
+ Freeciv - Copyright (C) 2004 - The Freeciv Team
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+/
+
+#ifdef HAVE_CONFIG_H
+#include
+#endif
+
+#include
+
+#include "base.h"
+
+/
+ Check if base provides effect
+/
+bool base_flag(Base_type_id base_type, enum base_flag_id flag)
+{
+ switch(base_type) {
+ case BASE_FORTRESS:
+/* Fortress */
+switch(flag) {
+case BF_NOT_AGGRESSIVE:
+case BF_DEFENSE_BONUS:
+case BF_WATCHTOWER:
+case BF_CLAIM_TERRITORY:
+case BF_NO_STACK_DEATH:
+case BF_DIPLOMAT_DEFENSE:
+ return TRUE;
+
+case BF_REFUEL:
+case BF_NO_HP_LOSS:
+case BF_ATTACK_UNREACHABLE:
+case BF_PARADROP_FROM:
+case BF_LAST:
+ return FALSE;
+}
+break;
+
+ case BASE_AIRBASE:
+/* Airbase */
+switch(flag) {
+case BF_NO_STACK_DEATH:
+case BF_DIPLOMAT_DEFENSE:
+case BF_REFUEL:
+case BF_NO_HP_LOSS:
+case BF_ATTACK_UNREACHABLE:
+case BF_PARADROP_FROM:
+ return TRUE;
+
+case BF_NOT_AGGRESSIVE:
+case BF_DEFENSE_BONUS:
+case BF_WATCHTOWER:
+case BF_CLAIM_TERRITORY:
+case BF_LAST:
+ return FALSE;
+}
+break;
+ }
+
+ return FALSE;
+}
diff -Nurd -X.diff_ignore freeciv/common/base.h freeciv/common/base.h
--- freeciv/common/base.h 1970-01-01 02:00:00.0 +0200
+++ freeciv/common/base.h 2007-01-21 17:45:01.0 +0200
@@ -0,0 +1,39 @@
+/**
+ Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2, or (at your option)
+ any later version.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+***/
+#ifndef FC__BASE_H
+#define FC__BASE_H
+
+#include "fc_types.h"
+
+enum base_type_id { BASE_FORTRESS, BASE_AIRBASE };
+
+typedef enum base_type_id Base_type_id;
+
+enum base_flag_id {
+ BF_NOT_AGGRESSIVE, /* Unit inside are not considered aggressive
+* if base is close to city */
+ BF_DEFENSE_BONUS, /* Base provides defense bonus for units inside */
+ BF_NO_STACK_DEATH, /* Units inside will not die all at once */
+ BF_WATCHTOWER, /* Base can act as watchtower */
+ BF_CLAIM_TERRITORY,/* Base claims tile o
[Freeciv-Dev] (PR#34246) SDL client: pixel border in buildings.png isn't recognized
http://bugs.freeciv.org/Ticket/Display.html?id=34246 > > [dmarks - So 21. Jan 2007, 15:08:55]: > > The recently committed buildings.png has a one pixel border grid, > which the SDL client cannot handle. To reproduce, just open up the > Research window and look at a tech that allows the construction of a > wonder. > > ~Daniel > I guess it's because the [grid_main] part is missing in buildings.spec. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34246) SDL client: pixel border in buildings.png isn't recognized
http://bugs.freeciv.org/Ticket/Display.html?id=34246 > The recently committed buildings.png has a one pixel border grid, which the SDL client cannot handle. To reproduce, just open up the Research window and look at a tech that allows the construction of a wonder. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > [dmarks - So 21. Jan 2007, 13:16:40]: > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > > > > > > > And these two commands? > > > > > > cat Makefile.in | grep SDL_rotozoom > > > cat Makefile.am | grep SDL_rotozoom > > > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile | grep SDL_rotozoom > > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile.in | grep SDL_rotozoom > > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile.am | grep SDL_rotozoom > > SDL_rotozoom.c \ > > SDL_rotozoom.h \ > > > > This looks like autogen.sh didn't work as expected. Does it work when > you delete Makefile and Makefile.in and then run autogen.sh and "make" > again? > > The problem was in my own custom configure script. It compiles with the latest patch, and it might even compile with the previous one (let me know if you want me to try). Sorry about that! Scaling is working and looks better than ever. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > [dmarks - So 21. Jan 2007, 13:16:40]: > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > > > > And these two commands? > > > > cat Makefile.in | grep SDL_rotozoom > > cat Makefile.am | grep SDL_rotozoom > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile | grep SDL_rotozoom > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile.in | grep SDL_rotozoom > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile.am | grep SDL_rotozoom > SDL_rotozoom.c \ > SDL_rotozoom.h \ > This looks like autogen.sh didn't work as expected. Does it work when you delete Makefile and Makefile.in and then run autogen.sh and "make" again? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > And these two commands? > > cat Makefile.in | grep SDL_rotozoom > cat Makefile.am | grep SDL_rotozoom > > ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile | grep SDL_rotozoom ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile.in | grep SDL_rotozoom ibg3:~/freeciv/client/gui-sdl daniel$ cat Makefile.am | grep SDL_rotozoom SDL_rotozoom.c \ SDL_rotozoom.h \ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> [dmarks - So 21. Jan 2007, 12:57:40]:
>
> On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote:
> >
> > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> >
> > > [dmarks - So 21. Jan 2007, 11:56:07]:
> > >
> > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]>
> > > wrote:
> > > >
> > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > >
> > > > > [dmarks - So 21. Jan 2007, 11:12:47]:
> > > > >
> > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]>
> > > wrote:
> > > > > >
> > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > >
> > > > > > > [dmarks - So 21. Jan 2007, 09:51:18]:
> > > > > > >
> > > > > > > On 1/21/07, Christian Prochaska
> > > <[EMAIL PROTECTED]>
> > > > > > > wrote:
> > > > > > > >
> > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > > > >
> > > > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]:
> > > > > > > > >
> > > > > > > > > On 1/21/07, Christian Prochaska
> > > <[EMAIL PROTECTED]>
> > > > > > > wrote:
> > > > > > > > > >
> > > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > > > > > >
> > > > > > > > > > What output do you get when you enter "nm libguiclient.a
> > > | grep
> > > > > > > > > > zoomSurface" in client/gui-sdl?
> > > > > > > > > >
> > > > > > > > > >
> > > > > > > > >
> > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a |
> > > grep
> > > > > > > zoomSurface
> > > > > > > > > nm: no name list
> > > > > > > > > nm: no name list
> > > > > > > > > U _zoomSurface
> > > > > > > > >
> > > > > > > >
> > > > > > > > And "nm SDL_rotozoom.o"?
> > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > > > There no such file in the gui-sdl/ directory.
> > > > > > >
> > > > > >
> > > > > > Did you run autogen.sh after applying the patch?
> > > > > >
> > > > > >
> > > > >
> > > > > Yes I did, but that file is not created.
> > > > >
> > > >
> > > > And when you run "make clean" in gui-sdl before compiling?
> > > >
> > > >
> > >
> > > It didn't make any difference. Isn't it a problem that the ".o" isn't
> > > created?
> > >
> >
> > It's a problem, because the *.o files contain the binary code that gcc
> > generates from the *.c source files. The error message you got ("ld:
> > Undefined symbols: _zoomSurface") means that the binary code of the
> > zoomSurface() function could not be found. It's supposed to be stored in
> > SDL_rotozoom.o, because the source code of the zoomSurface() function is
> > defined in SDL_rotozoom.c. But for some reason SDL_rotozoom.c doesn't
> > seem to get compiled on your machine.
> >
> > What output do you get from "cat Makefile | grep SDL_rotozoom" in the
> > gui-sdl directory?
> >
> >
>
> That gives no output.
>
And these two commands?
cat Makefile.in | grep SDL_rotozoom
cat Makefile.am | grep SDL_rotozoom
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote:
>
> http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
>
> > [dmarks - So 21. Jan 2007, 11:56:07]:
> >
> > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]>
> > wrote:
> > >
> > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > >
> > > > [dmarks - So 21. Jan 2007, 11:12:47]:
> > > >
> > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]>
> > wrote:
> > > > >
> > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > >
> > > > > > [dmarks - So 21. Jan 2007, 09:51:18]:
> > > > > >
> > > > > > On 1/21/07, Christian Prochaska
> > <[EMAIL PROTECTED]>
> > > > > > wrote:
> > > > > > >
> > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > > >
> > > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]:
> > > > > > > >
> > > > > > > > On 1/21/07, Christian Prochaska
> > <[EMAIL PROTECTED]>
> > > > > > wrote:
> > > > > > > > >
> > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > > > > >
> > > > > > > > > What output do you get when you enter "nm libguiclient.a
> > | grep
> > > > > > > > > zoomSurface" in client/gui-sdl?
> > > > > > > > >
> > > > > > > > >
> > > > > > > >
> > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a |
> > grep
> > > > > > zoomSurface
> > > > > > > > nm: no name list
> > > > > > > > nm: no name list
> > > > > > > > U _zoomSurface
> > > > > > > >
> > > > > > >
> > > > > > > And "nm SDL_rotozoom.o"?
> > > > > > >
> > > > > > >
> > > > > >
> > > > > > There no such file in the gui-sdl/ directory.
> > > > > >
> > > > >
> > > > > Did you run autogen.sh after applying the patch?
> > > > >
> > > > >
> > > >
> > > > Yes I did, but that file is not created.
> > > >
> > >
> > > And when you run "make clean" in gui-sdl before compiling?
> > >
> > >
> >
> > It didn't make any difference. Isn't it a problem that the ".o" isn't
> > created?
> >
>
> It's a problem, because the *.o files contain the binary code that gcc
> generates from the *.c source files. The error message you got ("ld:
> Undefined symbols: _zoomSurface") means that the binary code of the
> zoomSurface() function could not be found. It's supposed to be stored in
> SDL_rotozoom.o, because the source code of the zoomSurface() function is
> defined in SDL_rotozoom.c. But for some reason SDL_rotozoom.c doesn't
> seem to get compiled on your machine.
>
> What output do you get from "cat Makefile | grep SDL_rotozoom" in the
> gui-sdl directory?
>
>
That gives no output.
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> [dmarks - So 21. Jan 2007, 11:56:07]:
>
> On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]>
> wrote:
> >
> > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> >
> > > [dmarks - So 21. Jan 2007, 11:12:47]:
> > >
> > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]>
> wrote:
> > > >
> > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > >
> > > > > [dmarks - So 21. Jan 2007, 09:51:18]:
> > > > >
> > > > > On 1/21/07, Christian Prochaska
> <[EMAIL PROTECTED]>
> > > > > wrote:
> > > > > >
> > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > >
> > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]:
> > > > > > >
> > > > > > > On 1/21/07, Christian Prochaska
> <[EMAIL PROTECTED]>
> > > > > wrote:
> > > > > > > >
> > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 >
> > > > > > > >
> > > > > > > > What output do you get when you enter "nm libguiclient.a
> | grep
> > > > > > > > zoomSurface" in client/gui-sdl?
> > > > > > > >
> > > > > > > >
> > > > > > >
> > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a |
> grep
> > > > > zoomSurface
> > > > > > > nm: no name list
> > > > > > > nm: no name list
> > > > > > > U _zoomSurface
> > > > > > >
> > > > > >
> > > > > > And "nm SDL_rotozoom.o"?
> > > > > >
> > > > > >
> > > > >
> > > > > There no such file in the gui-sdl/ directory.
> > > > >
> > > >
> > > > Did you run autogen.sh after applying the patch?
> > > >
> > > >
> > >
> > > Yes I did, but that file is not created.
> > >
> >
> > And when you run "make clean" in gui-sdl before compiling?
> >
> >
>
> It didn't make any difference. Isn't it a problem that the ".o" isn't
> created?
>
It's a problem, because the *.o files contain the binary code that gcc
generates from the *.c source files. The error message you got ("ld:
Undefined symbols: _zoomSurface") means that the binary code of the
zoomSurface() function could not be found. It's supposed to be stored in
SDL_rotozoom.o, because the source code of the zoomSurface() function is
defined in SDL_rotozoom.c. But for some reason SDL_rotozoom.c doesn't
seem to get compiled on your machine.
What output do you get from "cat Makefile | grep SDL_rotozoom" in the
gui-sdl directory?
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > [dmarks - So 21. Jan 2007, 11:12:47]: > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > [dmarks - So 21. Jan 2007, 09:51:18]: > > > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > > > wrote: > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]: > > > > > > > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > > > wrote: > > > > > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > > > > > What output do you get when you enter "nm libguiclient.a | grep > > > > > > > zoomSurface" in client/gui-sdl? > > > > > > > > > > > > > > > > > > > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep > > > > zoomSurface > > > > > > nm: no name list > > > > > > nm: no name list > > > > > > U _zoomSurface > > > > > > > > > > > > > > > > And "nm SDL_rotozoom.o"? > > > > > > > > > > > > > > > > > > There no such file in the gui-sdl/ directory. > > > > > > > > > > Did you run autogen.sh after applying the patch? > > > > > > > > > > Yes I did, but that file is not created. > > > > And when you run "make clean" in gui-sdl before compiling? > > It didn't make any difference. Isn't it a problem that the ".o" isn't created? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34229) expand the tutorial
http://bugs.freeciv.org/Ticket/Display.html?id=34229 > The tutorial is good as long as it lasts. However, it leaves off quite prematurely. It fails to teach for example the basics of diplomacy and warfare, as well how to change government. It also should teach how to research seafaring, explore the seas to locate your opponent's island and finally build an invasion fleet. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#33445) win32 client build broken (patch attached)
http://bugs.freeciv.org/Ticket/Display.html?id=33445 > On 1/21/07, [EMAIL PROTECTED] <[EMAIL PROTECTED]> wrote: > > Except for cs.po, the win32 client build was ok. Thanks for testing. I have now committed move_type and worklist patches. > There were a few > warnings from gcc about things that probably should be cleaned up at > some point, but I don't think they have anything to do with Marko's > patches or the patch I originally wrote. Patches to fix these welcome. Please open separate bugtracking ticket for each issue. You can do that by sending email to [EMAIL PROTECTED] so that subject does not contain any PR# number. > Finally, the nation selection window doesn't display the nation groups > properly. The group names are displayed oddly, ( > "?nationgroup:Ancient" for example ) and only the All group actually > has any nations in it. The rest are empty. Patches welcome. Are these bugs present in S2_1 also? - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34129) gui-sdl compile problem: round()
http://bugs.freeciv.org/Ticket/Display.html?id=34129 > > [EMAIL PROTECTED] - So 21. Jan 2007, 11:11:03]: > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > wrote: > > > > > [EMAIL PROTECTED] - Sa 20. Jan 2007, 13:33:05]: > > > > > > 'man round' says "Compile with -std=c99; link with -lm." But when > I > > > try to set '-std=c99', log.c no longer compiles. > > > > > > > What's the error message? And how does the compiler command look > like? > > Here it reads: > > > > if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl -Wall -Wpointer-arith > > -Wcast-align -Wmissing-prototypes -Wmissing-declarations > > -DLOCALEDIR="\"/usr/local/share/locale\"" > > -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" > > -std=c99 -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes > > -Wmissing-declarations -I/usr/include/SDL -D_GNU_SOURCE=1 > -D_REENTRANT > > -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o log.o > log.c; \ > > then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f > ".deps/log.Tpo"; > > exit 1; fi > > if gcc -DHAVE_CONFIG_H -I. -I../../src.patched/utility -I.. -I../intl > -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes > -Wmissing-declarations -DLOCALEDIR="\"/usr/local/share/locale\"" > -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" > -std=c99 -Werror -Wall -Wpointer-arith -Wcast-align > -Wmissing-prototypes -Wmissing-declarations -I/usr/include/SDL > -D_REENTRANT -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o > log.o ../../src.patched/utility/log.c; \ > then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f > ".deps/log.Tpo"; exit 1; fi > cc1: warnings being treated as errors > ../../src.patched/utility/log.c: In function 'log_init': > ../../src.patched/utility/log.c:186: warning: implicit declaration of > function 'strdup' > ../../src.patched/utility/log.c:186: warning: assignment makes pointer > from integer without a cast > make[3]: *** [log.o] Error 1 > > > - ML > Does it work when you add "-D_GNU_SOURCE=1" to the CFLAGS? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > [dmarks - So 21. Jan 2007, 11:12:47]: > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > [dmarks - So 21. Jan 2007, 09:51:18]: > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > > wrote: > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]: > > > > > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > > wrote: > > > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > > > What output do you get when you enter "nm libguiclient.a | grep > > > > > > zoomSurface" in client/gui-sdl? > > > > > > > > > > > > > > > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep > > > zoomSurface > > > > > nm: no name list > > > > > nm: no name list > > > > > U _zoomSurface > > > > > > > > > > > > > And "nm SDL_rotozoom.o"? > > > > > > > > > > > > > > There no such file in the gui-sdl/ directory. > > > > > > > Did you run autogen.sh after applying the patch? > > > > > > Yes I did, but that file is not created. > And when you run "make clean" in gui-sdl before compiling? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > [dmarks - So 21. Jan 2007, 09:51:18]: > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > wrote: > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]: > > > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > wrote: > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > What output do you get when you enter "nm libguiclient.a | grep > > > > > zoomSurface" in client/gui-sdl? > > > > > > > > > > > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep > > zoomSurface > > > > nm: no name list > > > > nm: no name list > > > > U _zoomSurface > > > > > > > > > > And "nm SDL_rotozoom.o"? > > > > > > > > > > There no such file in the gui-sdl/ directory. > > > > Did you run autogen.sh after applying the patch? > > Yes I did, but that file is not created. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#34129) gui-sdl compile problem: round()
http://bugs.freeciv.org/Ticket/Display.html?id=34129 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > [EMAIL PROTECTED] - Sa 20. Jan 2007, 13:33:05]: > > > > 'man round' says "Compile with -std=c99; link with -lm." But when I > > try to set '-std=c99', log.c no longer compiles. > > > > What's the error message? And how does the compiler command look like? > Here it reads: > > if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl -Wall -Wpointer-arith > -Wcast-align -Wmissing-prototypes -Wmissing-declarations > -DLOCALEDIR="\"/usr/local/share/locale\"" > -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" > -std=c99 -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes > -Wmissing-declarations -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT > -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o log.o log.c; \ > then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f ".deps/log.Tpo"; > exit 1; fi if gcc -DHAVE_CONFIG_H -I. -I../../src.patched/utility -I.. -I../intl -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -DLOCALEDIR="\"/usr/local/share/locale\"" -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" -std=c99 -Werror -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -I/usr/include/SDL -D_REENTRANT -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o log.o ../../src.patched/utility/log.c; \ then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f ".deps/log.Tpo"; exit 1; fi cc1: warnings being treated as errors ../../src.patched/utility/log.c: In function 'log_init': ../../src.patched/utility/log.c:186: warning: implicit declaration of function 'strdup' ../../src.patched/utility/log.c:186: warning: assignment makes pointer from integer without a cast make[3]: *** [log.o] Error 1 - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34228) tutorial: no message on city growth size 5
http://bugs.freeciv.org/Ticket/Display.html?id=34228 > Running the tutorial (in beta2/windows build): The message for growth to size 3 works fine, but nothing happens for size 5. I didn't try further growth. A quick look at the Lua code doesn't reveal any obvious bugs. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#34111) [Bug] Barbarian players share nation
http://bugs.freeciv.org/Ticket/Display.html?id=34111 >
On 1/20/07, Marko Lindqvist <[EMAIL PROTECTED]> wrote:
> For S2_1 adding ruleset for another barbarian nation is sufficient,
> but in trunk code should be changed so that it doesn't even accept
> same nation for both barbarian players.
Here is untested code patch for trunk. Ruleset changes need to go in
before this.
pick_a_nation() is modified so that it can handle barbarian players.
Special pick_barbarian_nation() is removed.
This does not only mean that no longer is same nation accepted for
both barbarian players. pick_a_nation() has more features that
pick_barbarian_nation() lacked. For instance, pick_barbarian_nation()
always took first available barbarian nation, pick_a_nation() will get
random nation if there is more than needed.
- ML
diff -Nurd -X.diff_ignore freeciv/server/barbarian.c freeciv/server/barbarian.c
--- freeciv/server/barbarian.c 2006-07-17 23:56:22.0 +0300
+++ freeciv/server/barbarian.c 2007-01-21 12:01:31.0 +0200
@@ -81,30 +81,6 @@
return (pplayer->ai.barbarian_type == SEA_BARBARIAN);
}
-/
- Return an available barbarian nation. This simply returns the first
- available nation, or the first nation already in use by another barbarian
- player.
-/
-struct nation_type *pick_barbarian_nation(void)
-{
- nations_iterate(pnation) {
-if (is_nation_barbarian(pnation) && !pnation->player) {
- return pnation;
-}
- } nations_iterate_end;
-
- players_iterate(pplayer) {
-if (is_barbarian(pplayer)) {
- assert(is_nation_barbarian(pplayer->nation));
- return pplayer->nation;
-}
- } players_iterate_end;
-
- assert(0);
- return NO_NATION_SELECTED;
-}
-
/**
Creates the land/sea barbarian player and inits some stuff. If
barbarian player already exists, return player pointer. If barbarians
@@ -112,15 +88,17 @@
Dead barbarians forget the map and lose the money.
**/
-static struct player *create_barbarian_player(bool land)
+static struct player *create_barbarian_player(enum barbarian_type type)
{
int newplayer = game.info.nplayers;
struct player *barbarians;
- struct nation_type *nation = pick_barbarian_nation();
+ struct nation_type *nation;
+
+ nation = pick_a_nation(NULL, FALSE, TRUE, type);
players_iterate(barbarians) {
-if ((land && is_land_barbarian(barbarians))
-|| (!land && is_sea_barbarian(barbarians))) {
+if ((type == LAND_BARBARIAN && is_land_barbarian(barbarians))
+|| (type == SEA_BARBARIAN && is_sea_barbarian(barbarians))) {
if (!barbarians->is_alive) {
barbarians->economic.gold = 0;
barbarians->is_alive = TRUE;
@@ -165,11 +143,7 @@
/* Do the ai */
barbarians->ai.control = TRUE;
- if (land) {
-barbarians->ai.barbarian_type = LAND_BARBARIAN;
- } else {
-barbarians->ai.barbarian_type = SEA_BARBARIAN;
- }
+ barbarians->ai.barbarian_type = type;
set_ai_level_directer(barbarians, game.info.skill_level);
init_tech(barbarians);
give_initial_techs(barbarians);
@@ -239,7 +213,7 @@
return FALSE;
}
- barbarians = create_barbarian_player(TRUE);
+ barbarians = create_barbarian_player(LAND_BARBARIAN);
if (!barbarians) {
return FALSE;
}
@@ -426,7 +400,7 @@
int rand_factor = myrand(3);
/* land (disembark) barbarians */
-barbarians = create_barbarian_player(TRUE);
+barbarians = create_barbarian_player(LAND_BARBARIAN);
if (city_list_size(victim->cities) > UPRISE_CIV_MOST) {
uprise = 3;
}
@@ -443,7 +417,7 @@
struct unit *ptrans;
struct unit_type *boat;
-barbarians = create_barbarian_player(FALSE);
+barbarians = create_barbarian_player(SEA_BARBARIAN);
boat = find_a_unit_type(L_BARBARIAN_BOAT,-1);
ptrans = create_unit(barbarians, utile, boat, 0, 0, -1);
cap = get_transporter_capacity(unit_list_get(utile->units, 0));
diff -Nurd -X.diff_ignore freeciv/server/barbarian.h freeciv/server/barbarian.h
--- freeciv/server/barbarian.h 2006-07-17 23:56:22.0 +0300
+++ freeciv/server/barbarian.h 2007-01-21 11:55:40.0 +0200
@@ -27,7 +27,6 @@
#define MAP_FACTOR 2000 /* adjust this to get a good uprising frequency */
-struct nation_type *pick_barbarian_nation(void);
bool unleash_barbarians(struct tile *ptile);
void summon_barbarians(void);
bool is_land_barbarian(struct player *pplayer);
diff -Nurd -X.diff_ignore freeciv/server/plrhand.c freeciv/server/plrhand.c
--- freeciv/server/plrhand.c 2006-07-21 23:18:07.0 +0300
+++ freeciv/server/plrhand.c 2007-01-21 12:02:52.0 +0200
@@ -1346,7 +1346,8 @@
[Freeciv-Dev] (PR#34129) gui-sdl compile problem: round()
http://bugs.freeciv.org/Ticket/Display.html?id=34129 > > [EMAIL PROTECTED] - Sa 20. Jan 2007, 13:33:05]: > > On 1/20/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > it needs > > __USE_ISOC99 to be defined which is the case when _GNU_SOURCE is defined > > . Perhaps a compiler problem? > > 'man round' says "Compile with -std=c99; link with -lm." But when I > try to set '-std=c99', log.c no longer compiles. > > > - ML > What's the error message? And how does the compiler command look like? Here it reads: if gcc -DHAVE_CONFIG_H -I. -I. -I.. -I../intl -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -DLOCALEDIR="\"/usr/local/share/locale\"" -DDEFAULT_DATA_PATH="\".:data:~/.freeciv:/usr/local/share/freeciv\"" -std=c99 -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -fsigned-char -MT log.o -MD -MP -MF ".deps/log.Tpo" -c -o log.o log.c; \ then mv -f ".deps/log.Tpo" ".deps/log.Po"; else rm -f ".deps/log.Tpo"; exit 1; fi and everything compiles fine. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > [dmarks - So 21. Jan 2007, 09:51:18]: > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > wrote: > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > [dmarks - So 21. Jan 2007, 09:31:09]: > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > wrote: > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > What output do you get when you enter "nm libguiclient.a | grep > > > > zoomSurface" in client/gui-sdl? > > > > > > > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep > zoomSurface > > > nm: no name list > > > nm: no name list > > > U _zoomSurface > > > > > > > And "nm SDL_rotozoom.o"? > > > > > > There no such file in the gui-sdl/ directory. > Did you run autogen.sh after applying the patch? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > [dmarks - So 21. Jan 2007, 09:31:09]: > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > What output do you get when you enter "nm libguiclient.a | grep > > > zoomSurface" in client/gui-sdl? > > > > > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep zoomSurface > > nm: no name list > > nm: no name list > > U _zoomSurface > > > > And "nm SDL_rotozoom.o"? > > There no such file in the gui-sdl/ directory. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#34224) Memory loss in ai diplomacy
http://bugs.freeciv.org/Ticket/Display.html?id=34224 > Form valgrind: ==3480== 1,036 (396 direct, 640 indirect) bytes in 35 blocks are definitely lost in loss record 2 of 6 ==3480==at 0x401C422: malloc (vg_replace_malloc.c:149) ==3480==by 0x804BD0D: fc_real_malloc (mem.c:82) ==3480==by 0x8072F52: handle_diplomacy_init_meeting_req (diplhand.c:690) ==3480==by 0x81131F7: ai_diplomacy_suggest (advdiplomacy.c:789) ==3480==by 0x8114F2C: ai_diplomacy_actions (advdiplomacy.c:1547) ==3480==by 0x8052EBE: main_loop (srv_main.c:662) ==3480==by 0x80533E3: srv_main (srv_main.c:1993) ==3480==by 0x804A63B: main (civserver.c:256) - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > [dmarks - So 21. Jan 2007, 09:31:09]: > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > [dmarks - So 21. Jan 2007, 06:05:37]: > > > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > > wrote: > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > [dmarks - Sa 20. Jan 2007, 23:45:51]: > > > > > > > > > > On 1/20/07, Christian Prochaska <[EMAIL PROTECTED]> > > > wrote: > > > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > > > > > > > > > Does it work with the attached patch? It adds two new source > > > files, so > > > > > > you need to rerun autogen.sh before compiling. > > > > > > > > > > > > > > > > It doesn't seem to be working fully. Scaled flags and buildings > > > aren't > > > > > showing up. > > > > > > > > > > ~Daniel > > > > > > > > > > > > > And with this patch? > > > > > > > > > > > > > > Make fails with this: > > > > > > > > > > What output do you get when you enter "nm libguiclient.a | grep > > zoomSurface" in client/gui-sdl? > > > > > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep zoomSurface > nm: no name list > nm: no name list > U _zoomSurface > And "nm SDL_rotozoom.o"? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Re: (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > [dmarks - So 21. Jan 2007, 06:05:37]: > > > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > > wrote: > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > [dmarks - Sa 20. Jan 2007, 23:45:51]: > > > > > > > > On 1/20/07, Christian Prochaska <[EMAIL PROTECTED]> > > wrote: > > > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > > > > > > Does it work with the attached patch? It adds two new source > > files, so > > > > > you need to rerun autogen.sh before compiling. > > > > > > > > > > > > > It doesn't seem to be working fully. Scaled flags and buildings > > aren't > > > > showing up. > > > > > > > > ~Daniel > > > > > > > > > > And with this patch? > > > > > > > > > > Make fails with this: > > > > > > What output do you get when you enter "nm libguiclient.a | grep > zoomSurface" in client/gui-sdl? > > ibg3:~/freeciv/client/gui-sdl daniel$ nm libguiclient.a | grep zoomSurface nm: no name list nm: no name list U _zoomSurface ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#29557) segfault with SDL client on Mac OS X
http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > [dmarks - So 21. Jan 2007, 06:05:37]: > > On 1/21/07, Christian Prochaska <[EMAIL PROTECTED]> > wrote: > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > [dmarks - Sa 20. Jan 2007, 23:45:51]: > > > > > > On 1/20/07, Christian Prochaska <[EMAIL PROTECTED]> > wrote: > > > > > > > > http://bugs.freeciv.org/Ticket/Display.html?id=29557 > > > > > > > > > > > > > Does it work with the attached patch? It adds two new source > files, so > > > > you need to rerun autogen.sh before compiling. > > > > > > > > > > It doesn't seem to be working fully. Scaled flags and buildings > aren't > > > showing up. > > > > > > ~Daniel > > > > > > > And with this patch? > > > > > > Make fails with this: > > What output do you get when you enter "nm libguiclient.a | grep zoomSurface" in client/gui-sdl? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#18430) Pirate nation
http://bugs.freeciv.org/Ticket/Display.html?id=18430 > On 1/20/07, Daniel Markstedt <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=18430 > > > In the case we need a separate flag, there are some concepts at: > http://commons.wikimedia.org/wiki/Category:Pirate_flags > > We could either have a red variant like: > http://commons.wikimedia.org/wiki/Image:Flag_of_Henry_Every_red.svg > > Or a black one with a different emblem like: > http://commons.wikimedia.org/wiki/Image:Pirate_Flag_of_Thomas_Tew.svg > > > ~Daniel > I prefer the latter. It has the same color scheme as the other barbarian flag, so it should be obvious to players that they're dealing with barbarians. PD from OpenClipart. Credits to Tobias Jakobs. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
