[Freeciv-Dev] (PR#39721) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721 [guest - Mar. Sep. 25 17:33:44 2007]: [EMAIL PROTECTED] - Mar. Sep. 25 16:17:25 2007]: Cette opération semble ne pas avoir de contenu Hmmm, I submitted wrong patch file sorry... I already deleted this ticket, use PR#39722, where the patch is the good one ^_^. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 Could the 'none' CMA could be on the top of the menu? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39726) Typo in helpdata.txt
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39726 2007/9/26, Egor Vyscrebentsov [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39726 On Tue, 25 Sep 2007 13:51:16 -0700 Joan Creus wrote: + To have a diplomatic relationship with another player, you must first \ establish first contact with that player. To establish first contact, you \ This sentence has two words first near each other. Could it be changed? Three, if you count the next sentence. It sounds awful, indeed. Not being a native English speaker myself, I just corrected the obvious typo. But let's try to rephrase it somehow. How about: Before entering a diplomatic relationship with another player, you must first meet that player. To establish first contact, ... Feel free to change the wording if it sounds awkward to you. Joan 2007/9/26, Egor Vyscrebentsov [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39726 On Tue, 25 Sep 2007 13:51:16 -0700 Joan Creus wrote:+ To have a diplomatic relationship with another player, you must first \ establish first contact with that player. To establish first contact, you \ This sentence has two words first near each other. Could it be changed? Three, if you count the next sentence. It sounds awful, indeed. Not being a native English speaker myself, I just corrected the obvious typo. But lets try to rephrase it somehow. How about: Before entering a diplomatic relationship with another player, you must first meet that player. To establish first contact, ... Feel free to change the wording if it sounds awkward to you. Joan ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722
Use this patch. Probably more clean and keep old behaviours.
diff -urNa freeciv-2.0.orig/client/gui-gtk-2.0/cityrep.c freeciv-2.0/client/gui-gtk-2.0/cityrep.c
--- freeciv-2.0.orig/client/gui-gtk-2.0/cityrep.c 2007-09-26 14:19:42.0 +0200
+++ freeciv-2.0/client/gui-gtk-2.0/cityrep.c 2007-09-26 11:27:21.0 +0200
@@ -52,7 +52,7 @@
#include cityrep.h
#define NEG_VAL(x) ((x)0 ? (x) : (-x))
-#define CMA_NONE (cmafec_preset_num())
+#define CMA_NONE (-1)
#define CMA_CUSTOM (-2)
enum city_operation_type {
@@ -548,19 +548,13 @@
gtk_menu_item_set_submenu(parent_item, menu);
if (change_cma) {
-for (i = 0; i = cmafec_preset_num(); i++) {
- if ( i == CMA_NONE) {
- w = gtk_menu_item_new_with_label(_(none));
- gtk_menu_shell_prepend(GTK_MENU_SHELL(menu), w);
- } else {
- w = gtk_menu_item_new_with_label(cmafec_preset_get_descr(i));
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
- }
+for (i = -1; i cmafec_preset_num(); i++) {
+ w = (i == -1 ? gtk_menu_item_new_with_label(_(none))
+ : gtk_menu_item_new_with_label(cmafec_preset_get_descr(i)));
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
g_signal_connect(w, activate, G_CALLBACK(select_cma_callback),
GINT_TO_POINTER(i));
-
}
-
} else {
/* search for a none */
int found;
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722 [pepeto - Mer. Sep. 26 10:17:55 2007]: Could the 'none' CMA could be on the top of the menu? Yes, use this patch ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39703) [gui-sdl] error handling of missing font
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39703
[dmarks - Do 13. Sep 2007, 07:26:09]:
If gui-sdl can't locate the font specified in the themespec, it exits
with a bus error. I think it could be handled more cleanly than so...
~Daniel
Patch attached.
Index: client/gui-sdl/themespec.c
===
--- client/gui-sdl/themespec.c (revision 13656)
+++ client/gui-sdl/themespec.c (working copy)
@@ -735,7 +735,11 @@
if (t-font_filename) {
t-font_filename = mystrdup(t-font_filename);
} else {
-freelog(LOG_ERROR, Could not open font: %s, c);
+freelog(LOG_FATAL, Could not open font: %s, c);
+section_file_free(file);
+FC_FREE(fname);
+theme_free(t);
+return NULL;
}
freelog(LOG_DEBUG, theme font file %s, t-font_filename);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39720) ottoman nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39720 On 9/24/07, UÄŸur Çetin [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39720 Hi, This morning I read some Turkish history sites to refresh my elementary school memories and come up with this ottoman patch at the end(patch is aganist trunk). Changes: * Removed conflict with Turks (I'm not sure about that. I just didn't see any reason for this conflict.) As Daniil is saying, this is to avoid the scenario of having both the Turks and the Ottomans from the beginning of a game. If you want them to civil war to each other, that's ok. Note that even if two nations 'conflicts' with each other, you can still select both manually in pregame. It only stops the automatic selection of both. * Updated leader names with their original in Latin letters (also added first founder Ertuğrul Gazi) Good. Only problem here is that Osman Bey in a despotist gov will appear as Bey Osman Bey. Does this look ok in Turkish? * Updated ( or downdate :) ) city names with their original in Ottoman Empire and sorted them with historical conquest/foundation order. * Fixed a little typo and some tab characters Review please... -- Uğur Çetin Quality work! Thanks, ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39720) ottoman nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39720 On 9/27/07, Uğur Çetin [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39720 27-09-2007 06:24 Daniel Markstedt: As Daniil is saying, this is to avoid the scenario of having both the Turks and the Ottomans from the beginning of a game. If you want them to civil war to each other, that's ok. I now agree that it should stand as it was before. Two nations are for different eras. Good. Only problem here is that Osman Bey in a despotist gov will appear as Bey Osman Bey. Does this look ok in Turkish? No, It doesn't look okay. Actually Bey should be appended to ruler's name, not prepended. So, if it can be configured to append, we should remove Bey from Osman Bey. If not, Bey shouldn't be a title. (btw. Bey means mister in Turkish with one little difference that it sholud be appended to a name) (...) And what about leaving it as it was: Osman Gazi and keeping Bey as title. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
