Re: [Freeciv-Dev] Re: (PR#38552) resolution
URL: http://bugs.freeciv.org/Ticket/Display.html?id=38552 Daniel Markstedt wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=38552 On 3/26/07, Christopher Spiewak [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=38552 (...) I just tried re-downloading it and it works now. Although when I want full screen I had to cheek the full screen, and then hit the 1280 by 800. Is it posible to make it so that when you turn on full screen that it auto fills to an ok resolution and then you can choose what resolution you want? Christopher I agree that the current UI solution is unintuitive. When you learn it, however, it's convenient. I would personally be annoyed if the SDL client autodefaulted to some random resolution. So I thought, by putting a small helptext between the checkbox and the resolution buttons, could we keep it the way it is. The helptext could say something like For fullscreen mode, first select this checkbox, then click on a resolution button below. Alternatively, how about having two columns of resolution buttons; one for windowed and one for fullscreen resolutions? ~Daniel I think that the two columns would be a great idea. Currently the SDL feels like it needs a little bit of work. Which makes me wish that I know how to program even more. Well thank you guys once again and keep all this awesome coding. Christopher ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
RE: [Freeciv-Dev] (no subject)
I did not use --with-included-gettext. I tried with gettext 0.14.5 and gettext 0.16. However, configure decided that I ought to use the included gettext instead. It looks like the gettext from the GTK+ for Windows site doesnt define '_nl_msg_cat_cntr', which is what configure uses to determine if the gettext is the GNU version or not. Here's a bit from the configure.log. configure:7683: checking for GNU gettext in libc configure:7707: gcc -o conftest.exe -g -O2 conftest.c -liconv 5 C:/DOCUME~1/cnash/LOCALS~1/Temp/ccCybaaa.o: In function `main':c:/chris/freeciv/configure:7752: undefined reference to `_imp__libintl_bindtextdomain' :c:/chris/freeciv/configure:7753: undefined reference to `_imp__libintl_gettext' :c:/chris/freeciv/configure:7753: undefined reference to `_imp__libintl_ngettext' :c:/chris/freeciv/configure:7753: undefined reference to `_nl_msg_cat_cntr' collect2: ld returned 1 exit status configure:7710: $? = 1 configure: failed program was: ... configure:7727: result: no configure:7731: checking for GNU gettext in libintl configure:7757: gcc -o conftest.exe -g -O2 conftest.c -liconv -lintl -liconv 5 C:/DOCUME~1/cnash/LOCALS~1/Temp/cceObaaa.o: In function `main':c:/chris/freeciv/configure:7803: undefined reference to `_nl_msg_cat_cntr' collect2: ld returned 1 exit status configure:7760: $? = 1 configure: failed program was: ... configure:7778: result: no Perhaps I should try again with a different gettext. Original Message Subject: Re: [Freeciv-Dev] (no subject) From: Jason Short [EMAIL PROTECTED] Date: Fri, March 23, 2007 7:34 pm To: [EMAIL PROTECTED] Cc: freeciv-dev@gna.org [EMAIL PROTECTED] wrote: Hello. I just joined this list, and I did a quick skim thruogh the last few months archives. Please forgive me if I'm bringing up stuff thats already been dealth with. I've been trying to build freeciv under windows using MinGW/MSys for the past week or so. I had success doing this a couple years ago, but I hadn't played with it since. I ran into problems when it tried to link civserver.exe. If I ran autogen.sh normally, and then make I got this at the link step for civserver: The win32 client IS basically unmaintained. However your problem is in the bootstrap, nothing to do with client issues. What are you passing to freeciv on the configure (or autogen) line? It sounds like you are using --with-included-gettext. Do not do this. (The included gettext should be scrapped but it is very tedious to figure out what can safely be gotten rid of and what can't.) -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (no subject)
On 3/27/07, [EMAIL PROTECTED] [EMAIL PROTECTED] wrote: I did not use --with-included-gettext. I tried with gettext 0.14.5 and gettext 0.16. However, configure decided that I ought to use the included gettext instead. It looks like the gettext from the GTK+ for Windows site doesnt define '_nl_msg_cat_cntr', which is what configure uses to determine if the gettext is the GNU version or not. Here's a bit from the configure.log. configure:7683: checking for GNU gettext in libc configure:7707: gcc -o conftest.exe -g -O2 conftest.c -liconv 5 C:/DOCUME~1/cnash/LOCALS~1/Temp/ccCybaaa.o: In function `main':c:/chris/freeciv/configure:7752: undefined reference to `_imp__libintl_bindtextdomain' :c:/chris/freeciv/configure:7753: undefined reference to `_imp__libintl_gettext' :c:/chris/freeciv/configure:7753: undefined reference to `_imp__libintl_ngettext' :c:/chris/freeciv/configure:7753: undefined reference to `_nl_msg_cat_cntr' collect2: ld returned 1 exit status configure:7710: $? = 1 configure: failed program was: ... configure:7727: result: no configure:7731: checking for GNU gettext in libintl configure:7757: gcc -o conftest.exe -g -O2 conftest.c -liconv -lintl -liconv 5 C:/DOCUME~1/cnash/LOCALS~1/Temp/cceObaaa.o: In function `main':c:/chris/freeciv/configure:7803: undefined reference to `_nl_msg_cat_cntr' collect2: ld returned 1 exit status configure:7760: $? = 1 configure: failed program was: ... configure:7778: result: no Perhaps I should try again with a different gettext. I'm always applying the attached patch to work around this problem when building the Windows packages. Index: m4/gettext.m4 === --- m4/gettext.m4 (revision 12321) +++ m4/gettext.m4 (working copy) @@ -93,7 +93,7 @@ AC_TRY_LINK([#include libintl.h extern int _nl_msg_cat_cntr;], [bindtextdomain (, ); -return (int) gettext ()]ifelse([$2], need-ngettext, [ + (int) ngettext (, , 0)], [])[ + _nl_msg_cat_cntr], +return (int) gettext ()]ifelse([$2], need-ngettext, [ + (int) ngettext (, , 0)], []), gt_cv_func_gnugettext_libintl=yes, gt_cv_func_gnugettext_libintl=no) LIBS=$gt_save_LIBS]) Index: manual/Makefile.am === --- manual/Makefile.am (revision 12321) +++ manual/Makefile.am (working copy) @@ -22,7 +22,7 @@ civmanual_LDFLAGS = $(GGZDMOD_LDFLAGS) civmanual_LDADD= ../utility/libcivutility.a ../common/libcivcommon.a \ ../ai/libcivai.a ../utility/libcivutility.a ../server/libcivserver.a \ - $(INTLLIBS) ../client/helpdata.o \ + ../client/helpdata.o \ ../utility/libcivutility.a ../common/libcivcommon.a ../ai/libcivai.a \ ../utility/libcivutility.a ../server/libcivserver.a \ ../utility/libcivutility.a ../common/aicore/libaicore.a \ @@ -31,4 +31,4 @@ ../dependencies/lua/src/lib/liblualib.a \ ../dependencies/tolua/libtolua.a \ ../server/generator/libgenerator.a \ - $(SERVER_LIBS) $(AUTH_LIBS) $(LIB_GGZDMOD) + $(SERVER_LIBS) $(AUTH_LIBS) $(INTLLIBS) $(LIB_GGZDMOD) Index: po/Makefile.in.in === --- po/Makefile.in.in (revision 12321) +++ po/Makefile.in.in (working copy) @@ -69,7 +69,7 @@ .po.gmo: file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - rm -f $$file $(GMSGFMT) -c --statistics -o $$file $ + rm -f $$file $(GMSGFMT) --statistics -o $$file $ all: [EMAIL PROTECTED]@ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#38372) [Bug] AI tries to trade unreachable techs
URL: http://bugs.freeciv.org/Ticket/Display.html?id=38372
Patch. Untested. - Per
Index: ai/advdiplomacy.c
===
--- ai/advdiplomacy.c (revision 12880)
+++ ai/advdiplomacy.c (working copy)
@@ -125,7 +125,8 @@
{
int bulbs, tech_want, worth;
- if (get_invention(pplayer, tech) == TECH_KNOWN) {
+ if (get_invention(pplayer, tech) == TECH_KNOWN
+ || !tech_is_available(pplayer, tech)) {
return 0;
}
bulbs = total_bulbs_required_for_goal(pplayer, tech) * 3;
@@ -965,7 +966,9 @@
bool is_dangerous;
tech_type_iterate(tech) {
-if (tech == A_NONE) {
+if (tech == A_NONE
+|| !tech_is_available(player2, tech)
+|| !tech_is_available(player1, tech)) {
worth[tech] = 0;
continue;
}
@@ -1034,10 +1037,12 @@
if (players_on_same_team(pplayer, aplayer)) {
for (index = A_FIRST; index game.control.num_tech_types; index++) {
if ((get_invention(pplayer, index) != TECH_KNOWN)
- (get_invention(aplayer, index) == TECH_KNOWN)) {
+ (get_invention(aplayer, index) == TECH_KNOWN)
+ tech_is_available(pplayer, index)) {
ai_diplomacy_suggest(aplayer, pplayer, CLAUSE_ADVANCE, index);
} else if ((get_invention(pplayer, index) == TECH_KNOWN)
- (get_invention(aplayer, index) != TECH_KNOWN)) {
+ (get_invention(aplayer, index) != TECH_KNOWN)
+ tech_is_available(aplayer, index)) {
ai_diplomacy_suggest(pplayer, aplayer, CLAUSE_ADVANCE, index);
}
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
