[Freeciv-Dev] (PR#39808) Use $sysconfdir for ggz config dirs in relevant Makefiles.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39808
I'm pretty sure this patch is correct from freeciv's end but the ggz.m4
file may still need some tweaking. I'm not sure if the ggzdconfdir that
it sets should use ${sysconfdir} (allowing a make-time override, which
would be rather bad in most situations since the conf dir depends on
ggzd which is not moving) rather than setting the value directly.
Jordi, is this sufficient for your needs (as committed in S2_1) or do we
need some other fix?
-jason
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39909 [wsimpson - Sun Nov 25 18:14:27 2007]: Sir, the diplomat is waiting for your command Sir, the spy is waiting for your command Problematic. Using Sir and Ma'am does not jive well with all governments. But there is no form-of-address identifier in the government ruleset to cover this either. For 2.1 the best fix may just be removing the Sir, part (easily adapted with PO files which become fuzzy). For the development branch maybe we should add such a field to the governments.ruleset. Sir/Ma'am, Sire/, Comrade/Comrade, etc. -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39909 On 11/28/07, Jason Short [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39909 [wsimpson - Sun Nov 25 18:14:27 2007]: Sir, the diplomat is waiting for your command Sir, the spy is waiting for your command Problematic. Using Sir and Ma'am does not jive well with all governments. But there is no form-of-address identifier in the government ruleset to cover this either. For 2.1 the best fix may just be removing the Sir, part (easily adapted with PO files which become fuzzy). For the development branch maybe we should add such a field to the governments.ruleset. Sir/Ma'am, Sire/, Comrade/Comrade, etc. -jason Any reason the ruler titles can't be used as they are? Prime Minister, ... General, ... Chief, ... etc. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39909 On Wed, 28 Nov 2007 00:10:54 -0800 Jason Dorje Short wrote: Daniel Markstedt wrote: Any reason the ruler titles can't be used as they are? Prime Minister, ... General, ... Chief, ... etc. Queen, the diplomat is waiting for your command. Sounds very weird to me, worse than just removing the address. Agree. Sire, the diplomat is waiting for your command. ...is how it should be under monarchy. What about Your majesty, ... and similar? (Seems to be a unisex form in all languages I know about.) Camrade for Communism makes the same thing. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39923) ggz support for 2.1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39923 With the demise of pubserver GGZ is the natural replacement, as it has worked with freeciv for some years now. http://ggzgamingzone.org/ freeciv.ggzgamingzone.org points to the main GGZ server, a rather small machine used primarily for spades games. However the default profile hard-coded in freeciv is for pubserver.freeciv.org as the server. This patch should be applied to change that default profile, or pubserver.freeciv.org should be changed to point to freeciv.ggzgamingzone.org. Having done that simply compile Freeciv 2.1.1 with ./configure --with-ggz-client --enable-client=gtk and you should be good to connect directly to the server (you'll need at least 3 GGZ packages/libraries to get through the configure process, libggz, ggz-client-libs, and ggz-gtk-client). If this is packaged with the windows GTK client then we should quickly have a player base. For the SDL client things are a bit more work. You can't connect to the gaming server from within freeciv; rather you have to run an external client to connect and then it will launch freeciv when you join a game. This would mean one of the GGZ clients should be bundled with the SDL client for windows. -jason Index: client/ggzclient.c === --- client/ggzclient.c (revision 14083) +++ client/ggzclient.c (working copy) @@ -55,7 +55,7 @@ user_username(buf, sizeof(buf)); cat_snprintf(buf, sizeof(buf), %d, myrand(100)); -ggz_embed_ensure_server(Pubserver, pubserver.freeciv.org, +ggz_embed_ensure_server(Pubserver, freeciv.ggzgamingzone.org, 5688, buf); } #endif ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39722) gcc-4.2 -O2 compile fails as predicted
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 2007/11/27, Daniel Markstedt [EMAIL PROTECTED] mailto:[EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 On Nov 27, 2007 5:44 PM, Jordi Negrevernis i Font [EMAIL PROTECTED] mailto:[EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 William Allen Simpson wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 Castanier Carl wrote: ho, sorry was a pepeto comment :) you can't read them :) Anyway, I can't talk about it since I can't read any tickets and I can't see what I wrote. Ah, another child. There are at least 3 ways to read the reports. And of course, surely you saved your own email on your own computer. What he says it's true. I can't read any ticket with the guest acount. Ah, and i'm not a child! :-) Can you try again now? hehe link is bad. I understand now http://bugs.freeciv.org/SelfService/Display.html?id=39722 http://bugs.freeciv.org/SelfService/Display.html?id=39722 work but http://bugs.freeciv.org/Ticket/Display.html?id=39722 is wrong query. Guest cannot search (which is a major drawback) but you can enter ticket numbers directly. Ffield go to tickets works now. I apologize then. I'm baby :) ? Anyway, this URL 'http://bugs.freeciv.org/Ticket/Display.html?id=39722' that appears on top of the message does not work. OTOH, entering the ticket number on the ticket list page now works... some progress... ;-) Thanks for fixing this... ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39909) BUG: leader gender ignored in diplomat/spy dialog
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39909 Egor Vyscrebentsov wrote: What about Your majesty, ... and similar? (Seems to be a unisex form in all languages I know about.) Camrade for Communism makes the same thing. Your highness and excellency are also non-gender specific. But what would you do for Republic and Democracy? Remembering history, the US Congress argued for a long time (Adams favored Excellency) before settling on the simpler Mr. President -- but that won't work here Once upon a time, the CDC Scope/Hustler operating system console said: Yeah Master, what be thy bidding? That seemed fine -- until we had women in computer science. There was one in the year before me (the only woman in The Soul of a New Machine), and several in my cohort. Until somebody writes a nation-title-gender-address function, I'll just remove the address. Actually, it seems okay without the flavor. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39922) BUG: keys operate units with map not in focus
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39922 Jason Dorje Short wrote: I'm not sure how it should be fixed. There's a lot of unit-specific unit commands that should be disabled when there's a tabbed report open. While attempting to do the apostrophe Chat PR#39912, I've found at least part of it! In client/gui-gtk-2.0/gui_main.c keyboard_handler(), the code is simply insane Scrolling without checking for scroll bars enabled. In one place checking for map_canvas in focus, and in most others not checking. It's really stupid to require = GTK 2.4, but continue to use structures that were deprecated by 2.4 (and obsolete long before then). And whomever wrote the battlegroup code should be strung up by their toes for awhile. While I'm thinking about it, amputate their fingers, too. Problems here, problems I've spent many hours fixing in goto, everywhere! This code begs for a complete re-write. Who's the GTK expert around here these days? There are damn good reasons I'm not a gui programmer, and this utter frustration is one of them. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39924) BUG: escape doesn't cancel dialogs nor much of anything else
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39924 $subject Apparently, it's hijacked in client/gui-gtk-2.0/gui_main.c keyboard_handler() to cancel goto/patrol, and never properly passed along to other routines. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912
First, I tried an obvious addition to the menu system with the shortcut key.
No joy. The \' itself doesn't show in the menu, and it doesn't work.
Next, I tried reading the on-line manual. And discovered that the entire
menu system here was deprecated in GTK+ 2.4. Not just replaced, which was
apparently done as an early component of GTK2, but deprecated!
Yet, we already require = 2.4 to configure! Hair being torn out
Then, I discovered that some flower of his mother's life used the
gtk_label_new_with_mnemonic() to put the underscore in _Chat, but
forgot to use gtk_label_set_mnemonic_widget() to activate the shortcut.
Also, the same problem with _Map. These widget shortcuts don't work at
all! You have to use the mouse to activate the widgets. (I'd thought it
was some problem with MacOS, but apparently it's never worked for anybody.)
I've figured out how to bypass the problems by intercepting keystrokes in
client/gui-gtk-2.0/gui_main.c keyboard_handler(), but it's not ideal
Index: client/gui-gtk-2.0/gui_main.c
===
--- client/gui-gtk-2.0/gui_main.c (revision 14093)
+++ client/gui-gtk-2.0/gui_main.c (working copy)
@@ -457,7 +457,6 @@
return FALSE;
}
-
if ((ev-state GDK_SHIFT_MASK)) {
switch (ev-keyval) {
case GDK_Left:
@@ -498,7 +497,19 @@
default:
break;
}
+ } else {
+switch (ev-keyval) {
+
+case GDK_apostrophe:
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(bottom_notebook), 0);
+ gtk_widget_grab_focus(inputline);
+ return TRUE;
+
+default:
+ break;
+};
}
+
/* Return here if observer */
if (client_is_observer()) {
return FALSE;
@@ -1243,7 +1254,7 @@
gtk_widget_set_size_request(sw, 600, 100);
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
- label = gtk_label_new_with_mnemonic(_(_Chat));
+ label = gtk_label_new(_(Chat));
gtk_notebook_append_page(GTK_NOTEBOOK(bottom_notebook), vbox, label);
text = gtk_text_view_new_with_buffer(message_buffer);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 On Nov 28, 2007 2:46 PM, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 Also, the same problem with _Map. These widget shortcuts don't work at all! You have to use the mouse to activate the widgets. (I'd thought it was some problem with MacOS, but apparently it's never worked for anybody.) Actually it works for me, or am I misunderstanding you; I can press alt-m to get to the map from the Cities tab. But it doesn't work when I'm in a city dialog, which is expected. From fink macosx: ii gtk+2 2.6.10-1001 The Gimp Toolkit $otool -L client/civclient|grep gtk /sw/lib/libgtk-x11-2.0.0.dylib (compatibility version 601.0.0, current version 601.10.0) -- /emj ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 BTW, I just counted 9 tabs to get to the chat line, and on the default visually pleasant theme, I cannot where else it is focused. Annoying! This shortcut is really needed! ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39922) BUG: keys operate units with map not in focus
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39922 William Allen Simpson wrote: This code begs for a complete re-write. Who's the GTK expert around here these days? There are damn good reasons I'm not a gui programmer, and this utter frustration is one of them. The reason the code is the way it is is that there is no GTK expert around these days, as far as I know. -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39925) Automatic change of queue + save bug
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39925 Well everytime i end a round all production queue are changed? Is it a bug or a generell problem. Also my save games seem to be buggy cause i lost some colloseums in some citys! ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39926) build error on ZETA/BeOS with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Hi there, As jdorje asked I'm sending this email to the tracker to see if someone can figure out next compilation error. Any help is appreciated. Greetz, Luc Schrijvers aka Begasus make[1]: Entering directory `/R5/S2_2/server' source='settings.c' object='settings.o' libtool=no \ DEPDIR=.deps depmode=gcc /bin/sh ../bootstrap/depcomp \ gcc -DHAVE_CONFIG_H -I. -I.. -I../utility -I./../common -I./../ai -I../common/aicore -I./generator -I./scripting -DLOCALEDIR=\/boot/apps/Games/Freeciv-2.2//share/locale\ -DDEFAULT_DATA_PATH=\.:data:~/.freeciv:/boot/apps/Games/Freeciv-2.2//share /freeciv\ -g -O2 -Wall -Wpointer-arith -Wcast-align -Wmissing-prototypes -Wmissing-declarations -Wno-multichar -c settings.c /R5/S2_2/server/settings.c:992: warning: preprocessing directive not recognized within macro arg /R5/S2_2/server/settings.c:993: `#elif' not within a conditional /R5/S2_2/server/settings.c:995: `#else' not within a conditional /R5/S2_2/server/settings.c:997: unbalanced `#endif' make[1]: *** [settings.o] Error 1 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39927) RFE: consistent UI - Map - use escape for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39927 This would free up Alt-M, as proposed by Erik Johansson [EMAIL PROTECTED] in side commentary (see PR#39900). Excerpted: ESC works for Dialogs: just close the dialog and bring up the last used tab. [When in] tabs ([such as] city list), just switch to the map tab. There are already problems with ESC (see PR#39924). This seems an opportunity to kill two birds with one stone. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) build error on ZETA/BeOS with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Begasus wrote: /R5/S2_2/server/settings.c:992: warning: preprocessing directive not recognized within macro arg /R5/S2_2/server/settings.c:993: `#elif' not within a conditional /R5/S2_2/server/settings.c:995: `#else' not within a conditional /R5/S2_2/server/settings.c:997: unbalanced `#endif' make[1]: *** [settings.o] Error 1 GEN_INT(compresstype, game.info.save_compress_type, SSET_META, SSET_INTERNAL, SSET_RARE, SSET_SERVER_ONLY, N_(Savegame compression algorithm), N_(Compression library to use for savegames.\n 0 - none\n 1 - zlib (gzip format)\n 2 - bzip2\n Not all servers support all compression methods.), NULL, #if !defined(HAVE_LIBBZ2) !defined(HAVE_LIBZ) FZ_PLAIN, FZ_PLAIN, FZ_PLAIN) #elif !defined(HAVE_LIBBZ2) defined(HAVE_LIBZ) FZ_PLAIN, FZ_ZLIB, FZ_ZLIB) #else FZ_PLAIN, FZ_BZIP2, FZ_BZIP2) #endif What compiler? Apparently, as the error is clearly stated, it doesn't like the #if in the middle of the GEN_INT macro. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) build error on ZETA/BeOS with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 William Allen Simpson wrote: What compiler? Apparently, as the error is clearly stated, it doesn't like the #if in the middle of the GEN_INT macro. I'm blind, you wrote gcc 2.95.3 in the subject. Can you upgrade? Also, I'd not recommend S2_2 branch unless you have masochistic tendencies, or are an artist willing to help update the graphics! ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 On Nov 28, 2007 4:10 PM, William Allen Simpson [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 I don't see an Alt on my Mac keyboard ;-) After bringing up F1: option-M causes my (not visible) worker to begin mining. (Wrong!) The workers doesn't start mining here, but it does whenI press m. I have an old Mac keyboard with one alt key to the left sporting a branchy icon thingy, When I run xev and press alt-m continously, I get numerous KeyRelease/Press Event with: state 0x8, keycode 54 (keysym 0xad1, rightsinglequotemark), same_screen YES Tested with: MacOSX: 10.4.11 Keyboard: American and Swedish Language: Swedish -- /emj ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) build error on ZETA/BeOS with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 For portability, we should re-write this section. http://www.gnu.org/software/gcc/bugs.html Cannot use preprocessor directive in macro arguments. Versions of GCC prior to 3.3 did not allow you to put #ifdef (or any other preprocessor directive) inside the arguments However, this kind of code is not portable. It is undefined behavior according to the C standard; ... ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926
William Allen Simpson wrote:
For portability, we should re-write this section.
Damnit, was already re-written in 2.1, but not in 2.2/trunk. As I've
said before, I really really really wish that folks fixing bugs in 2.1
would also fix them in 2.2/trunk
So, I fixed some reserved words in the macro parameters, too.
Committed S2_2 revision 14094.
Committed trunk revision 14095.
Index: server/settings.c
===
--- server/settings.c (revision 14094)
+++ server/settings.c (working copy)
@@ -195,28 +195,49 @@
return TRUE;
}
+
+//
+#if defined(HAVE_LIBBZ2)
+#define GAME_MIN_COMPRESS_TYPE FZ_PLAIN
+#define GAME_MAX_COMPRESS_TYPE FZ_BZIP2
+#define GAME_DEFAULT_COMPRESS_TYPE FZ_BZIP2
+
+#elif defined(HAVE_LIBZ)
+#define GAME_MIN_COMPRESS_TYPE FZ_PLAIN
+#define GAME_MAX_COMPRESS_TYPE FZ_ZLIB
+#define GAME_DEFAULT_COMPRESS_TYPE FZ_ZLIB
+
+#else
+#define GAME_MIN_COMPRESS_TYPE FZ_PLAIN
+#define GAME_MAX_COMPRESS_TYPE FZ_PLAIN
+#define GAME_DEFAULT_COMPRESS_TYPE FZ_PLAIN
+
+#endif
+
+//
+
#define GEN_BOOL(name, value, sclass, scateg, slevel, to_client, \
-short_help, extra_help, func, default) \
+short_help, extra_help, func, _default)\
{name, sclass, to_client, short_help, extra_help, SSET_BOOL, \
- scateg, slevel, value, default, func, \
+ scateg, slevel, value, _default, func, \
NULL, 0, NULL, 0, 0, \
NULL, NULL, NULL, 0},
#define GEN_INT(name, value, sclass, scateg, slevel, to_client,
\
- short_help, extra_help, func, min, max, default)\
+ short_help, extra_help, func, _min, _max, _default) \
{name, sclass, to_client, short_help, extra_help, SSET_INT, \
scateg, slevel, \
NULL, FALSE, NULL, \
- value, default, func, min, max, \
+ value, _default, func, _min, _max, \
NULL, NULL, NULL, 0},
#define GEN_STRING(name, value, sclass, scateg, slevel, to_client, \
- short_help, extra_help, func, default) \
+ short_help, extra_help, func, _default) \
{name, sclass, to_client, short_help, extra_help, SSET_STRING, \
scateg, slevel, \
NULL, FALSE, NULL, \
NULL, 0, NULL, 0, 0, \
- value, default, func, sizeof(value)},
+ value, _default, func, sizeof(value)},
#define GEN_END\
{NULL, SSET_LAST, SSET_SERVER_ONLY, NULL, NULL, SSET_INT,\
@@ -976,7 +997,6 @@
N_(If non-zero, saved games will be compressed using zlib
(gzip format) or bzip2. Larger values will give better
compression but take longer.), NULL,
-
GAME_MIN_COMPRESS_LEVEL, GAME_MAX_COMPRESS_LEVEL,
GAME_DEFAULT_COMPRESS_LEVEL)
@@ -988,13 +1008,8 @@
1 - zlib (gzip format)\n
2 - bzip2\n
Not all servers support all compression methods.), NULL,
-#if !defined(HAVE_LIBBZ2) !defined(HAVE_LIBZ)
- FZ_PLAIN, FZ_PLAIN, FZ_PLAIN)
-#elif !defined(HAVE_LIBBZ2) defined(HAVE_LIBZ)
- FZ_PLAIN, FZ_ZLIB, FZ_ZLIB)
-#else
- FZ_PLAIN, FZ_BZIP2, FZ_BZIP2)
-#endif
+ GAME_MIN_COMPRESS_TYPE, GAME_MAX_COMPRESS_TYPE,
+ GAME_DEFAULT_COMPRESS_TYPE)
GEN_STRING(savename, game.save_name,
SSET_META, SSET_INTERNAL, SSET_VITAL, SSET_SERVER_ONLY,
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39925) Re: Automatic change of queue + save bug
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39925 [guest - Mi 28. Nov 2007, 15:42:41]: Well everytime i end a round all production queue are changed? Is it a bug or a generell problem. Also my save games seem to be buggy cause i lost some colloseums in some citys! heyho, well i reopend the savegame and now everythin is back on normal (as far as i can see thus the produtcion queues dont change randomly) the colloseums didnt appear again but now its fun again to play!!! ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39925) Re: Automatic change of queue + save bug
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39925 heres the savegame i was speaking off ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 William Allen Simpson wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 William Allen Simpson wrote: For portability, we should re-write this section. Damnit, was already re-written in 2.1, but not in 2.2/trunk. As I've said before, I really really really wish that folks fixing bugs in 2.1 would also fix them in 2.2/trunk On that topic, why do we have a 2.2 already? Obviously bug fixes should go to it but it seems you are committing most patches to it and that just means it's a mirror of trunk. It's been 2 years or something since the S2_1 branching so no doubt there is enough code to justify a S2_2 but if we're going to do that we need to actually make it different from trunk. -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 On my Mac keyboards, the option key has the label alt in the upper left. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39925) Automatic change of queue + save bug
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39925 wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39925 Well everytime i end a round all production queue are changed? Is it a bug or a generell problem. Also my save games seem to be buggy cause i lost some colloseums in some citys! Because you've set yourself on AI mode most likely. The AI takes over production of your cities and will change as it sees fit. -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39928) GTK2 (F5) Economy (Alt-O) _Obsolete conflicts with _Orders
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39928 As an alternative, similar to F1 Cities, could Sell with All and Obsolete as submenus. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39929) GTK2 (F3) Players (Alt-C) _Cancel conflicts with Chat, Cities
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39929 Could easily change to Cancel _Treaty. _Meet conflicts with _Map, but that could go away soon (see PR#39927). ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Jason Dorje Short wrote: On that topic, why do we have a 2.2 already? You should, of course, re-read your messages circa Sep 12th. I'd be happy to stop posting any patches at all to trunk, and use 2.2 as the development branch It really is a waste of time doing everything twice or three times. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 William Allen Simpson wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Jason Dorje Short wrote: On that topic, why do we have a 2.2 already? You should, of course, re-read your messages circa Sep 12th. Negative. RTFM is not an acceptable answer on this mailing list. If you can give me a search term I'll be happy to peruse a specific thread. But I suspect the 10 seconds it would take you to do that would be better spent giving a 10-second summary of the reason. I'd be happy to stop posting any patches at all to trunk, and use 2.2 as the development branch It really is a waste of time doing everything twice or three times. That was, in fact, entirely my point. Which is why I wonder why we have 2.2 yet. -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39931) remove gtk_menu_item_remove_submenu
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39931
This is deprecated in recent GTKs and doesn't seem to be needed. It's
easily replaced.
Patch was made for 2.1 but we probably only need it for trunk.
-jason
Index: client/gui-gtk-2.0/cityrep.c
===
--- client/gui-gtk-2.0/cityrep.c (revision 14095)
+++ client/gui-gtk-2.0/cityrep.c (working copy)
@@ -214,7 +214,6 @@
};
- gtk_menu_item_remove_submenu(parent_item);
menu = gtk_menu_new();
gtk_menu_item_set_submenu(parent_item, menu);
@@ -536,7 +535,7 @@
struct cm_parameter parameter;
GtkWidget *w;
- gtk_menu_item_remove_submenu(parent_item);
+ gtk_menu_item_set_submenu(parent_item, NULL);
if (!can_client_issue_orders()) {
return;
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39930) Auto Settler for Workers and Engineers
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39930 If you select a worker or engineer the menu entry in the Orders menu reads Auto Settler. This looks like a reminiscence of previous Freeciv versions where we started with settlers and progressed to engineers. Correctly it should read Auto Worker or Auto Engineer depending on the selected unit type. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 On 11/29/07, Jason Dorje Short [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 William Allen Simpson wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Jason Dorje Short wrote: On that topic, why do we have a 2.2 already? You should, of course, re-read your messages circa Sep 12th. Negative. RTFM is not an acceptable answer on this mailing list. If you can give me a search term I'll be happy to peruse a specific thread. But I suspect the 10 seconds it would take you to do that would be better spent giving a 10-second summary of the reason. I'd be happy to stop posting any patches at all to trunk, and use 2.2 as the development branch It really is a waste of time doing everything twice or three times. That was, in fact, entirely my point. Which is why I wonder why we have 2.2 yet. -jason PR#39690 PR#7294 ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Daniel Markstedt wrote: I'd be happy to stop posting any patches at all to trunk, and use 2.2 as the development branch It really is a waste of time doing everything twice or three times. That was, in fact, entirely my point. Which is why I wonder why we have 2.2 yet. PR#39690 PR#7294 Interesting. Just at a glance, then, my judgement would be that branching 2.2 at that time was a mistake. If indeed the difference is as small as it seems (taking a look at that now) then I'd suggest merging 2.2 back into trunk (and reverting the embassy removal, saving that and other major rules changes for after 2.2). -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926
Hi peeps,
Didn't know you guys were paying that much attention (before I knew what
went on there there was already a fix for the first problem). ;)
Sending the diff file now I used to get the source of the 2.2 branch (yeah
I know .. have these urges! ;) ) to compile in BeOS. Have used svn diff in
ubuntu (after checking all compiles) to create the diff file. Maybe you
could have a look at it.
In regards to the compiler ... there is a 3.4 one but that isn't complete
and not all links to the correct places ... will take quit some work
(although it has been done) to get it setup right. The 2.95.3 one is at
this point still the safest way to go in BeOS.
Greetings and thnx for putting the previous fixes in.
Luc Schrijvers aka Begasus
[EMAIL PROTECTED]:~/freeciv2.2$ svn diff
Index: server/cityturn.c
===
--- server/cityturn.c (revision 14099)
+++ server/cityturn.c (working copy)
@@ -638,7 +638,7 @@
if (valid_improvement(choice.value.building)) {
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = choice.value.building
+ .value = {.building = choice.value.building}
};
change_build_target(pplayer, pcity, target, E_IMP_AUTO);
@@ -651,7 +651,7 @@
!building_has_effect(pimprove, EFT_CAPITAL_CITY)) {
struct universal target = {
.kind = VUT_IMPROVEMENT,
-.value.building = pimprove
+.value = {.building = pimprove}
};
change_build_target(pplayer, pcity, target, E_IMP_AUTO);
Index: server/savegame.c
===
--- server/savegame.c (revision 14099)
+++ server/savegame.c (working copy)
@@ -3001,6 +3001,7 @@
i = -1;
unit_list_iterate(plr-units, punit) {
i++;
+{
int activity;
secfile_insert_int(file, punit-id, player%d.u%d.id, plrno, i);
@@ -3456,6 +3457,7 @@
#undef PART_ADJUST
#undef PART_SIZE
}
+}
/***
Index: common/effects.c
===
--- common/effects.c(revision 14099)
+++ common/effects.c(working copy)
@@ -539,7 +539,7 @@
struct universal source = {
.kind = VUT_IMPROVEMENT,
/* just to bamboozle the annoying compiler warning */
-.value.building = improvement_by_number(improvement_number(pimprove))
+.value = {.building = improvement_by_number(improvement_number(pimprove))}
};
struct effect_list *plist = get_req_source_effects(source);
@@ -694,7 +694,7 @@
struct effect_list *plist;
struct universal source = {
.kind = VUT_IMPROVEMENT,
-.value.building = pimprove
+.value = {.building = pimprove}
};
/* A capitalization production is never redundant. */
@@ -1011,7 +1011,7 @@
struct impr_type *building = pcity-production.value.building;
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = building
+ .value = {.building = building}
};
struct effect_list *plist = get_req_source_effects(source);
int power = 0;
Index: ai/aicity.c
===
--- ai/aicity.c (revision 14099)
+++ ai/aicity.c (working copy)
@@ -793,7 +793,7 @@
struct government *gov = government_of_player(pplayer);
struct universal source = {
.kind = VUT_IMPROVEMENT,
-.value.building = pimprove
+.value = {.building = pimprove}
};
const bool is_coinage = improvement_has_flag(pimprove, IF_GOLD);
Index: ai/aidata.c
===
--- ai/aidata.c (revision 14099)
+++ ai/aidata.c (working copy)
@@ -66,7 +66,7 @@
improvement_iterate(pimprove) {
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
ai-impr_calc[improvement_index(pimprove)] = AI_IMPR_ESTIMATE;
Index: client/helpdata.c
===
--- client/helpdata.c (revision 14099)
+++ client/helpdata.c (working copy)
@@ -657,7 +657,7 @@
{
struct universal source = {
.kind = VUT_IMPROVEMENT,
-.value.building = pimprove
+.value = {.building = pimprove}
};
assert(buf);
@@ -1084,7 +1084,7 @@
struct advance *vap = valid_advance_by_number(i);
struct universal source = {
.kind = VUT_ADVANCE,
-.value.advance = vap
+.value = {.advance = vap}
};
assert(bufuser_text);
@@ -1173,7 +1173,7 @@
{
struct universal source = {
.kind = VUT_TERRAIN,
-.value.terrain = pterrain
+.value = {.terrain = pterrain}
};
buf[0] = '\0';
@@ -1229,7 +1229,7 @@
{
struct universal source = {
.kind = VUT_GOVERNMENT,
-.value.govern = gov
+.value = {.govern = gov}
};
buf[0] = '\0';
[Freeciv-Dev] (PR#39932) Old Ubuntu-installation
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39932 Hi! I try to install the prev. version to Ubuntu... It's not there, the same with this new version. We really need a ubuntu-package, please help us get this great game... ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Begasus wrote: Sending the diff file now I used to get the source of the 2.2 branch (yeah I know .. have these urges! ;) ) to compile in BeOS. Have used svn diff in ubuntu (after checking all compiles) to create the diff file. Maybe you could have a look at it. Please don't submit new patches to old resolved tickets. Start a new ticket, with a useful subject and explanations for each change. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Jason Dorje Short wrote: ... I'd suggest merging 2.2 back into trunk (and reverting the embassy removal, saving that and other major rules changes for after 2.2). For a guy that's been around so long, you don't seem to understand subversion very well It's been branched. Just as 2.1, it's probably premature. But there's no going back. And let's stop using an old resolved and completely irrelevant ticket for this discussion. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39900) _Update button in city report to _Inspect
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39900 Committed as part of S2_1 revision 14100. Committed as part of S2_2 revision 14101. Committed as part of trunk revision 14102. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39912) consistent UI - Chat - use apostrophe for shortcut
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39912 Committed as part of S2_1 revision 14100. Committed as part of S2_2 revision 14101. Committed as part of trunk revision 14102. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39913) consistent UI - Government should be Edit
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39913
Committed as part of S2_2 revision 14101.
Committed as part of trunk revision 14102.
Index: client/gui-gtk-2.0/gui_main.c
===
--- client/gui-gtk-2.0/gui_main.c (revision 14100)
+++ client/gui-gtk-2.0/gui_main.c (working copy)
@@ -457,7 +457,6 @@
return FALSE;
}
-
if ((ev-state GDK_SHIFT_MASK)) {
switch (ev-keyval) {
case GDK_Left:
@@ -498,7 +497,24 @@
default:
break;
}
+ } else {
+switch (ev-keyval) {
+
+case GDK_apostrophe:
+ /* FIXME: should find the correct window, even when detached, from any
+ * other window; should scroll to the bottom automatically showing the
+ * latest text from other players; MUST NOT make spurious text windows
+ * at the bottom of other dialogs.
+ */
+ gtk_notebook_set_current_page(GTK_NOTEBOOK(bottom_notebook), 0);
+ gtk_widget_grab_focus(inputline);
+ return TRUE;
+
+default:
+ break;
+};
}
+
/* Return here if observer */
if (client_is_observer()) {
return FALSE;
@@ -1243,7 +1259,7 @@
gtk_widget_set_size_request(sw, 600, 100);
gtk_box_pack_start(GTK_BOX(vbox), sw, TRUE, TRUE, 0);
- label = gtk_label_new_with_mnemonic(_(_Chat));
+ label = gtk_label_new(_(Chat));
gtk_notebook_append_page(GTK_NOTEBOOK(bottom_notebook), vbox, label);
text = gtk_text_view_new_with_buffer(message_buffer);
Index: client/gui-gtk-2.0/messagewin.c
===
--- client/gui-gtk-2.0/messagewin.c (revision 14100)
+++ client/gui-gtk-2.0/messagewin.c (working copy)
@@ -187,7 +187,7 @@
gtk_widget_set_sensitive(cmd, FALSE);
cmd = gui_dialog_add_stockbutton(meswin_shell, GTK_STOCK_ZOOM_IN,
- _(_Update City), CMD_POPCITY);
+ _(Inspect _City), CMD_POPCITY);
gtk_widget_set_sensitive(cmd, FALSE);
gui_dialog_add_button(meswin_shell, GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE);
Index: client/gui-gtk-2.0/menu.c
===
--- client/gui-gtk-2.0/menu.c (revision 14100)
+++ client/gui-gtk-2.0/menu.c (working copy)
@@ -727,38 +727,44 @@
NULL, 0,
Branch },
{ / N_(Game) /tearoff1,NULL,
NULL, 0,
Tearoff },
- { / N_(Game) / N_(Local _Options), NULL,
+ { / N_(Game) / N_(_Chat),NULL,
+ NULL, 0,
Branch },
+ { / N_(Game) / N_(_Chat) / N_(_Clear Log), NULL,
+ game_menu_callback, MENU_GAME_CLEAR_OUTPUT
},
+ { / N_(Game) / N_(_Chat) / N_(_Write Log), NULL,
+ game_menu_callback, MENU_GAME_OUTPUT_LOG
},
+ { / N_(Game) / N_(_Government), NULL,
+ NULL, 0,
Branch },
+ { / N_(Game) / N_(_Government) / N_(_Tax Rates),
shiftt,
+ government_menu_callback, MENU_GOVERNMENT_TAX_RATE
},
+ { / N_(Game) / N_(_Government) / N_(_Revolution...),
shiftr,
+ government_menu_callback, MENU_GOVERNMENT_REVOLUTION
},
+ { / N_(Game) / N_(_Government) /sep1, NULL,
+ NULL, 0,
Separator },
+ { / N_(Game) / N_(_Options), NULL,
+ NULL, 0,
Branch },
+ { / N_(Game) / N_(_Options) / N_(_Local Client), NULL,
game_menu_callback, MENU_GAME_OPTIONS
},
- { / N_(Game) / N_(_Message Options), NULL,
+ { / N_(Game) / N_(_Options) / N_(_Message), NULL,
game_menu_callback, MENU_GAME_MSG_OPTIONS
},
- { / N_(Game) /sep1,NULL,
+ { / N_(Game) / N_(_Options) / N_(_Remote Server),NULL,
+ game_menu_callback, MENU_GAME_SERVER_OPTIONS},
+ { / N_(Game) / N_(_Options) / N_(Save Options _Now),
NULL,
+ game_menu_callback, MENU_GAME_SAVE_OPTIONS
},
+ { / N_(Game) / N_(_Options) / N_(Save Options on _Exit), NULL,
+ game_menu_callback, MENU_GAME_SAVE_OPTIONS_ON_EXIT,
CheckItem },
+ { / N_(Game) /sep4,NULL,
NULL, 0,
Separator },
#ifdef DEBUG
{ / N_(Game) / N_(_Reload Tileset), ctrlaltr,
game_menu_callback, MENU_GAME_RELOAD_TILESET },
#endif
- { / N_(Game) / N_(Save Options on _Exit),NULL,
- game_menu_callback,
Re: [Freeciv-Dev] (PR#39881) GTK2 (F2) Unit (Alt-N) _Nearest conflicts with Gover_nment
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39881 Committed S2_1 revision 14083, as an interim compromise. Full integration with PR#39913: Committed as part of S2_2 revision 14101. Committed as part of trunk revision 14102. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39926) 2.2-test build error in settings.c with gcc 2.95.3
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 William Allen Simpson wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 Jason Dorje Short wrote: ... I'd suggest merging 2.2 back into trunk (and reverting the embassy removal, saving that and other major rules changes for after 2.2). For a guy that's been around so long, you don't seem to understand subversion very well It's been branched. Just as 2.1, it's probably premature. But there's no going back. That was the case with CVS but shouldn't be a problem for SVN. svn rm svn+ssh://[EMAIL PROTECTED]/svn/freeciv/branches/S2_2 should do the trick though I believe that is an immediate operation. And let's stop using an old resolved and completely irrelevant ticket for this discussion. All the other discussions were in irrelevant tickets too. But I agree, we should have an actual thread for this discussion. -jason ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
