[Freeciv-Dev] (PR#39705) [gui-sdl] support for right-to-left writing systems

2007-09-14 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39705 

As mentioned elsewhere, gui-sdl should have support for right-to-left
writing systems. Font support was recently added, but letters appear
in the wrong direction. Currently needed for Arabic, Hebrew, and
Farsi/Iranian.

 ~Daniel



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


[Freeciv-Dev] (PR#39706) [Patch] Remove included gettext from include paths

2007-09-14 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39706 

 $subject

 For S2_2 and trunk.

 Ready for commit.


 - ML

diff -Nurd -X.diff_ignore freeciv/ai/Makefile.am freeciv/ai/Makefile.am
--- freeciv/ai/Makefile.am	2007-08-04 18:38:34.0 +0300
+++ freeciv/ai/Makefile.am	2007-09-14 20:18:15.0 +0300
@@ -2,9 +2,7 @@
 
 noinst_LIBRARIES = libcivai.a
 
-AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server -I../intl -I$(top_srcdir)/common/aicore
-
-## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate.
+AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server -I$(top_srcdir)/common/aicore
 
 libcivai_a_SOURCES = \
 		advdomestic.c	\
diff -Nurd -X.diff_ignore freeciv/client/agents/Makefile.am freeciv/client/agents/Makefile.am
--- freeciv/client/agents/Makefile.am	2007-08-04 18:38:37.0 +0300
+++ freeciv/client/agents/Makefile.am	2007-09-14 20:17:15.0 +0300
@@ -2,7 +2,7 @@
 
 noinst_LIBRARIES = libagents.a
 
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS)
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS)
 
 libagents_a_SOURCES = 		\
 	agents.c		\
diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/Makefile.am freeciv/client/gui-ftwl/Makefile.am
--- freeciv/client/gui-ftwl/Makefile.am	2007-08-04 18:39:05.0 +0300
+++ freeciv/client/gui-ftwl/Makefile.am	2007-09-14 20:16:03.0 +0300
@@ -3,9 +3,7 @@
 SUBDIRS = 
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include -I../../intl $(CLIENT_CFLAGS)
-
-## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
+AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include $(CLIENT_CFLAGS)
 
 libguiclient_a_SOURCES = \
 	canvas.c	\
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/Makefile.am freeciv/client/gui-gtk-2.0/Makefile.am
--- freeciv/client/gui-gtk-2.0/Makefile.am	2007-08-09 21:49:47.0 +0300
+++ freeciv/client/gui-gtk-2.0/Makefile.am	2007-09-14 20:16:39.0 +0300
@@ -1,9 +1,8 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS) $(GGZ_GTK_INCLUDES)
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/../agents $(CLIENT_CFLAGS) $(GGZ_GTK_INCLUDES)
 
-## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
 # The AM_CPPFLAGS -I. is so resources.c includes the locally generated 
 # Freeciv.h in the builddir, in preference to the one 
 # in the source dir (when compiling from another dir). --dwp
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/Makefile.am freeciv/client/gui-sdl/Makefile.am
--- freeciv/client/gui-sdl/Makefile.am	2007-08-04 18:39:04.0 +0300
+++ freeciv/client/gui-sdl/Makefile.am	2007-09-14 20:15:49.0 +0300
@@ -2,9 +2,7 @@
 
 noinst_LIBRARIES = libguiclient.a
 
-AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS)
-
-## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate.
+AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/../agents $(CLIENT_CFLAGS)
 
 libguiclient_a_SOURCES = \
 	SDL_rotozoom.c	\
diff -Nurd -X.diff_ignore freeciv/client/gui-stub/Makefile.am freeciv/client/gui-stub/Makefile.am
--- freeciv/client/gui-stub/Makefile.am	2007-08-04 18:39:12.0 +0300
+++ freeciv/client/gui-stub/Makefile.am	2007-09-14 20:17:53.0 +0300
@@ -1,9 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 noinst_LIBRARIES = libguiclient.a
-AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl $(CLIENT_CFLAGS)
-
-## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate.
+AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common $(CLIENT_CFLAGS)
 
 libguiclient_a_SOURCES = \
 	canvas.c	\
diff -Nurd -X.diff_ignore freeciv/client/gui-win32/Makefile.am freeciv/client/gui-win32/Makefile.am
--- freeciv/client/gui-win32/Makefile.am	2007-08-04 18:38:53.0 +0300
+++ 

Re: [Freeciv-Dev] (PR#7294) Proposal: Reducing the bribe-power of Diplomats

2007-09-14 Thread Christian Knoke

URL: http://bugs.freeciv.org/Ticket/Display.html?id=7294 


Hello,

 On Tue, 11 Sep 2007, Per I. Mathisen wrote:
  Ok, Spy, then.

You want to remove most capabilities of spy/diplo for the sake of
better game play.

I wonder if you can.

You're right that bribing, inciting, stealing techs and sabotage are
kind of unbalanced, and sometimes buggy.

I think this is so because the two game ideas of Freeciv, developing
and fighting, are unbalanced in itself, contradictory so to say.

The diplo is the most interesting figure of the game, because it stands
between these two ideas. It connects them.

You can remove the diplo, and you should be consequent then and do it
completely. The game is simpler then. But better? I heavily doubt that.

You're right when to rethink diplomats, their capabilities, the
balancing and the popups. But then lets improve it - not remove.
Making it more fair and transparent.

 The changes:
   * As discussed, new unique Spy unit can bribe units for free, and destroy 
 all defensive buildings in a city, by sacrificing itself. Available with 
 Writing.

This makes her absolutely powerful in an early game phase.

 The other rulesets not changed, and... well, let's face it, this is not 
 exactly civ1/2 compatible.

And this is ok. But how its done I would like to see more ideas.

Christian


btw, Tech stealing is implemented in another way too, in conquering
cities.

   - Per
 
 Carpe noctem

:)


-- 
Christian Knoke* * *http://cknoke.de
* * * * * * * * *  Ceterum censeo Microsoft esse dividendum.



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


Re: [Freeciv-Dev] (PR#39693) [Patch] Unit info label for impossible goto

2007-09-14 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39693 

On 10/09/2007, William Allen Simpson wrote:

 I used the existing infinity and existing Turns to target: %d, just to
 avoid making new translations.  If that's not acceptable, and it's OK to
 add a new translation, then Unreachable would be fine there.

 - Above fixed
 - Made Unreachable qualified string since there is also unit class
flag Unreachable
 - S2_1 version fixes also separate gui-sdl implementation. For S2_2
and trunk #39694 will take care of this too


 - ML

diff -Nurd -X.diff_ignore freeciv/client/text.c freeciv/client/text.c
--- freeciv/client/text.c	2007-08-25 15:28:38.0 +0300
+++ freeciv/client/text.c	2007-09-14 21:10:39.0 +0300
@@ -700,7 +700,8 @@
 int min, max;
 
 if (!goto_get_turns(min, max)) {
-  astr_add_line(str, _(Turns to target: %d), min);
+  /* TRANS: Impossible to reach goto target tile */
+  astr_add_line(str, Q_(?goto:Unreachable));
 } else if (min == max) {
   astr_add_line(str, _(Turns to target: %d), max);
 } else {
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/mapview.c freeciv/client/gui-sdl/mapview.c
--- freeciv/client/gui-sdl/mapview.c	2007-08-25 15:16:07.0 +0300
+++ freeciv/client/gui-sdl/mapview.c	2007-09-14 21:09:49.0 +0300
@@ -554,7 +554,8 @@
 int min, max;
 
 if (!goto_get_turns(min, max)) {
-  astr_add_line(str, _(Turns to target: %d), min);
+  /* TRANS: Impossible to reach goto target tile */
+  astr_add_line(str, Q_(?goto:Unreachable), min);
 } else if (min == max) {
   astr_add_line(str, _(Turns to target: %d), max);
 } else {
diff -Nurd -X.diff_ignore freeciv/client/text.c freeciv/client/text.c
--- freeciv/client/text.c	2007-08-25 15:16:07.0 +0300
+++ freeciv/client/text.c	2007-09-14 21:10:06.0 +0300
@@ -686,7 +686,8 @@
 int min, max;
 
 if (!goto_get_turns(min, max)) {
-  astr_add_line(str, _(Turns to target: %d), min);
+  /* TRANS: Impossible to reach goto target tile */
+  astr_add_line(str, Q_(?goto:Unreachable));
 } else if (min == max) {
   astr_add_line(str, _(Turns to target: %d), max);
 } else {
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


[Freeciv-Dev] (PR#39707) [Patch] Remove duplicate player-nation zeroing

2007-09-14 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39707 

 Seems that trunk already had proper player-nation zeroing before
S2_1 bugfix was ported.

 To be committed to S2_2 and trunk.


 - ML

diff -Nurd -X.diff_ignore freeciv/client/packhand.c freeciv/client/packhand.c
--- freeciv/client/packhand.c	2007-09-14 15:13:54.0 +0300
+++ freeciv/client/packhand.c	2007-09-14 21:49:05.0 +0300
@@ -2218,12 +2218,6 @@
   nations_alloc(game.control.nation_count);
   city_styles_alloc(game.control.styles_count);
 
-  /* We are in inconsistent state. Players point to nations,
-   * which do not point to players. Fix */
-  for (i = 0; i  MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS; i++) {
-game.players[i].nation = NULL;
-  }
-
   /* After nation ruleset free/alloc, nation-player pointers are NULL.
* We have to initialize player-nation too, to keep state consistent. */ 
   players_iterate(pplayer) {
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39643) [Bug] Internal server exits silently for ruleset errors

2007-09-14 Thread Marko Lindqvist

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39643 

On 31/08/2007, Marko Lindqvist  wrote:

  I have always hated how ruleset loading code just exit() for any
 error in ruleset

 ...

  - If internally server quits like that, no explanation is provided
 for user (client)

 ...

  S2_1 solution might be just to send chat message to all clients
 before final exit().

 Here are patches to send that chat message.

 Not that user is likely to notice it. gtk -client goes back to main
menu immediately when server dies closing chat -window. Maybe new kind
of event - which has popups enabled by default - should be used for
this.


 - ML



RulesetError_39643_TRUNK.diff.bz2
Description: BZip2 compressed data


RulesetError_39643.diff.bz2
Description: BZip2 compressed data
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev


Re: [Freeciv-Dev] (PR#39708) Issues with freeciv beta SDL on Win 98

2007-09-14 Thread Daniel Markstedt

URL: http://bugs.freeciv.org/Ticket/Display.html?id=39708 

On 9/15/07, David Nuttall [EMAIL PROTECTED] wrote:

 URL: http://bugs.freeciv.org/Ticket/Display.html?id=39708 

 Issues with FreeCiv SDL Client 2.1.0 beta 6

 (...)

 - During play
   - How do you engage chat/server communication while playing in the client?

Press 'Tab' to bring up the chatline.

   - How do you save the game while playing in the client, other than 
 auto-save?

From the chatline, enter /save .

   - How do you show the Civlopedia while playing in the client?  I have only
 found the HTML manual pages in the directory, but that does not interact with
 the program.

Middle-click on a tech in the tech dialog or unit or building in the
production dialog. From there you can browse the civilopedia.

 (...)

I agree with your other points. Someone has to code these features, though.

 ~Daniel



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