Re: [Freeciv-Dev] (PR#22272) bug in packland.c line2023
URL: http://bugs.freeciv.org/Ticket/Display.html?id=22272 On Sun, 15 Oct 2006 Fauch__© Jean-Marc wrote: file:packland.c line 2023 unit_list-size(ptile-units)==0 Sorry, this information is not enough. What you've seen was an assert, we're interesting in how you came to this line with no units. Savegame, from which this behavior is reproduced, is very welcome (with description of steps to reproduce.) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Civ2 SCN/SAV files and Freeciv
On Mon, 22 Jan 2007 22:14:25 +0900 Daniel Markstedt wrote: A Civ2 scenario comes with a .SVN and/or .SAV file that supposedly contains about the same data as a Freeciv .sav. The question is, has anybody written a program to automatically convert between these file formats. I know about evyscr's civ2mp2fc, but that can AFAIK only handle .MP (empty Civ2 maps). We're workink on this ;) Hope to make working converter before release of 2.1.0. -- Thanks, evyscr pgpUYygdcg7mX.pgp Description: PGP signature ___ 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
URL: http://bugs.freeciv.org/Ticket/Display.html?id=34276 On Tue, 23 Jan 2007 Kevin Benton wrote: [dmarks - Mon Jan 22 01:37:38 2007]: On 1/22/07, Marko Lindqvist [EMAIL PROTECTED] wrote: 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 Then I suppose this is bound to happen for everyone who updates. Suggest making a FAQ entry on it! Rather than making a FAQ entry on it and calling it quits, why not offer to update the .civclientrc for the user during the upgrade? That would take care of the largest part of the users who never really cared what port number FC uses. This can be done at first launch with old .civclientrc (looking to [civclient] version parameter less than 2.1.0). One more reason for this is an amplio tileset (which is _not a default_ if we already have .civclientrc). -- Thanks, evyscr pgpeu3vMA8vvU.pgp Description: PGP signature ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#34432) Solar Plant
URL: http://bugs.freeciv.org/Ticket/Display.html?id=34432 On Thu, 25 Jan 2007 Marko Lindqvist wrote: On 1/24/07, Daniel Markstedt wrote: Here is a patch to implement the Solar Plant for default and civ2. All necessary graphics are already in place. No tested for game balancing: I gave it a 'Pollu_Prod_Pct' effect of -100 which might be too powerful. This makes Recycling Center useless. Not good. But this is right for civ2 ruleset... (Well, Solar Plant in civ2 is very curious thing... It does not replace present plant, but I haven't seen any benefit from having both plants.) However, for default it will be better to have cumulative effect of Solar Plant and Recycling Center. (IMHO.) And maybe even cumulative effect with other plant. -- Thanks, evyscr pgpTDzt9T0GHA.pgp Description: PGP signature ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Freeciv and XDG_* environment variables
Good daytime! Does someone had experience in working with XDG_DATA_HOME, XDG_CONFIG_HOME and similar environment variables? http://standards.freedesktop.org/basedir-spec/latest/ar01s03.html How difficult would be to make freeciv to look for this variables? (Does this means freeciv should think about both $XDG_CONFIG_HOME/freeciv and $HOME/.freecivrc?) [Default for XDG_CONFIG_HOME is $HOME/.config] PS. If nobody will protest, I would like to see support of XDG variables coming with other changes in rc files together. (Like change of default port, default tileset etc) -- Thanks, evyscr pgpbz7IER6j5Q.pgp Description: PGP signature ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 On Tue, 20 Feb 2007 22:52:23 -0800 Daniil Ivanov wrote: I made a patch for soviet.nation. Two last leaders added (Chernenko Gorbachev). Also Kollontai was added, soviet diplomat and social feminist (as there are so few females). M.S. Gorbachov is currently living person. Chernenko was, well, not so good _leader_. That is why they were not in list. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36516) soviet.nation patch
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36516 On Thu, 22 Feb 2007 Christian Knoke wrote: [skip/] I think that leaders who are still alive, but definitely out of business, should be free for inclusion in the rulesets. Out of business might be an argueable definition (Gorbachev is, Prodi is not) but I think we can solve it. The reason to exclude active leaders is to avoid too hot political discussions about their importance. There is no need to extend this on still living ex-leaders IMHO. Yes, out of business it too non-formalistic definition. To my mind, Gorbachev still acts in social and political life of Russia (For example, his recent letter to Gates) And, FWIW, I think Gorbachev earns a mention in the ruleset. A mention - yes. Place in leader list - not now. This is my private opinion, of course. PS [2Daniel? and others]: Maybe it would be nice to have more long nation legends, that will be accessible through in-game help? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36597) problem of one leader in more than one nation [Was: Belarusian nation]
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36597 On Thu, 22 Feb 2007 Daniel Markstedt wrote: Simon Bolivar for example is in both the Venezuelan and Colombian nation (with different spellings). Seems like a semi-bug for me [now]: we have many diplomatic things which are based on leader name (and there is no another identifier for player...) And yes, we (at least me) want to change these to use nation name. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36577) PNG flags and shields do not depend on SVG files
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36577 On Thu, 22 Feb 2007 Jason Dorje Short wrote: Daniil Ivanov wrote: Hi, what is the actual reason that PNG flags and shields do not depend on SVG files and, thus, are not generated during build? Should I make a patch? Sure. Doesn't this mean that freeciv build will require something it doesn't require now? Couldn't this add problems for compilation on non-posix systems? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36577) PNG flags and shields do not depend on SVG files
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36577 On Fri, 23 Feb 2007 Daniil Ivanov wrote: On 23/02/07, Egor Vyscrebentsov wrote: Doesn't this mean that freeciv build will require something it doesn't require now? Couldn't this add problems for compilation on non-posix systems? Build will require the Inkscape. Well, then I'm strongly against this change. This should be done other way (script, possibly) and generated files should be in svn repo. What are non-posix systems? One example of non-posix system is MS Win PS. Daniil, please, set your mail client to not insert mail address in quoting. PPS. S prazdnikom ;) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#37312) [Patch] Edit map knowledge
URL: http://bugs.freeciv.org/Ticket/Display.html?id=37312 On Sun, 4 Mar 2007 Marko Lindqvist wrote: On 3/2/07, Marko Lindqvist cazfi74@ wrote: This allows editing what tiles player knows. - Updated against svn - Fixed a bug that ETOOL_PLAYER was handled as ETOOL_VISION It still makes sense to edit only your own map knowledge. For that you get visual feedback. Still, player selection menu remained in this version. So, global observer couldn't make anything now, right? Is it planned to get things working proberly with observer anywhen? I still think that editing [map/]scenario as global observer is a best way. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#35961) nation legends in help system
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35961
On Thu, 22 Feb 2007 Daniel Markstedt wrote:
On 2/22/07, Egor Vyscrebentsov evyscr@ wrote:
(...)
PS [2Daniel? and others]: Maybe it would be nice to have more long
nation legends, that will be accessible through in-game help?
Indeed. Many legends have been improved recently, and more are on the way.
Replying to this into a wishlist ticket I made for this very thing. It
should be quite trivial, programming-wise and I might give it a go
this weekend.
Attached is a pre-version of patch. Legends are used as a help text.
Only gui-xaw supported.
Ah, and main Nations section requires a better text ;)
Hope to make gui-gtk2 part at evenight.
PS. Do we want to have helptext field in data/nation/*.ruleset ?
--
Thanks, evyscr
Index: data/helpdata.txt
===
--- data/helpdata.txt (revision 12711)
+++ data/helpdata.txt (working copy)
@@ -12,7 +12,7 @@
; 'generate' = means replace this node with generated list of game
; elements; current categories are:
; Units, Improvements, Wonders, Techs,
-; Terrain, Governments
+; Terrain, Governments, Nations
;
; Within the text, the help engine recognizes a few generated tables.
; These are generated by the help engine, and inserted at the point of
@@ -1451,3 +1451,12 @@
that will arrive earlier. The only other option is to capture \
their capital.\
)
+
+[help_nations]
+name = _(Nations)
+text = _(\
+Daniel, please, write something here ;)\
+)
+
+[help_gen_nations]
+generate = Nations
Index: client/gui-xaw/menu.c
===
--- client/gui-xaw/menu.c (revision 12711)
+++ client/gui-xaw/menu.c (working copy)
@@ -246,6 +246,7 @@
{ { N_(Government), 0 }, , MENU_HELP_GOVERNMENT, 0 },
{ { N_(Happiness), 0}, , MENU_HELP_HAPPINESS, 0 },
{ { N_(Space Race), 0 }, , MENU_HELP_SPACE_RACE, 0 },
+{ { N_(Nations), 0 }, , MENU_HELP_NATIONS, 0 },
{ { 0 }, , MENU_SEPARATOR_LINE, 0 },
{ { N_(Copying), 0 }, , MENU_HELP_COPYING, 0 },
{ { N_(About), 0}, , MENU_HELP_ABOUT, 0 },
@@ -882,6 +883,9 @@
case MENU_HELP_SPACE_RACE:
popup_help_dialog_string(HELP_SPACE_RACE_ITEM);
break;
+ case MENU_HELP_NATIONS:
+popup_help_dialog_string(HELP_NATIONS_ITEM);
+break;
case MENU_HELP_COPYING:
popup_help_dialog_string(HELP_COPYING_ITEM);
break;
Index: client/gui-xaw/menu.h
===
--- client/gui-xaw/menu.h (revision 12711)
+++ client/gui-xaw/menu.h (working copy)
@@ -129,6 +129,7 @@
MENU_HELP_GOVERNMENT,
MENU_HELP_HAPPINESS,
MENU_HELP_SPACE_RACE,
+ MENU_HELP_NATIONS,
MENU_HELP_COPYING,
MENU_HELP_ABOUT,
Index: client/gui-xaw/helpdlg.c
===
--- client/gui-xaw/helpdlg.c (revision 12711)
+++ client/gui-xaw/helpdlg.c (working copy)
@@ -1059,6 +1059,25 @@
XtVaSetValues(help_text, XtNstring, buf, NULL);
}
+/
+ ...
+/
+static void help_update_nation(const struct help_item *pitem,
+ char *title,
+ struct nation_type *pnation)
+{
+ char buf[4096];
+
+ if (!pnation) {
+strcat(buf, pitem-text);
+ } else {
+helptext_nation(buf, sizeof(buf), pnation, pitem-text);
+ }
+ create_help_page(HELP_TEXT);
+ set_title_topic(pitem);
+ XtVaSetValues(help_text, XtNstring, buf, NULL);
+}
+
/**
...
**/
@@ -1096,6 +1115,9 @@
case HELP_GOVERNMENT:
help_update_government(pitem, top, find_government_by_name(top));
break;
+ case HELP_NATION:
+help_update_nation(pitem, top, find_nation_by_name(top));
+break;
case HELP_TEXT:
default:
/* it was a pure text item */
Index: client/include/helpdlg_g.h
===
--- client/include/helpdlg_g.h (revision 12711)
+++ client/include/helpdlg_g.h (working copy)
@@ -15,7 +15,7 @@
enum help_page_type { HELP_ANY, HELP_TEXT, HELP_UNIT, HELP_IMPROVEMENT,
HELP_WONDER, HELP_TECH, HELP_TERRAIN,
- HELP_GOVERNMENT, HELP_LAST };
+ HELP_GOVERNMENT, HELP_NATION, HELP_LAST };
void popup_help_dialog_string(const char *item);
void popup_help_dialog_typed(const char *item, enum help_page_type);
@@ -38,6 +38,7 @@
#define HELP_GOVERNMENT_ITEM Government
#define HELP_HAPPINESS_ITEM Happiness
#define HELP_SPACE_RACE_ITEM Space Race
+#define HELP_NATIONS_ITEM Nations
#define
Re: [Freeciv-Dev] (PR#37393) Extended Latin in leader names
URL: http://bugs.freeciv.org/Ticket/Display.html?id=37393 On Sun, 4 Mar 2007 Per I. Mathisen wrote: On Sat, 3 Mar 2007, Daniel Markstedt wrote: Wouldn't the obvious solution be to simply use the /take command with nation names, instead of player names? Nation names differ depending on the server's locale, so the command must be matched with the 'gettexted' name. Isn't it possible to use /take before nations are assigned? It is possible. Playing with non-ASCII character is a bad idea. I'm for having ASCII-only identifier. There are several variants when something (gettext or freeciv code) doesn't work properly. Server console on Windows with CP1251 could be an example - it does not recode text from KOI8-R po. And there are problems with non-utf8 locale and utf8 name - recoding of full string is broken in this case. I will even prefer to work with numeric id of player if there is no other way. PS. Translated names should be back-translated before sending to server (if we work with client). So this seems like a bad idea too. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#38190) Gui-xaw compiler warning
URL: http://bugs.freeciv.org/Ticket/Display.html?id=38190
On Thu, 15 Mar 2007 Marko Lindqvist wrote:
cc1: warnings being treated as errors
../../../src.patched/client/gui-xaw/cma_fe.c: In function 'remove_preset_yes':
../../../src.patched/client/gui-xaw/cma_fe.c:465: warning: cast from
pointer to integer of different size
x86_64? Can attached patch help?
--
Thanks, evyscr
--- cma_fe.c.orig 2007-02-04 18:18:46 +0300
+++ cma_fe.c 2007-03-15 15:37:26 +0300
@@ -462,7 +462,7 @@
static void remove_preset_yes(Widget w, XtPointer row,
XtPointer call_data)
{
- cmafec_preset_remove((int)row);
+ cmafec_preset_remove(XTPOINTER_TO_INT(row));
update_cma_preset_list();
destroy_message_dialog(w);
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#35961) [wishlist] nation legends in help system
URL: http://bugs.freeciv.org/Ticket/Display.html?id=35961 On Thu, 15 Mar 2007 Daniel Markstedt wrote: [evyscr - Wed Mar 14 17:01:14 2007]: On Mon, 12 Mar 2007 01:14:42 -0800 Egor Vyscrebentsov wrote: Attached is a pre-version of patch. Legends are used as a help text. Only gui-xaw supported. Ah, and main Nations section requires a better text ;) PS. Do we want to have helptext field in data/nation/*.ruleset ? Maybe this could serve as (a brief) helptext: Each player in the game is represented by a nation. A nation could be a modern-day nation state, a historical region or empire, an ethnic group, or even a fictional nation. Your goal as the player is to vanquish other nations and lead your nation to world domination! Last sentence could be wrong for scenario (or for special victory requirements). And I would like to see notice, that nations now have no differences (advantages and drawbacks) in gameplay meaning. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#36577) PNG flags and shields do not depend on SVG files
URL: http://bugs.freeciv.org/Ticket/Display.html?id=36577 On Thu, 15 Mar 2007 21:18:38 -0800 Daniil Ivanov wrote: I have finally made those changes :) It is not going to change any default behavior. It just will be useful for people, who are adding their own flags at a build stage. The rule is applied only in case there is no PNG files or they have an earlier modification date than SVG file. I would like these to be called non-automatically, but by something like 'make update-png' (inspired by 'make update-po'). And like 'make update-po' it can be called by 'make dist' rather than regular 'make'. Btw, what script do if there is no inkscape in system? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] FR: knowlege base about changes that affected all gui-*
Good daytime! Now I can't find a way to _easy_ get information about changes in the code, that affected gui-specific code, from one date up to other. If there is no better way to do it, I will suggest to have a wiki page on which such changes would be written (with links to PR# or even to commited patch). -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39332) lt.po is broken! (S2_1)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39332 Good daytime! branches/S2_1 Revision: 12914 `make dist` failed due to: lt.po:9412: number of format specifications in 'msgid' and 'msgstr' does not match Therefore snapshot building does not work... So I ask Andrius Stikonas to fix lt.po as soon as possible. PS. All po files are regenerated during `make dist` so line number may differ. Problem lines: #. TRANS: Republic of the Polish #: client/text.c:1095 #, c-format msgid %s of the %s msgstr .; PPS. `msgfmt -c lt.po` shows all problems. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#8398) Re: Bug: cease-fires can't be extended
URL: http://bugs.freeciv.org/Ticket/Display.html?id=8398 On Thu, 17 May 2007 Per I. Mathisen wrote: On Thu, 17 May 2007, William Allen Simpson wrote: Perhaps the count value should be negotiable, just like gold value? Perhaps. But I do not think that cease fires are negotiations of the sort we agree to keep peace in X turns, and then we go to war against each other again, unless we become friends in the meantime. So if there is a possibility of infinite cease fires, I bet almost everyone would use that, leaving the countdown largely superfluous. We agree to continue our cease-fire for next five years. Year 160.(3?), russian-polish agreement. Peace (Eternal Peace) treatement was subscribed in 1686 only. There were many similar examples in history. Also, please note that this countdown can be useful in scenarios. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39530) Wonders don't allow units
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39530 On Thu, 23 Aug 2007 Marko Lindqvist wrote: Actual problem is that unit improvement requirement has no ruleset defined range. Building is always required in City range. This is what we usually want for normal buildings, and for some wonders. Just changing hardcoded range to be Player for wonders would replace bug with another. Do we want *all* the wonders to provide unit building abilities in all cities? No, please. Several wonders may affect all the nation (or even world), several may affect only one city. Why this should differ for units? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#10775) incomplete helptext
URL: http://bugs.freeciv.org/Ticket/Display.html?id=10775 On Mon, 27 Aug 2007 03:46:50 -0700 Daniel Markstedt wrote: [jdorje - Fri Oct 29 02:40:45 2004]: Building reqs are not shown in the in-game help. For instance cathedral requires temple: this is shown under the helptext for temple but not for cathedral. Ideally, this kind of information should be automatically generated from the ruleset. Surely. The only way (to my mind). But as a temporary solution, I could add them manually to the helptexts. What do you say? No, don't do it. Temporary means forever too often. Well, my solution is temporary too :( But your decision will cost so much when you decide to change requirements. IMHO, we need to rewrite requirements part of help dialog(*). While this isn't done, attached patch (alpha-version)(**) add requirements notes to the helptext. = (*) Help dialog in gui-gtk-2.0 (I didn't look at others yet) has wrong design, assuming there is only one requirement. (There is a cycle for all requirements, but it breaks at first match...) (**) Patch adds lines like: Requires (Tech): Monotheism Requires (Building): Temple to the _building_ helptext. (Should I extend this to all other helptexts?) Helper function get_req_source_type_name is added, requirement types names are marked for translation (about 13 new lines in *.po (***).) (***) cityrepdata.c:445 contains N_(Special), which seems should to be something else (it is about specialists, not about specials.) Other intersections seems to be OK. Patch was against branches/S2_1 rev. 13411. Opinions, comments? -- Thanks, evyscr s2_1-helptext.diff Description: Binary data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39545) [Patch] Up to date freeciv.spec.in
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39545 On Wed, 29 Aug 2007 Marko Lindqvist wrote: On 29/08/2007, Egor Vyscrebentsov wrote: PS. It seems to me that we may move away from alternatives, assuming that civclient is always gui-gtk-2.0 client. However, I had some thoughts about making civclient a wrapper that will try to find and start clients in our order. (Well, it can be created for *nix systems, not for win*; but we don't have rpm for win* :), so that shouldn't be a problem if we'll have patch, applying in spec.) Maybe there is more general solution. For testing compilation of all the clients after source changes, I considered modifying --enable-client configure option to support something like '--enable-client=gtk,sdl,xaw' or '--enable-client=all'. This is one of my dreams. 'all' is too much, but having more than one client built by one 'make' is really what I like to have. Then civclient would just start some certain gui-binary (maybe just as symbolic link to that particular gui-binary) Seems to be too much work for small gain, though. Well, now I know only two guys (besides specs) who use build out of srcdir. So build out of srcdir might be considered as 'too much work for small gain' too ;) Seriously, I think, making more than one client feature is more than it seems to be now. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39637) Typo in server/cityturn.c
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39637 On Thu, 30 Aug 2007 Joan Creus wrote: The variable name has sneaked into the string, I think. It says pimprove sold! when it should be improvement sold. See diff. Didn't it was decided that we need to use word 'building' instead of 'improvement'? Good catch, anyway. Thank you! (It was said some time ago that word 'improvement' should be used for tile's improvement rather than city's, that should use word 'building'.) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39642) en_US.po
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39642 On Fri, 31 Aug 2007 Marko Lindqvist wrote: Changing translatable strings in stable branch is bad. So we don't do it for minor things like typofixes. We can't help those typos etc appearing when gettext is not used, or there is no translation in used language. But we could at least provide typofixed 'translation' as en_US.po. That po would need translation only to those couple of strings we don't want to use in their current default form. ... Opinions? One moment/problem: original string is shown if untranslated for _any_ translation... [JT] Keeping strings unchangeable should never become a target in itself. We're afraid that people will not correct translation after release? But what is current statistics on .po-files? Only several full translated files... Rather than moratoring changing, it is better (IMHO) to create good mechanism to tell a translator what was changed (in i18n/l10n) between two versions (or, even better, since last .po modify date.) [/JT] I'm not against en_US.po, but I don't see much perspective... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39655) [Patch] Fix S2_0 compiler warnings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39655 On Sat, 1 Sep 2007 Marko Lindqvist wrote: New compiler... Please, mention compiler name and version ;) (gcc 4.2 had (and maybe still has) several problems [not only with freeciv, of course].) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#10775) incomplete helptext
On Tue, 28 Aug 2007 11:05:28 -0700 Marko Lindqvist wrote:
On 28/08/07, Egor Vyscrebentsov evyscr@ wrote:
On Mon, 27 Aug 2007 03:46:50 -0700 Daniel Markstedt wrote:
But as a temporary solution, I could add them manually to
the helptexts. What do you say?
No, don't do it. Temporary means forever too often. Well, my
solution is temporary too :( But your decision will cost so much when
you decide to change requirements.
My opinions about whole help text situation regarding 2.1.0:
1) Help texts for official rulesets have to be correct and complete
before we can release 2.1.0.
Surely.
2) When possible without losing clarity, help texts should be
automatically generated.
Agree. When possible and hot so hard. So I'm going to make patch for
wonders, units (whatever needs reqs helptext.)
3) We should not postpone 2.1.0 for implementing automatically
generated help texts.
See answer to p.2 :)
IMHO, we need to rewrite requirements part of help dialog(*). While
this isn't done, attached patch (alpha-version)(**) add requirements
notes to the helptext.
This is step towards automatically generated help texts, and as such
improvement over current situation (at least this solution should go
in before 2.1.0).
Version 2 of patch. Working, looks not so awful. (I ask to apply
requirements.[ch] part as soon, as it allowed - we need those translations
of requirements types.)
Something much better is required for 2.2.
Any thoughts? I have no idea now on what the help page will be in 2.2.
So we need to decide before implementing. Daniel, DB (if you're here),
all others - what's your vision?
--
Thanks, evyscr
Index: common/requirements.c
===
--- common/requirements.c (revision 13411)
+++ common/requirements.c (working copy)
@@ -29,19 +29,19 @@
/* Names of source types. These must correspond to enum req_source_type in
* requirements.h. Do not change these unless you know what you're doing! */
static const char *req_source_type_names[] = {
- None,
- Tech,
- Gov,
- Building,
- Special,
- Terrain,
- Nation,
- UnitType,
- UnitFlag,
- UnitClass,
- OutputType,
- Specialist,
- MinSize
+ N_(None),
+ N_(Tech),
+ N_(Gov),
+ N_(Building),
+ N_(Special),
+ N_(Terrain),
+ N_(Nation),
+ N_(UnitType),
+ N_(UnitFlag),
+ N_(UnitClass),
+ N_(OutputType),
+ N_(Specialist),
+ N_(MinSize)
};
/* Names of requirement ranges. These must correspond to enum req_range in
@@ -1058,3 +1058,15 @@
return buf;
}
+
+/
+ Make user-friendly text for the source type name. The text is put into
+ a user buffer which is also returned.
+*/
+char *get_req_source_type_name(const struct req_source *psource,
+ char *buf, size_t bufsz)
+{
+ buf[0] = '\0'; /* to be safe. */
+ cat_snprintf(buf, bufsz, _(req_source_type_names[psource-type]));
+ return buf;
+}
Index: common/requirements.h
===
--- common/requirements.h (revision 13411)
+++ common/requirements.h (working copy)
@@ -141,5 +141,7 @@
const struct req_source *psource2);
char *get_req_source_text(const struct req_source *psource,
char *buf, size_t bufsz);
+char *get_req_source_type_name(const struct req_source *psource,
+ char *buf, size_t bufsz);
#endif /* FC__REQUIREMENTS_H */
Index: client/helpdata.c
===
--- client/helpdata.c (revision 13411)
+++ client/helpdata.c (working copy)
@@ -645,6 +645,7 @@
.type = REQ_BUILDING,
.value = {.building = which}
};
+ bool has_req = FALSE;
assert(buf);
buf[0] = '\0';
@@ -656,10 +657,29 @@
imp = improvement_by_number(which);
+
if (imp-helptext imp-helptext[0] != '\0') {
cat_snprintf(buf, bufsz, %s\n\n, _(imp-helptext));
}
+ requirement_vector_iterate(imp-reqs, preq) {
+char req_buf[512], reqt_buf[128];
+
+cat_snprintf(buf, bufsz,
+ _(Requires (%s): %s\n),
+ get_req_source_type_name(preq-source, reqt_buf,
+ sizeof(reqt_buf)),
+ get_req_source_text(preq-source, req_buf,
+ sizeof(req_buf)));
+has_req = TRUE;
+ } requirement_vector_iterate_end;
+
+ if (has_req) {
+cat_snprintf(buf, bufsz, \n);
+ } else {
+/*cat_snprintf(buf, bufsz, _(Requires: Nothing\n\n));*/
+ }
+
if (tech_exists(improvement_by_number(which)-obsolete_by)) {
cat_snprintf(buf, bufsz,
_(* The discovery of %s will make %s obsolete.\n),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39642) en_US.po
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39642 On Mon, 3 Sep 2007 06:30:59 -0700 Egor Vyscrebentsov wrote: One moment/problem: original string is shown if untranslated for _any_ translation... [JT] Rather than moratoring changing, it is better (IMHO) to create good mechanism to tell a translator what was changed (in i18n/l10n) between two versions (or, even better, since last .po modify date.) [/JT] Still think so. I'm not against en_US.po, but I don't see much perspective... OK, I take back last sentence. Right now I see that en_US may help in translations like for the req_source_type_names (where text in code and text, displayed to user, may [not necessary should] differ.) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#10775) incomplete helptext
URL: http://bugs.freeciv.org/Ticket/Display.html?id=10775
On Mon, 3 Sep 2007 17:12:58 -0700 Egor Vyscrebentsov wrote:
Version 2 of patch. Working, looks not so awful.
All had been written before us - helpdata.c#insert_requirement()
Double \n\n at the end of every req line looks not good though.
I suggest to remove one. (At trunk, at least.)
_This_ patch is ready for inclusion into S2_1, however.
PS. I want to resurrect an old good tradition of commiting patch
by not an author, so I'm not going to commit this patch myself.
--
Thanks, evyscr
Index: client/helpdata.c
===
--- client/helpdata.c (revision 13508)
+++ client/helpdata.c (working copy)
@@ -645,6 +645,7 @@
.type = REQ_BUILDING,
.value = {.building = which}
};
+ bool has_req = FALSE;
assert(buf);
buf[0] = '\0';
@@ -655,11 +656,24 @@
}
imp = improvement_by_number(which);
-
+
if (imp-helptext imp-helptext[0] != '\0') {
cat_snprintf(buf, bufsz, %s\n\n, _(imp-helptext));
}
+ requirement_vector_iterate(imp-reqs, preq) {
+insert_requirement(preq, buf, bufsz);
+has_req = TRUE;
+ } requirement_vector_iterate_end;
+
+#if 0
+ if (has_req) {
+cat_snprintf(buf, bufsz, \n);
+ } else {
+/*cat_snprintf(buf, bufsz, _(Requires: Nothing\n\n));*/
+ }
+#endif
+
if (tech_exists(improvement_by_number(which)-obsolete_by)) {
cat_snprintf(buf, bufsz,
_(* The discovery of %s will make %s obsolete.\n),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39374) Re: (PR#39644) auth warnings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39374 On Thu, 6 Sep 2007 Marko Lindqvist wrote: On 03/09/07, Egor Vyscrebentsov wrote: In theory, it may causes troubles, but I don't have them (yet). And I didn't test tutorial... Did you mean this to go in or just to be available for anybody to use locally? (It helps, thanks!) I see no reason to commit this (due to influence of moving to lua5.1), but we may mention about it in doc/BUGS, for example. --enable-debug on x86_64 seems to be used rarely. PS. In lua5.1 LUAI_UMEM - size_t is used. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#10775) incomplete helptext
URL: http://bugs.freeciv.org/Ticket/Display.html?id=10775 On Thu, 6 Sep 2007 Marko Lindqvist wrote: On 06/09/07, Egor Vyscrebentsov wrote: All had been written before us - helpdata.c#insert_requirement() That's good for S2_1 at least. Some parts of your earlier patches would help, if we try to produce a bit more concise help texts in the future. Double \n\n at the end of every req line looks not good though. I suggest to remove one. (At trunk, at least.) At trunk: definitely. Not sure about S2_1. 9 lines change. I think that they look too not good to be kept. Ready to change all translations, which are not actively maintained. (Once again: IMHO, we shouldn't count string frozing as a holy cow; giving translators knowledge of changes has much sense.) Should add one after whole requirement block (unless it is empty). _This_ patch is ready for inclusion into S2_1, however. We have to decide what to do with that outcommented block. Either we use it, or we remove it (in which case that meaningless has_req variable must go also). Sure. I prefer first variant. If we keep it, I suggest text to say Always available. obsolete_by... If we can replace all the obsolete_by with negated requirement, than your suggestion should come into. But this is not for S2_1... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#10775) incomplete helptext
URL: http://bugs.freeciv.org/Ticket/Display.html?id=10775
On Fri, 7 Sep 2007 Marko Lindqvist wrote:
On 07/09/07, Egor Vyscrebentsov wrote:
On Thu, 6 Sep 2007 Marko Lindqvist wrote:
On 06/09/07, Egor Vyscrebentsov wrote:
Double \n\n at the end of every req line looks not good though.
I suggest to remove one. (At trunk, at least.)
At trunk: definitely. Not sure about S2_1.
9 lines change. I think that they look too not good to be kept.
They are problem only when there are multiple requirements, which is
rare situation. But yes, we have to touch many help dialog strings
before we can release 2.1.0, so translators need to check them anyway.
So done for S2_1.
Should add one after whole requirement block (unless it is empty).
_This_ patch is ready for inclusion into S2_1, however.
We have to decide what to do with that outcommented block. Either we
use it, or we remove it (in which case that meaningless has_req
variable must go also).
Sure. I prefer first variant.
Ok, will you update the patch?
Attached. Removed second \n symbols, used Requires: Nothing when
no reqs found.
PS. Surprisingly, I don't see requirements for governments to be shown
(at least in gtk client...) Investigating.
--
Thanks, evyscr
Index: client/helpdata.c
===
--- client/helpdata.c (revision 13508)
+++ client/helpdata.c (working copy)
@@ -163,51 +163,51 @@
case REQ_LAST:
break;
case REQ_TECH:
-cat_snprintf(buf, bufsz, _(Requires the %s technology.\n\n),
+cat_snprintf(buf, bufsz, _(Requires the %s technology.\n),
advance_name_for_player(game.player_ptr, req-source.value.tech));
return;
case REQ_GOV:
-cat_snprintf(buf, bufsz, _(Requires the %s government.\n\n),
+cat_snprintf(buf, bufsz, _(Requires the %s government.\n),
government_name_translation(req-source.value.gov));
return;
case REQ_BUILDING:
-cat_snprintf(buf, bufsz, _(Requires the %s building.\n\n),
+cat_snprintf(buf, bufsz, _(Requires the %s building.\n),
improvement_name_translation(req-source.value.building));
return;
case REQ_SPECIAL:
-cat_snprintf(buf, bufsz, _(Requires the %s terrain special.\n\n),
+cat_snprintf(buf, bufsz, _(Requires the %s terrain special.\n),
special_name_translation(req-source.value.special));
return;
case REQ_TERRAIN:
-cat_snprintf(buf, bufsz, _(Requires the %s terrain.\n\n),
+cat_snprintf(buf, bufsz, _(Requires the %s terrain.\n),
terrain_name_translation(req-source.value.terrain));
return;
case REQ_NATION:
-cat_snprintf(buf, bufsz, _(Requires the %s nation.\n\n),
+cat_snprintf(buf, bufsz, _(Requires the %s nation.\n),
nation_name_translation(req-source.value.nation));
return;
case REQ_UNITTYPE:
-cat_snprintf(buf, bufsz, _(Only applies to %s units.\n\n),
+cat_snprintf(buf, bufsz, _(Only applies to %s units.\n),
utype_name_translation(req-source.value.unittype));
return;
case REQ_UNITFLAG:
-cat_snprintf(buf, bufsz, _(Only applies to %s units.\n\n),
+cat_snprintf(buf, bufsz, _(Only applies to %s units.\n),
unit_flag_rule_name(req-source.value.unitflag));
return;
case REQ_UNITCLASS:
-cat_snprintf(buf, bufsz, _(Only applies to %s units.\n\n),
+cat_snprintf(buf, bufsz, _(Only applies to %s units.\n),
uclass_name_translation(req-source.value.unitclass));
return;
case REQ_OUTPUTTYPE:
-cat_snprintf(buf, bufsz, _(Applies only to %s.\n\n),
+cat_snprintf(buf, bufsz, _(Applies only to %s.\n),
get_output_name(req-source.value.outputtype));
return;
case REQ_SPECIALIST:
-cat_snprintf(buf, bufsz, _(Applies only to %s.\n\n),
+cat_snprintf(buf, bufsz, _(Applies only to %s.\n),
_(get_specialist(req-source.value.specialist)-name));
return;
case REQ_MINSIZE:
-cat_snprintf(buf, bufsz, _(Requires a minimum size of %d.\n\n),
+cat_snprintf(buf, bufsz, _(Requires a minimum size of %d.\n),
req-source.value.minsize);
return;
}
@@ -645,6 +645,7 @@
.type = REQ_BUILDING,
.value = {.building = which}
};
+ bool has_req = FALSE;
assert(buf);
buf[0] = '\0';
@@ -655,11 +656,22 @@
}
imp = improvement_by_number(which);
-
+
if (imp-helptext imp-helptext[0] != '\0') {
cat_snprintf(buf, bufsz, %s\n\n, _(imp-helptext));
}
+ requirement_vector_iterate(imp-reqs, preq) {
+insert_requirement(preq, buf, bufsz);
+has_req = TRUE;
+ } requirement_vector_iterate_end;
+
+ if (has_req) {
+cat_snprintf(buf, bufsz, \n);
+ } else {
+cat_snprintf(buf, bufsz, _(Requires: Nothing\n\n));
+ }
+
if (tech_exists(improvement_by_number(which)-obsolete_by)) {
cat_snprintf(buf, bufsz,
_(* The discovery of %s will make %s obsolete.\n),
@@ -1264,6 +1276,7 @@
.type = REQ_GOV,
.value = {.gov = gov }
};
+ bool has_req = FALSE;
buf
[Freeciv-Dev] S2_1: make dist is broken out of a box [Was: [Freeciv-commits] r13524]
On Fri, 07 Sep 2007 16:23:41 - Marko Lindqvist wrote: Author: cazfi Date: Fri Sep 7 18:23:40 2007 New Revision: 13524 See #39669 Modified: branches/S2_1/common/events.c branches/S2_1/common/events.h branches/S2_1/data/stdsounds.soundspec branches/S2_1/server/scripting/api.pkg This change cause snapshots tarball making to break. No errors in this commit, every change of api.pkg will break 'make dist': tolua is not made. One more reason I'm againt of just removing generated files from svn. (Not that our Makefiles are ok, though) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39642) en_US.po
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39642
On Mon, 10 Sep 2007 06:01:34 -0700 William Allen Simpson wrote:
I strongly disagree with the creation of en_US.po
Strings that exist, and need trivial fixing for grammar (not content),
should be updated in both the code source and *all* the translation *.po
keys.
I'm agree that en_US.po is not a silver bullet. But I think neither you
nor me nor somebody else can't fix all translation changes. Simple
fix in english may become very untrivial task in other language.
('%2s %1s' for [quite easy] example)
It's easy to do, and there's no effort needed by translators
That's how I've been handling it already. Surely, we all have sed, or
its GUI equivalent?!?!
Erm, is it right that it's easy? I'm sure that I *never* placed 'msgid'
twice in one line. But once I've fixed that. See also Marko's fixes
of fuzzies. And sed never was a translation tool! Marking string
as fuzzy is more fair thing that to change it manually (or automatically
not by 'make update-po' [*]) without giving translator a notice.
[*] And update-po changes only msgids, marking string as fuzzy.
But this is not about en_US.po.
Strings that change in content and semantics have to be vetted by
translators anyway, having en_US.po doesn't help!
Agree.
But you may look to my second answer in this ticket.
And you may find sentences in archive of the list that english is
not the ideal language for freeciv, but we have no better.
--
Thanks, evyscr
___
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 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? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#13121) Bug: translated string doesn't fit
URL: http://bugs.freeciv.org/Ticket/Display.html?id=13121 On Sun, 7 Oct 2007 03:41:54 -0700 Daniel Markstedt wrote: [taraskostiak - Mon May 16 18:22:19 2005]: Hi. When Ukrainian localisation is runned(FreeCiv 2.0.0): in city view - translated 'Units Supported' and 'Units Present' is too long and you see only the half of that message. I suggest to make longer String limit for that. Tested with nl, sv, pt, uk, ru, and ja on S2_1: nl, sv, pt works fine. uk, ru, ja are more or less truncated. My guess is that the string container variable is to small for the more memory-demanding Cyrillic/Japanese letters. Seems to me, the situation is worse. We work with internal UTF-8 data (multi-byte characters), but store them as single-byte characters... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39771) Freeciv .desktop files
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39771 Good daytime! As I said early, current freeciv.desktop is not proper. Attached are freeciv-server.desktop.in and patch to freeciv.desktop.in (and configure/Makefile.) Changed categories, removed version, removed extension of icons (allow to use not .png only.) IMHO, ready to commit. And i want it to be commited before 2.1.0 release. -- Thanks, evyscr freeciv-server.desktop.in Description: Binary data s2_1-desktops.diff Description: Binary data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#10284) [Request] Docs: distribute FAQ into freeciv/docs/
URL: http://bugs.freeciv.org/Ticket/Display.html?id=10284 On Fri, 28 Sep 2007 00:55:40 -0700 Daniel Markstedt wrote: [evyscr - Mon Jan 23 17:17:10 2006]: [evyscr - Sep 23 20:12:58 2004]: It would be nice to see FAQ file in freeciv distribution, wouldn't it? New version. * uses lynx instead of links * writes numbers at answers Generated text also available at http://evyscr.murom.net/freeciv/my/scripts/FAQ Opinions/suggestions? PS I'm not a perl coder, so if^Wwhen you see errors/stupidity/etc, please, give a right variant too :) Looks good to me! New version of script and generated FAQ file are attached (corrected script due to layout changes.) Actually, I'd prefer if most of the documents in doc/ were generated from wiki pages. It would be far more convenient to maintain all documentation in wiki and then generate plaintext versions to be distributed right before a release is made. With proper layout it wouldn't be too hard to made similar scripts for all of this pages. -- Thanks, evyscr fcgetfaq.pl Description: Binary data FAQ.gz Description: GNU Zip compressed data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39769) opendesktop icons
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39769 On Thu, 11 Oct 2007 14:44:07 -0700 Daniel Markstedt wrote: From: Egor Vyscrebentsov evyscr Date: Oct 12, 2007 1:05 AM Subject: Re: [Freeciv-Dev] Freeciv Icons To: freeciv-dev@gna.org On Thu, 11 Oct 2007 07:51:52 +0900 Daniel Markstedt wrote: Hi Egor, Since I really want you to resolve that opendesktop profile thing, I prepared an icon pack for ya. Sizes are 16,32,48,64,128 px set for client and server. Attached are: 1) data/icons subdirectory 2) patch for configure.ac/Makefile.am icons/Makefile.am is based on gnome-games/icons Makefile adapted to our server/client separation. TODO (not sure this is really needed): add .svg to $datadir/icons/hicolor/scalable/apps I am going to commit this in 24 hours if there will be no protests. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Experimental ruleset (was: RFC civ3-like land support)
On Fri, 26 Oct 2007 14:21:50 +0900 Daniel Markstedt wrote: On this topic, but not for this ticket: I'd like to have an 'experimental' ruleset in svn, where all newly implemented features in the code are put to use! If a feature is not visibile in any ruleset, it will be forgotten just like bombardment. +100. I wonder why this wasn't done years ago... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39734) unittype translation need qualifier
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39734 On Sun, 4 Nov 2007 15:06:35 -0800 Daniel Markstedt wrote: [dmarks - Sun Sep 30 07:53:23 2007]: On 9/29/07, Egor Vyscrebentsov [EMAIL PROTECTED] wrote: Good daytime! Unittype strings have contradictions with rulesets (for Helicopter and Nuclear.) This words seems to have different sense in unittype and units ruleset. (At least, in russian.) So I ask for using Q_() qualifiers for unittype strings. Would be useful for Swedish too, so you have my support. Untested patch against S2_2. There is no need to add qualifiers to both entities, IMHO. I think, it would be enough to qualify unittypes only. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39842) rulesetdir in already started game, gui-gtk-2.0 and nation_of_player/bounds_check_nation
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39842 Good daytime! branches/s2_1, r13919 Start a game, say 'read civ2.serv' while game is already started and see gui-gtk segfault... Say 'quit' and see segfault of civserver... Reason: nations are already freed when nation_of_player() is called. And both nation_of_player() and bounds_check_nation() don't check for nation is NULL. Questions: 1. Why 'rulesetdir' isn't disallowed in already started game? 2. How to fix usage of nation_of_player()? [ie, what way is better?] 3. Is there a reason not to have a check in bounds_check_nation()? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39842) rulesetdir in already started game, gui-gtk-2.0 and nation_of_player/bounds_check_nation
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39842
On Wed, 7 Nov 2007 12:56:25 -0800 Egor Vyscrebentsov wrote:
Good daytime!
branches/s2_1, r13919
Start a game, say 'read civ2.serv' while game is already started and see
gui-gtk segfault... Say 'quit' and see segfault of civserver...
Not gtk2-specific, but common client problem, of course.
Reason: nations are already freed when nation_of_player() is called.
And both nation_of_player() and bounds_check_nation() don't check for
nation is NULL.
Attached patch makes civ{server,client} at least show an error rather
than segfaulting.
Questions:
1. Why 'rulesetdir' isn't disallowed in already started game?
Still need an answer. Since several settings with similar effect are
disallowed during the game, this command should be disallowed too.
And I think this is a core of current bug, but it will be nice if our
functions will work even with wrong parameters at input.
2. How to fix usage of nation_of_player()? [ie, what way is better?]
More hard question. Now this function call die() if bounds check
is not passed. I'm not sure that this is right reaction in all ways.
Maybe there could be a parameter, say 'allow_null_nation', that will
has default value FALSE? Or we are sure that there is no and will be
no variants when nation may absent? (I don't know yet how this work
with observers.)
Any thoughts?
3. Is there a reason not to have a check in bounds_check_nation()?
Ok, no reason, I guess. Added in patch, returns FALSE.
PS. Message This setting can't be modified after the game has started.
looks badly than Setting '%s' can't be modified ... when loading
.serv file (since command doesn't shown).
--
Thanks, evyscr
Index: common/nation.c
===
--- common/nation.c (revision 13921)
+++ common/nation.c (working copy)
@@ -49,6 +49,10 @@
freelog(loglevel, %s before nations setup, func_name);
return FALSE;
}
+ if (!pnation) {
+freelog(loglevel, %s error: nation is NULL, func_name);
+return FALSE;
+ }
if (pnation-index 0
|| pnation-index = game.control.nation_count
|| nations[pnation-index] != pnation) {
@@ -252,7 +256,11 @@
{
assert(plr != NULL);
if (!bounds_check_nation(plr-nation, LOG_FATAL, nation_of_player)) {
-die(wrong nation %d, plr-nation-index);
+if (plr-nation) {
+ die(wrong nation %d, plr-nation-index);
+} else {
+ die(wrong nation: null nation);
+}
}
return plr-nation;
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39845) RFE: deterministic borders and vision
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39845 On Thu, 8 Nov 2007 William Allen Simpson wrote: Egor Vyscrebentsov wrote: Does this mean that there will never be other source than city? (I can't see place for fortresses in this algorithm.) Even in the current code, the test for cities and fortresses et alia is in the same place. To me the main difference (in results) of your algorithm is that it doesn't fill all tiles (all border sources, if be more accurate.) Current code doesn't require city to be the source of border in tile where the fortress stays. Maybe there can be other iterator than city, say border_sources_iterator. (where border_source is union, for example.) [I understand that this has its own contras.] Can influence function be scriptable? Probably. But since that would slow it down to a crawl, I'm not sure anybody would desire it. I know that I want too much :) But what I really want is that the code will support idea that this function _may_ become scriptable _someday_ and will not require massive rewriting when/if this day will come. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39866) Tracking 2.1.1 release
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39866 On Sat, 24 Nov 2007 17:54:15 -0800 William Allen Simpson wrote: Thought I'd report that the x11 client still compiles and runs. Unfortunately, I don't seem to remember how to get it running a game Connecting to already started server and pressing Start button should be enough. :) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39849) strcasestr warning
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39849 On Fri, 9 Nov 2007 22:26:56 -0800 Jason Dorje Short wrote: Jason Dorje Short wrote: William Allen Simpson wrote: Naive trunk implementation: Naive is fine but you forgot to add the check to configure.ac. Attached patch does that. But now it still won't compile, and I don't understand why. Still strange. Delving into the preprocessor, if I just throw a -E on to the above line the resulting file has no prototype for the function at all. Yet it is clearly present in the header, surrounded by #ifdef __USE_GNU which is presumably being left undefined somehow in compilation while it was defined properly during the configure check. I suppose I could upload my string.h if anyone has any bright ideas. Doesn't #define _GNU_SOURCE required before including string.h to use strcasestr()? (Or have I read man 3 strcasestr wrongly?) Well, it works for me if I apply attached patch. (Note, that placing #define right before #include string.h gives no effect.) -- Thanks, evyscr Index: utility/support.c === --- utility/support.c (revision 14083) +++ utility/support.c (working copy) @@ -41,6 +41,10 @@ #include config.h #endif +#ifdef HAVE_STRCASESTR +#define _GNU_SOURCE +#endif + #include assert.h #include ctype.h #include errno.h ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39849) strcasestr warning
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39849
On Tue, 27 Nov 2007 10:10:57 -0800 Jason Short wrote:
[cazfi74 - Tue Nov 27 17:48:50 2007]:
On 27/11/2007, Marko Lindqvist wrote:
Now I got this same error in Ubuntu system.
It seems that user has to define _GNU_SOURCE for __USE_GNU to
be defined.
No idea how it always gets set at configure time.
Patch to define it both configure and compile time.
This *can't* be the right fix.
First of all, why is configure finding the function when it can't be
found by gcc later?
It doesn't give a warning about implicit function for the next file:
=
#include stdio.h
#include string.h
int main(void)
{
char *c;
c = strcasestr(123456, 45);
printf(%s, c);
}
=
However, the warning about assignment makes pointer from integer
without a cast is present until #define _GNU_SOURCE is added. It is
also _shown_ if this define placed _after_ #include stdio.h
Main thought here is that we have different includes while configuring
and while compiling, and this may affects.
We also have different gcc parameters at the configure time and at the
compile time.
Secondly, _GNU_SOURCE? Is this a real define or just something internal
to glibc? Why would strcasestr not be presented to the user by default
as the manual indicated?
Which manual?!
SYNOPSIS
#include string.h
char *strstr(const char *haystack, const char *needle);
#define _GNU_SOURCE
#include string.h
char *strcasestr(const char *haystack, const char *needle);
CONFORMING TO
The strstr() function conforms to C89 and C99. The strcasestr() func-
tion is a non-standard extension.
Honestly this looks like a glibc bug.
Don't think so.
--
Thanks, evyscr
___
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
Re: [Freeciv-Dev] (PR#39935) cities not disbanded by building engeers at 1pop.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39935 On Fri, 30 Nov 2007 23:37:40 -0800 Daniel Markstedt wrote: On Dec 1, 2007 12:13 PM, Karl Goetz kamping_kaiser wrote: Freeciv: 2.1 apt-cache policy freeciv-data freeciv-data: Installed: 2.1.0-1 Candidate: 2.1.0-1 when building an engineer in a city with a population of 1, the city is not disbanded. the 'disband city' tickbox in 'settings' has been selected. This has happened in multiple cities, both built by me or conquered. This is the correct behavior. You have to build a _settler_ to disband the city. Could you build settler when you know engineers? This behavior seems to be buggy for me - city of N size _should_ be destroyed when build any unit with population cost = N. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39935) cities not disbanded by building engeers at 1pop.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39935 On Mon, 10 Dec 2007 03:38:47 -0800 Erik Johansson wrote: On Dec 10, 2007 11:38 AM, Egor Vyscrebentsov evyscr wrote: On Fri, 30 Nov 2007 23:37:40 -0800 Daniel Markstedt wrote: On Dec 1, 2007 12:13 PM, Karl Goetz kamping_kaiser wrote: [skip/] when building an engineer in a city with a population of 1, the city is not disbanded. the 'disband city' tickbox in 'settings' has been selected. This has happened in multiple cities, both built by me or conquered. This is the correct behavior. You have to build a _settler_ to disband the city. Could you build settler when you know engineers? This behavior seems to be buggy for me - city of N size _should_ be destroyed when build any unit with population cost = N. In the CivII rulset I'm sure that is the case. In the default there is a new unit called worker that is obsoleted by egineers and these units doesn't require population to be built, settlers are never obsoleted and do require population to be built. Surely you're right (and the code is right too.) Could this be a documentation problem? I haven't found such possibility. All the entries of 'disband city' in .po are about settlers only (which is bad for me, but this is another story.) So, Karl, I ask you why you decide that building engineer should cost 1 population? Was it somewhere in docs or just by analogy with Civ2 rules? (I'm dancing with civ2 ruleset now, so this is my reason of fail.) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39749) [Bug] battle groups keys don't work
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39749 On Tue, 11 Dec 2007 08:35:09 -0800 William Allen Simpson wrote: Yes, but the question is whether control-F1 and control-shift-F1 would fix the problem on your keyboard? The code is easy Is it ok for laptops? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39996) document map/savegame format
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39996 On Sat, 29 Dec 2007 23:23:18 -0800 Daniel Markstedt wrote: The map/savegame format needs to be documented better for 2.2. It's also true for even 2.0... Rudimentary docs available at http://freeciv.wikia.com/wiki/Map_format needs to be expanded. I want to have old (pre-2.1) map format desribed too. Anybody remember it? And once again, there should be some changes in the requirement of saved parameters. For example, is there a need in map.landpercent for scenarios? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] S2_1 compilation is broken
$subj. See common/nation.c:52 Please, be sure you have successfully compiled freeciv from the same source before commiting. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] S2_1 compilation is NOT broken
On Mon, 31 Dec 2007 15:49:06 +0300 Egor Vyscrebentsov wrote: See common/nation.c:52 Forget this, `svn revert` was failed. Please, be sure you have successfully compiled freeciv from the same source before commiting. Sorry... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40023) Feature Request: add more switches to slow_down_timeline
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40023 On Wed, 16 Jan 2008 hlingler wrote: Please consider adding the following additional switches to the slow_down_timeline effect On Wed, 16 Jan 2008 William Allen Simpson wrote: Good idea. Although import of civ2 games is planned, it may not make it into 2.2, but should be in 2.3. Any opinions about http://bugs.freeciv.org/Ticket/Display.html?id=1871 ? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Freeciv - Covermount authorization for Hype!, a portuguese videogames magazine
Good day! On Wed, 16 Jan 2008 Jorge Vieira wrote: Cheers. My name is Jorge Vieira and i'm editor in chief of Hype!, a Portuguese videogames magazine. The magazine has an print run of 30.000 copies, 22.000 of them including 1 covermount DVD with full games, demos, software and other materials related to the videogames universe. We would like to know if you give us permission to include Freeciv in our DVD. We think our readers would appreciate this action and you could also benefit from the attention. There was a discussion about sources on the same disk and the result was fixed in http://freeciv.wikia.com/wiki/License You also may contact [EMAIL PROTECTED] (but I think it will give the same result) Hope this helps. -- Egor Vyscrebentsov, as one of Freeciv Development team ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40032) 2_1:server/plrhand.c:1730 should be plural
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40032 Good daytime! branches/2_1 server/plrhand.c:1730 should be plural: ... and the upstart %s now holds power in %d rebel provinces. PS. [offtopic] There are too much messages which need cases for %s... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] i18n: FR: several nation_adj
Good daytime! In some languages (f.e. russian) there are 4 genders for adjectives. For example: Polish territory - польская (polskaya) территория; Polish diplomat - польский (polskiy) дипломат; polish unit - польское (polskoye) соединение; Polish musketeers - польские (polskiye) мушкетёры. Is there any possibility to allow to use all of them? (I think that this require new X_() macro and convention about number of genders in *.nation. I'm afraid this problem couldn't be solved by gettext now...) PS. A long time ago i tried to wrote a proof of solution that used gettext plurals. It was very ugly and ineffective... PPS. I don't speak about cases, those case is really a monster. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39983) BUG: gui-xaw shows bad tiles
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39983 On Fri, 28 Dec 2007 Egor Vyscrebentsov wrote: On Sun, 23 Dec 2007 William Allen Simpson wrote: Also, note the little window above the worker at the left, the text is cut off, and doesn't scroll. When we divide text lines (PR#8737) to shorten them for translation, it will be much worse! Will be fixed ASAP. This problem appears only when compiled with debug. Reason is that there is extra line added in text.c(?) function (was mentioned by me years ago.) I didn't find proper solution for debug mode which will not break regular mode. (I don't remember what was when extra line was added in regular mode, however.) Problem line in data/Freeciv.in is (2625): Freeciv*unitinfolabel.label: \n\n\n\n\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] gui-sdl lines for translation
[Just talk] Shouldn't this message be pluralized? ;-) #: client/gui-sdl/wldlg.c:1481 #, c-format msgid (%d/%d/%d)\n %d/%d %s\n %d %s msgstr Seriously, it's hard to understand aout what this message is without looking into the code. And it seems to me that msgstr will be equal to msgid here. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40035) [Patch] Fix S2_2 xaw compilation
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40035 On Tue, 22 Jan 2008 Marko Lindqvist wrote: These includes fix S2_2 xaw-client compilation (that doesn't necessarily mean that resulting binary is any way usable - xaw-client wasn't when I last tested last autumn). It (patched client) works at least on i*86. Commited (r14280). Fixing TRUNK compilation will require more than that. Will look right now. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40038) FR: Set aifill default value to more than 1
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40038 Good daytime! In RedHat and ALTLinux distributions freeciv is patched to set aifill default to 5. To my mind, this change seems to be reasonal - it is one-step-easy to start a game with more than only one player. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40032) server/plrhand.c civil war message plural
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40032 On Wed, 23 Jan 2008 William Allen Simpson wrote: [skip/] Why the line breaks? How does the server know the best width? Or the translators know for all clients in advance? As I said early, freeciv is still NOT utf-8 application, so breaking lines in f.e. server console is more worse than it looks in the code. (For ru_RU.UTF-8 part of lines cover only half of screen width - 2 bytes/character. Easiest example - '/help' [show_help_intro]. wordwrap_string() looks to me like the root of problem in this case.) All the data stored in UTF-8 inside, right? But we still use char, strlen() etc. Aren't we supposed to use the leader name together with the nation name? It should be done. Also, I think we want to use nation name as a basis for all diplomatic things, aren't we? We tell everybody else how many cities, but not the player losing them? Oops. Sure, there is only logging, not notify... Wrong thing, to my mind. I'd like to split this into at least two messages. Sure. PS. I'm also for splitting into several messages a keyboard/mouse orders helptext from data/helptext.txt. It will a) make it much easier for translator to see changes; b) be a step towards user-defined control. But this is another story. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40045) strlen and multibytes encodings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40045
Good daytime!
At least in utility/shared.c:wordwrap_string() strlen() is used to
determine number of characters in the string. This gives wrong result
on multibytes encoding.
There are several code bases for this situation.
From (patched) Midnight Commander code:
=
size_t mbstrlen (const char *str)
{
if (SLsmg_Is_Unicode) {
size_t width = 0;
for (; *str; str++) {
wchar_t c;
size_t len;
len = mbrtowc (c, str, MB_CUR_MAX, NULL);
if (len == (size_t)(-1) || len == (size_t)(-2)) break;
if (len 0) {
int wcsize = wcwidth(c);
width += wcsize 0 ? wcsize : 0;
str += len-1;
}
}
return width;
} else
return strlen (str);
}
=
Also there is code available at
http://www.koders.com/c/fid4F30C99A88AEA6396B65ADED79AB7664C69E3500.aspx
and neighbours.
Q: Do we want to do something with current behavior? I consider it as
a bug, but maybe someone has another opinion.
--
Thanks, evyscr
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40043) Re: (PR#40045) wordwrap_string(), strlen(), and multibytes encodings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40043 On Thu, 24 Jan 2008 William Allen Simpson wrote: Egor Vyscrebentsov wrote: At least in utility/shared.c:wordwrap_string() strlen() is used to determine number of characters in the string. This gives wrong result on multibytes encoding. The issue is not strlen(). It is properly used to determine the length of a string. The issue is that strlen() has nothing to do with how much room there is for display in a particular window! From what I can see everyday, you're wrong. strlen() will return 70, while there are only, say, 40 multibyte characters. And you can't say that you have 160 char on 80-characters ru_RU.UTF-8 line. strlen() couldn't be used here. (I say this as one of ALT Linux developer. Unfortunately, most of bugs in our bugzilla are in russian, so it will not help me to show you this... Please, believe me there are a couple of [confirmed] bugs caused by usage of strlen.) strlen() may be used to get size of string, but not length. This abuse of strlen() would have been considered a stupid bug as far back as the techtronix green screen in the '70s!!! Or the DECwriters we all used for C programming back then. Let alone modern i18n The messages should be wrapped in the clients by their respective GUI code, such as gtk-text-set-word-wrap, XawtextWrapWord, etc. Please note that I have mentioned server console. What should we use there? I propose removing wordwrap_string() everywhere. I disagree. However, I agree that we should not use this function for GUI clients. But it seems to me that you say about other problem than me. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40043) i18n: wordwrap_string() broken for UTF-8 translations
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40043 On Thu, 24 Jan 2008 William Allen Simpson wrote: Egor Vyscrebentsov wrote: On Thu, 24 Jan 2008 William Allen Simpson wrote: The issue is not strlen(). It is properly used to determine the length of a string. The issue is that strlen() has nothing to do with how much room there is for display in a particular window! From what I can see everyday, you're wrong. strlen() will return 70, while there are only, say, 40 multibyte characters. (heavy sigh) You are confusing strings with characters. They are not the same Perhaps because of the unfortunately named char type, a 7-bit signed integer. They have *never* been the same. Over my life, I've programmed for 5-bit (Baudot code), 6-bit (CDC), 7-bit, 8-bit, 12-bit, and now multi-byte characters. For characters, we don't talk about lengths, we talk about widths, either in pixels or points. Ok, s/length/width/g. Width of string in alphabet characters. Every time I said character, I meant alphabetic character that you can see on display. For signed 7-bit integer I said char. Maybe I can't say what I want. Trying again: strlen couldn't be used for receiving number of alphabetic characters in the string. It can be used for receiving number of 7-bit signed integer. And my point is that usage strlen to get number of alphabetic characters IS and WILL BE an issue with UTF-8. strlen() may be used to get size of string, but not length. Perhaps there must be some Russian differences in the meaning of the words size and length. They are synonymous in English: Length closer to width for us, yes. Size is closer to volume. Also, size is what malloc use for me. man 3 strlen man 3 wcslen /* I'm able to make heavy sighs too */ Please note that I have mentioned server console. What should we use there? Nothing. No (translated or otherwise) message to the console needs to be wrapped by the program. That is handled by the console driver, as always, since the days of paper tape! And it wraps not by the border of word. As always, since... The purpose of wordwrap_string function is to make human-readable break in string line, isn't it? (I do not say here if it right or not to make such breaks.) wordwrap_string asks for an argument of displayable width (called 'len'). And here means a number of alphabetic characters, but realization means size of string in signed 7-bit integers which can differ from the number. This is the bug I said about. You said about knowledge of room for display. But this is another question! With UTF-8 you have characters [displayable alphabetic characters] of non-fidex size (in memory terms). So line of 80 displayable alphabetic characters can take from 80 char [signed 7-bit integers] to ... (160 for russian, if there will be no spaces, digits, latin letters.) We have code assumed that every displayable alphabetic character is equal to signed 7-bit integer. The wordwrap_string is just one example. Are you sure there is no other? I'm not. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40032) server/plrhand.c civil war message plural
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40032 On Fri, 25 Jan 2008 William Allen Simpson wrote: Egor Vyscrebentsov wrote: 1. FR: nation_ajective_plural_for_player() function. That's very unlikely. We'd end up with n**2 translations. See below. 2. of the %s will force us to enter cases problem... to the %s cause to enter cases problem... What is a cases problem? Some more quoting has an answer^Wexample: (cmp. Польские and Польским.) Every ajective has 4 (3 genders + 1 plural) * 6 (cases) = 24 forms in russian. (Several of them may have intersection.) F.e. Polish %s - Польский (male)/Польская (female)/Польское (neutral [or middle])/Польские (plural) %s to the Polish %s - Польскому/Польской/Польскому/Польским %s from the Polish %s - От Польского/Польской/Польского/Польских %s etc. Every noun has 6 forms. (+ 6 for plural.) See also http://lists.complete.org/[EMAIL PROTECTED]/2003/09/msg00015.html.gz and follow-ups ru_RU specific: Gender problem can be avoided by usage nation_plural at the first place. After all the recent work to add adjectives, you want to eliminate them? Just take into account that you can't get right translation with adjs for several language using gettext... Other way is to _always and everywhere_ use only one gender. English has no genders, so technically we *are* using only one gender. Any genders are specific to your translation. Yes, it was about .po file. (BTW, for all the time in ru.po nation.name == nation.plural. I don't know if i could change this painlessly - reason is cases.) If you've made all the adjectives == plural, maybe that's the problem. Just take into account that you can't get right translation with adjs for several language using gettext... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40075) pcity-id [Was: S2_2 memory error in map_get_player_city]
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40075 On Mon, 4 Feb 2008 Jason Dorje Short wrote: Incidentally, is there a reason that pcity-id uses the idex generator? Why not just use the ptile-index as the city id? Cities can't ever move and there can't ever be more than once city on a tile...right? 1. This supposes that city can occupy exactly (no more than) 1 tile. (True nowadays. Will this be true forever?[*]) 2. What about data of destroyed cities? (f.e., if there was Wonder of the World.) Right now it [Wonders of the World report] looks like become broken with this change. [*] I personally dislike this assume in long-term. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40101) S2_1: 'minplayers' typo
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40101 Good daytime! S2_1 contains two typos: mirules.nplayers used against minplayers. One is in commentary, other in line that is sent to metaserver... Typos don't affect game process. (But you can see them on metaserver.) Attached is patch for S2_1, should be applyable to S2_2 and trunk (both have same typos.) -- Thanks, evyscr Index: server/settings.c === --- server/settings.c (revision 14387) +++ server/settings.c (working copy) @@ -409,7 +409,7 @@ /* Options affecting numbers of players and AI players. These only * affect the start of the game and can not be adjusted after that. - * (Actually, mirules.nplayers does also affect reloads: you can't start a + * (Actually, minplayers does also affect reloads: you can't start a * reload game until enough players have connected (or are AI).) */ GEN_INT(minplayers, game.info.min_players, Index: server/meta.c === --- server/meta.c (revision 14387) +++ server/meta.c (working copy) @@ -359,7 +359,7 @@ s = end_of_strn(s, rest); my_snprintf(s, rest, vn[]=%svv[]=%d, -my_url_encode(mirules.nplayers), game.info.min_players); +my_url_encode(minplayers), game.info.min_players); s = end_of_strn(s, rest); my_snprintf(s, rest, vn[]=%svv[]=%d, ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Does anybody use those po/statistics.rb or .sh?
On Tue, 29 Apr 2008 Jason Dorje Short wrote: Elmo Todurov wrote: A long time ago, I made those two scripts, po/statistics.rb po/statistics.sh They msgfmt --stat each language and then sort and display the languages according to their number of messages translated. They are in S2_1 branch right now. Seeing how 2.1 will soon be abandoned, should I drag those files to other branches/trunk as well? Why not? If I'm the only one who uses them, I could just copy them over when I need it. However, if there is market for that feature, they should be dragged along. I do not use these scripts, but I think it would be better to have them in all new branches. What is the script that does/did generate similar statistics for the web site? /home/freeciv/bin/postat.pl at freeciv.f.o As I recall that was hosted purely on www.freeciv.org and is probably obsolete now. So it would be nice to have a similar thing in the codebase. But then how can we get the web site to automatically update to show these statistics? I can suggest only a page outside of wiki with link to it from wiki. I already told that there is everyday update-po process at freeciv.f.o (as part of 'make dist' for snapshots.) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40320) 'make dist' on S2_2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40320 Good daytime! With recent changes we have an error while 'make dist' on S2_2: make[4]: Entering directory `/home/evyscr/freeciv-svn/S2_2/dependencies/toluaxx/src/lib' make[4]: *** No rule to make target `../../../../dependencies/tolua/include/toluaxx.h', needed by `distdir'. Stop. make[4]: Leaving directory `/home/evyscr/freeciv-svn/S2_2/dependencies/toluaxx/src/lib' make[3]: *** [distdir] Error 1 -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40326) S2_0: build out of srcdir is broken
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40326 Good daytime! In common/Makefile.am there is a call to ./generate_packets.py In S2_1 and later this is already fixed. Backport from S2_1 attached. -- Thanks, evyscr --- common/Makefile.am.orig 2006-02-16 15:47:00 +0300 +++ common/Makefile.am 2008-06-25 12:24:25 +0400 @@ -68,7 +68,7 @@ packets_gen.h packets_gen.c: packets_generate .INTERMEDIATE: packets_generate packets_generate: packets.def generate_packets.py - ./generate_packets.py + cd $(srcdir) ./generate_packets.py touch packets_generate #libcivcommon_a_DEPENDENCIES = ../utility/libcivutility.a ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40486) S2_2: game load - buffer overflow
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40486
Good daytime!
S2_2, r15205.
Loading game crashes civserver with buffer overflow.
Reason: too small buffer in player_load_vision()
Attached patch works for me, though I guess we need smth like
fc_s[n]printf().
PS. I'm having troubles with internet connection, so I may be
unreachable for a while.
--
Thanks, evyscr
Index: server/savegame.c
===
--- server/savegame.c (revision 15206)
+++ server/savegame.c (working copy)
@@ -3018,9 +3018,9 @@
zeroline[i]= '\0';
bases_halfbyte_iterate(j) {
-char buf[16]; /* enough for sprintf() below */
+char buf[32]; /* should be enough for snprintf() below */
-sprintf(buf, player%d.map_b%02d_%%03d, plrno, j);
+snprintf(buf, sizeof(buf), player%d.map_b%02d_%%03d, plrno, j);
LOAD_MAP_DATA(ch, nat_y, ptile,
secfile_lookup_str_default(file, zeroline, buf, nat_y),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40486) S2_2: game load - buffer overflow
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40486 On Sun, 14 Sep 2008 03:46:25 -0700 Egor Vyscrebentsov wrote: S2_2, r15205. Loading game crashes civserver with buffer overflow. Reason: too small buffer in player_load_vision() Looks like a copy-paste from map_load() [where this buffer is really enough.] Attached patch works for me, though I guess we need smth like fc_s[n]printf(). And, of course, there is my_snprintf() already... [Side note.] Game loading looks too unsafe... /me wants to see civserver not crashing if there is no entry while capability is present, for example -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40507) Civ2 to Freeciv scenario converter (alpha)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40507 Good daytime! An alpha version of Civ2 to Freeciv scenario/savegame converter has been written. There are many things that were made wrong (city workers, units moves, diplo states, ...) or even weren't made (wonders, traderoutes, research, ...) However, it seems to produce playable savegames. Sources are available at http://evyscr.murom.net/freeciv/my/utils/index.html and in next comment to this ticket. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40507) Civ2 to Freeciv scenario converter (alpha)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40507 On Sat, 27 Sep 2008 Jason Dorje Short wrote: Would it be possible to make the savegame.c interface modular, so that freeciv could directly load multiple savegame formats? It looks like very nice idea, but: 1) I'm afraid of possible errors in those modules which may affect main process. 2) I'm not 100% sure about absence of legality problems with owners of proprietary games/savegame formats. Latter is more important for me. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517 On Mon, 6 Oct 2008 15:34:55 -0700 Joan Creus wrote: This transaction appears to have no content [*sigh*] I saved a game on 2.2, SVN 15240. Now, when I try to load it, I get four popups: 1) Detected fatal error in savegame.c line 303: 2) Please report this message at http://bugs.freeciv.org 3) Unknown ascii value for num: '?' 63 2) Please report this message at http://bugs.freeciv.org The server exits, too. base_list (and therefore base_buf) for archers at [39,40] (line 1278) is ��x�ſ-�\017\b\214�ſ �\b��. Most of these symbols are illegal. What are your system/encoding? Is there a previous savegame that loads normally? activity_list for same unit is . Wonder if this was one more out-of-pointer'ing? Phalanx at [45,45] (line 1279) has the same problems. Looks like these units are the only that have base_list and activity_list differ from '-'. orders_list and dir_list also look strange. Error message may be improved. I guess that telling wrong element/line of savegame might be useful when working with scenario. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40520) civserver hangs and more
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40520 On Tue, 7 Oct 2008 Christian Knoke wrote: SVN 07 OCT 2008 2.1.99 GTK [...] Examining the subsequent savegame, as well as several predecessors, in some of them the GUI gives some alerts: unknown ascii from num: '?' 63 detected fatal error in savegame.c line 303 2-0150.sav.gz. Trireme at [9,10]. Did you use goto on it (before) or smth else? This part of problem is the same as #40517. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517
On Tue, 7 Oct 2008 Joan Creus wrote:
2008/10/7 Egor Vyscrebentsov evyscr/gmail.com
base_list (and therefore base_buf) for archers at [39,40] (line 1278)
is ��x�ſ-�\017\b\214�ſ �\b��. Most of these symbols are illegal.
activity_list for same unit is . Wonder if this was one more
out-of-pointer'ing?
orders_list and dir_list also look strange.
orders_list and dir_list are ok.
It looks like the problem my be in the saving rather than in the loading?
Yes. The problem is in player_save_units() and player_load_units().
player_save_units() set target base char to '?', and this char isn't
changed in several cases. player_load_units() assumes that loaded
char is one of [0-9a-f].
Quickest (not the best) fix is
- } else if (base_buf) {
+ } else if (base_buf base_buf[j] != '?') {
at server/savegame.c:1862
This is the first part of problem. The second part is that in
savegame file base_list is longer than activity_list. Now I have
no idea why.
--
Thanks, evyscr
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517
On Thu, 9 Oct 2008 Egor Vyscrebentsov wrote:
On Tue, 7 Oct 2008 Joan Creus wrote:
2008/10/7 Egor Vyscrebentsov evyscr/gmail.com
base_list (and therefore base_buf) for archers at [39,40] (line 1278)
is ��x�ſ-�\017\b\214�ſ �\b��. Most of these symbols are illegal.
activity_list for same unit is . Wonder if this was one more
out-of-pointer'ing?
It looks like the problem my be in the saving rather than in the loading?
Yes. The problem is in player_save_units() and player_load_units().
player_save_units() set target base char to '?', and this char isn't
changed in several cases. player_load_units() assumes that loaded
char is one of [0-9a-f].
Quickest (not the best) fix is
- } else if (base_buf) {
+ } else if (base_buf base_buf[j] != '?') {
at server/savegame.c:1862
After some thoughts I've decided that this fix is proper.
This is the first part of problem. The second part is that in
savegame file base_list is longer than activity_list.
- orders_buf[len] = dir_buf[len] = act_buf[len] = '\0';
+ orders_buf[len] = dir_buf[len] = act_buf[len] = base_buf[len] = '\0';
at server/savegame.c:3473
--
Thanks, evyscr
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#40517) Can't load savegames in 2.2
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40517
On Thu, 9 Oct 2008 Madeline Book wrote:
The missing '\0' at the end of base_buf seems to be the main
bug;
No, all chars after strlen(order_list)-1 aren't processed. So this is
just a non-orderliness, which doesn't affect game loading.
There seems to be another mistake though, and that is concerning
the two uses of sizeof on a dynamically allocated array:
sizeof(base_order) / sizeof(struct base_type *)
Since base_order has type struct base_type ** the dividend
will always evaluate to the size of a pointer, which is the
same as the value of the divisor. So the whole expression will
always evaluate to one (which I think is not the desired
behaviour).
Ooh... but I want to count this as another bug, let's go on with
it in another ticket (and with author of this code).
I'm guessing that game.control.num_base_types should be used
instead, but even so this sounds suspicious since base_order
is allocated with size nmod + (4 - (nmod % 4)) where nmod is
loaded from the savegame (maybe nmod should be replaced by
game.control.num_base_types in the calloc call?).
There may be a problem that bases list from savegame can differ
from ruleset's one. I guess that game.control.num_base_types is
loaded from ruleset (the only place where I can see it changed
is in server/ruleset.c).
[side note]
Speaking of nmod, am I right that if nmod % 4 == 0 aligning
will add extra four positions? (nmod + 3 - (nmod - 1) % 4) should
be nearest alignment, right?
Also, in loading map specials there is potential crash. I use
next change since first attemtps of loading games converted
from civ2 (aligned nmod was smaller than aligned S_LAST that time.)
@@ -4049,7 +4049,7 @@
special_order[j] = find_special_by_rule_name(modname[j]);
}
free(modname);
-for (; j S_LAST + (4 - (S_LAST % 4)); j++) {
+for (; j S_LAST + (4 - (S_LAST % 4)) j nmod + (4 - (nmod % 4));
j++) {
special_order[j] = S_LAST;
}
}
But this is really for another ticket.
[/side note]
There should be some action after each of two added LOG_ERRORs.
One variant is to abort civserver. Opinions?
If there's no easy way to handle the error after the error
message (e.g. just dropping the orders for the unit)
Of course, it is. It's even already implemented several lines
above. Attached (with small change in symbol checking.)
--
Thanks, evyscr
Index: server/savegame.c
===
--- server/savegame.c (revision 15253)
+++ server/savegame.c (working copy)
@@ -1859,20 +1859,42 @@
/* Either ACTIVITY_FORTRESS or ACTIVITY_AIRBASE */
order-activity = ACTIVITY_BASE;
order-base = base_number(pbase);
- } else if (base_buf) {
-base = char2num(base_buf[j]);
+ } else if (order-activity == ACTIVITY_BASE) {
+ if (base_buf) {
+ if (strchr(num_chars, base_buf[j])) {
+ base = char2num(base_buf[j]);
-if (base = 0
- base sizeof(base_order) / sizeof (struct base_type *)) {
- pbase = base_order[base];
-} else {
- freelog(LOG_ERROR, Cannot find base %d for %s to build,
- base, unit_rule_name(punit));
- base = base_number(get_base_by_gui_type(BASE_GUI_FORTRESS, NULL, NULL));
-}
+ if (base = 0
+ base sizeof(base_order) / sizeof (struct base_type *)) {
+ pbase = base_order[base];
+ } else {
+ freelog(LOG_ERROR, Cannot find base %d for %s [%d] to build,
+ base, unit_rule_name(punit), punit-id);
+ base = base_number(get_base_by_gui_type(BASE_GUI_FORTRESS, NULL, NULL));
+ }
-order-base = base;
- }
+ order-base = base;
+ } else {
+ freelog(LOG_ERROR,
+ %s [%d] has ACTIVITY_BASE but wrong base char
+ is in base_list. Dropping orders.,
+ unit_rule_name(punit), punit-id);
+ free(punit-orders.list);
+ punit-orders.list = NULL;
+ punit-has_orders = FALSE;
+ break;
+ }
+ } else {
+ freelog(LOG_ERROR,
+ %s [%d] has ACTIVITY_BASE but no base_list present.
+ Dropping orders.,
+ unit_rule_name(punit), punit-id);
+ free(punit-orders.list);
+ punit-orders.list = NULL;
+ punit-has_orders = FALSE;
+ break;
+ }
+ }
}
} else {
punit-has_orders = FALSE;
@@ -3470,7 +3492,7 @@
break;
}
}
- orders_buf[len] = dir_buf[len] = act_buf[len] = '\0';
+ orders_buf[len] = dir_buf[len] = act_buf[len] = base_buf[len] = '\0';
secfile_insert_str(file, orders_buf,
player%d.u%d.orders_list, plrno, i);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] DNS problem and access to resources
Good daytime! As you may already know, we have problems with DNS now. However, several stuffs are still working. You may reach them by hack with your /etc/hosts: # echo 207.158.49.132 bugs.freeciv.org /etc/hosts # echo 207.158.49.132 rt.freeciv.org /etc/hosts # echo 83.223.112.138 www.freeciv.org /etc/hosts (Note that bug tracker can't send mail...) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] DNS problem and access to resources
On Fri, 3 Apr 2009 Christian Prochaska wrote: Now the situation is the other way around: the forum apache is running (http://207.158.49.134/), but RT's apache does not respond anymore (http://207.158.49.132/). Looks like /etc/rc.d/init.d/httpd consider all running *httpd as it's processes. (Local apache pids were in answer on '/sbin/service httpd status'). So i guess we may wait until `23 0 * * * RT apache restart` Now it is 06:01:42. -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] [patch #1204] Separate desktop files for gtk2, sdl and xaw clients
On Tue, 28 Jul 2009 Marko Lindqvist wrote: Currently there is one desktop file for client, and it tries to execute gtk-client no matter which client is built. Attached patch makes separate desktop file for each of the clients gtk2, sdl and xaw. Only those desktop files that refer to actually built clients get installed. Do we have _different_ icons for clients? (I guess we allow installation of more than one client, right?) I'm afraid, patch shouldn't be applied without them. Also, = if CLIENT_GUI_GTK_2_0 GUI_SUBDIRS += gui-gtk-2.0 +desktopfile_DATA = freeciv-gtk2.desktop endif if CLIENT_GUI_XAW = I haven't seen 'elif'. Is it correct to use ' = ' and ' += ' together? -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Please consider posting patches as .diff instead of .patch
Good day! 2009/9/3 Marko Lindqvist wrote: I have noticed that more and more people name their patches as .patch. It would be easier for me if they were named .diff. Not a problem, but why? (Is it an issue with mailer, system, mailman, whatever else?) Also, .patch looks like standard in packages (like rpms.) And while I'm at it, I also prefer patches that are relative to parent dir of freeciv = ones that I can apply as patch -u -p1 -d freeciv.src patch.diff. git-diff seems to have no possibility of this... -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14749] Freeciv desktop files contain wrong entries
URL: http://gna.org/bugs/?14749 Summary: Freeciv desktop files contain wrong entries Project: Freeciv Submitted by: evyscr Submitted on: Четверг 12.11.2009 at 19:46 Category: bootstrap Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: 2.1.10 ___ Details: Good day! From ALT Linux repocop tests: === desktop-file-validate utility printed the following message(s): /usr/share/applications/freeciv.desktop: warning: key Encoding in group Desktop Entry is deprecated; /usr/share/applications/freeciv.desktop: warning: value freeciv-client.png for key Icon in group Desktop Entry is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path; desktop-file-validate utility printed the following message(s): /usr/share/applications/freeciv-server.desktop: warning: key Encoding in group Desktop Entry is deprecated; === So our desktop files have violations of current fd.o specification. Patches for S2_1 and both S2_2 and trunk are attached. -- Thanks, evyscr ___ File Attachments: --- Date: Четверг 12.11.2009 at 19:46 Name: S2_1-desktops.diff Size: 941B By: evyscr http://gna.org/bugs/download.php?file_id=7292 --- Date: Четверг 12.11.2009 at 19:46 Name: S2_2-desktops.diff Size: 946B By: evyscr http://gna.org/bugs/download.php?file_id=7293 ___ Reply to this item at: http://gna.org/bugs/?14749 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #14750] Translation issue in 2.1.10. %%
Follow-up Comment #2, bug #14750 (project freeciv): Joe Dalton wrote: but why is a _c-format_ means format string (so 2 '%' needed) used here? Most of lines really don't need c-format. However, for example, #: client/helpdata.c:1010 #, c-format msgid * The discovery of %s reduces the risk to 25%%.\n msgstr * Opdagelsen af %s reducerer risikoen til 25%%.\n have to be c-format due to inclusion of %s. My guess is that early these lines were one big message. -- Thanks, evyscr ___ Reply to this item at: http://gna.org/bugs/?14750 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15026] problem with identical noun and adjective forms in some languages
Follow-up Comment #1, bug #15026 (project freeciv): The question is, how does this work in your languages? 6 cases * 4 genders = 24 forms of adjective in russian. Well, you may forget about cases, but 4 forms for different genders still here. However, you can't use them with gettext. (*) What different cases of the nation names should Freeciv support to appear naturally when translated? No answer here. (*) Honestly, you can use them with gettext. I wrote proof-of-concept patch (long time ago) that used gettext plurals for genders (adding one fictional, since there are 3 plural forms in russian.) But it looks too awful. PS. This bug is for absent category i18n -- Thanks, evyscr ___ Reply to this item at: http://gna.org/bugs/?15026 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15104] S2_2: gui-xaw never shows connection dialog
URL: http://gna.org/bugs/?15104 Summary: S2_2: gui-xaw never shows connection dialog Project: Freeciv Submitted by: evyscr Submitted on: Понедельник 11.01.2010 at 23:39 Category: client-xaw Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: evyscr Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: 2.2.0 ___ Details: Good day! Since changes in pages code gui-xaw never shows connection dialog (which was startup one.) Patch attached (this is backport of r16129 to S2_2). -- Thanks, evyscr ___ File Attachments: --- Date: Понедельник 11.01.2010 at 23:39 Name: s2_2-xaw-pages.diff Size: 915B By: evyscr http://gna.org/bugs/download.php?file_id=7658 ___ Reply to this item at: http://gna.org/bugs/?15104 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15104] S2_2: gui-xaw never shows connection dialog
Follow-up Comment #1, bug #15104 (project freeciv): Addional patch to make startpage buttons always be in the scope. (file #7662) ___ Additional Item Attachment: File name: s2_2-xaw-startpage.diffSize:4 KB ___ Reply to this item at: http://gna.org/bugs/?15104 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #15104] S2_2: gui-xaw never shows connection dialog
Follow-up Comment #3, bug #15104 (project freeciv): Yes, and both patches were ready. Though I'm not sure I will be able to commit before late February. ___ Reply to this item at: http://gna.org/bugs/?15104 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18376] Xaw: incorrect gray alpha png load
URL: http://gna.org/bugs/?18376 Summary: Xaw: incorrect gray alpha png load Project: Freeciv Submitted by: evyscr Submitted on: Пнд 18 Июл 2011 22:10:20 Category: client-xaw Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: Any Planned Release: ___ Details: client/gui-xaw/graphics.c assumes that there are only paletted or rgb png files. Quick fix attached. ___ File Attachments: --- Date: Пнд 18 Июл 2011 22:10:20 Name: trunk-xaw-png-gray-alpha.diff Size: 1kB By: evyscr http://gna.org/bugs/download.php?file_id=13601 ___ Reply to this item at: http://gna.org/bugs/?18376 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18376] Xaw: incorrect gray alpha png load
Follow-up Comment #2, bug #18376 (project freeciv): I forgot about mask, of course. Better fix is attached. My guess that whole function should be rewritten to get right fix. [And alpha channel never worked in gui-xaw.] (To be honest, I just wanted to remove distracting valgrind messages while testing something.) (file #13603) ___ Additional Item Attachment: File name: trunk-xaw-png-gray-alpha-v2.diff Size:1 KB ___ Reply to this item at: http://gna.org/bugs/?18376 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18379] Trunk: server: free(): invalid next size
URL: http://gna.org/bugs/?18379 Summary: Trunk: server: free(): invalid next size Project: Freeciv Submitted by: evyscr Submitted on: Втр 19 Июл 2011 05:41:34 Category: general Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: trunk Discussion Lock: Any Operating System: GNU/Linux Planned Release: ___ Details: Fresh trunk (r19973), after 'quit' from console. Unfortunately, ulimit was 0, so there is no core available. *** glibc has detected an error in fcser-all: free(): invalid next size (fast): 0x0893adf8 *** === Backtrace: = /lib/libc.so.6(+0x6bc4a)[0xb75bcc4a] /lib/libc.so.6(+0x6d58b)[0xb75be58b] /lib/libc.so.6(cfree+0x71)[0xb75c1811] fcser-all(adv_data_close+0x34)[0x8096784] fcser-all(server_remove_player+0x1b0)[0x80d3bc0] fcser-all(server_game_free+0xca)[0x80731aa] fcser-all(server_quit+0x1a)[0x807336a] fcser-all[0x8083348] fcser-all[0x8103fd8] /lib/libreadline.so.5(rl_callback_read_char+0x9a)[0xb777641a] fcser-all(server_sniff_all_input+0x1236)[0x8105ed6] fcser-all(srv_main+0xb15)[0x8073ec5] fcser-all(main+0x6b4)[0x806c224] /lib/libc.so.6(__libc_start_main+0xe6)[0xb7567c96] fcser-all[0x806b871] === Memory map: 08048000-082de000 r-xp 08:0b 18357052 /home/evyscr/freeciv/bin/trunk/all/bin/freeciv-server (deleted) 082de000-082df000 r--p 00295000 08:0b 18357052 /home/evyscr/freeciv/bin/trunk/all/bin/freeciv-server (deleted) 082df000-082e5000 rw-p 00296000 08:0b 18357052 /home/evyscr/freeciv/bin/trunk/all/bin/freeciv-server (deleted) 082e5000-09947000 rw-p 00:00 0 [heap] b6e0-b6e21000 rw-p 00:00 0 b6e21000-b6f0 ---p 00:00 0 b6fc-b6fcb000 r-xp 08:07 6709 /lib/libnss_files-2.11.3.so b6fcb000-b6fcc000 r--p a000 08:07 6709 /lib/libnss_files-2.11.3.so b6fcc000-b6fcd000 rw-p b000 08:07 6709 /lib/libnss_files-2.11.3.so b6fcd000-b6fe8000 r-xp 08:07 84 /lib/libgcc_s.so.1 b6fe8000-b6fe9000 r--p 0001a000 08:07 84 /lib/libgcc_s.so.1 b6fe9000-b6fea000 rw-p 0001b000 08:07 84 /lib/libgcc_s.so.1 b7006000-b7007000 rw-p 00:00 0 b7007000-b70d2000 r--p 08:0b 18357055 /home/evyscr/freeciv/bin/trunk/all/share/locale/ru/LC_MESSAGES/freeciv.mo (deleted) b70d2000-b7111000 r--p 08:09 51184 /usr/lib/locale/ru_RU.utf8/LC_CTYPE b7111000-b722e000 r--p 08:09 27461 /usr/lib/locale/ru_RU.utf8/LC_COLLATE b722e000-b723 rw-p 00:00 0 b723-b7242000 r-xp 08:07 6753 /lib/libresolv-2.11.3.so b7242000-b7243000 ---p 00012000 08:07 6753 /lib/libresolv-2.11.3.so b7243000-b7244000 r--p 00012000 08:07 6753 /lib/libresolv-2.11.3.so b7244000-b7245000 rw-p 00013000 08:07 6753 /lib/libresolv-2.11.3.so b7245000-b7247000 rw-p 00:00 0 b7247000-b7249000 r-xp 08:07 536/lib/libkeyutils.so.1.3 b7249000-b724a000 r--p 1000 08:07 536/lib/libkeyutils.so.1.3 b724a000-b724b000 rw-p 2000 08:07 536/lib/libkeyutils.so.1.3 b724b000-b724c000 rw-p 00:00 0 b724c000-b7253000 r-xp 08:07 1843 /lib/libkrb5support.so.0.1 b7253000-b7254000 r--p 6000 08:07 1843 /lib/libkrb5support.so.0.1 b7254000-b7255000 rw-p 7000 08:07 1843 /lib/libkrb5support.so.0.1 b7255000-b7257000 r-xp 08:07 6688 /lib/libcom_err.so.2.1 b7257000-b7258000 r--p 1000 08:07 6688 /lib/libcom_err.so.2.1 b7258000-b7259000 rw-p 2000 08:07 6688 /lib/libcom_err.so.2.1 b7259000-b725c000 r-xp 08:07 6690 /lib/libdl-2.11.3.so b725c000-b725d000 r--p 2000 08:07 6690 /lib/libdl-2.11.3.so b725d000-b725e000 rw-p 3000 08:07 6690 /lib/libdl-2.11.3.so b725e000-b728 r-xp 08:07 1780 /lib/libk5crypto.so.3.1 b728-b7281000 r--p 00021000 08:07 1780 /lib/libk5crypto.so.3.1 b7281000-b7282000 rw-p 00022000 08:07 1780 /lib/libk5crypto.so.3.1 b7282000-b7311000 r-xp 08:07 1785 /lib/libkrb5.so.3.3 b7311000-b7313000 r--p 0008e000 08:07 1785 /lib/libkrb5.so.3.3 b7313000-b7314000 rw-p 0009 08:07 1785 /lib/libkrb5.so.3.3 b7314000-b7315000 rw-p 00:00 0 b7315000-b746a000 r-xp 08:07 141/lib/libcrypto.so.1.0.0d b746a000-b746b000 ---p 00155000 08:07 141/lib/libcrypto.so.1.0.0d b746b000-b747a000 r--p 00155000 08:07 141/lib/libcrypto.so.1.0.0d b747a000-b748 rw-p 00164000 08:07 141/lib/libcrypto.so.1.0.0d b748-b7483000 rw-p 00:00 0 b7483000-b74d4000 r-xp 08:07 1862 /lib/libssl.so.1.0.0d b74d4000-b74d6000 r--p 0005 08:07 1862 /lib/libssl.so.1.0.0d
[Freeciv-Dev] [patch #2813] Xaw: [partially rewritten] connect dialog
URL: http://gna.org/patch/?2813 Summary: Xaw: [partially rewritten] connect dialog Project: Freeciv Submitted by: evyscr Submitted on: Втр 19 Июл 2011 06:02:05 Category: client-xaw Priority: 5 - Normal Status: In Progress Privacy: Public Assigned to: evyscr Originator Email: Open/Closed: Open Discussion Lock: Any Planned Release: ___ Details: Patch of somehow cleanuped and partially rewritten gui-xaw connect dialog. Should fix at least bug #17717. Metaserver part was not properly tested due to absense of trunk public servers. Password part was not tested due to same reason. ___ File Attachments: --- Date: Втр 19 Июл 2011 06:02:05 Name: trunk-xaw-connectdlg.diff Size: 51kB By: evyscr http://gna.org/patch/download.php?file_id=13604 ___ Reply to this item at: http://gna.org/patch/?2813 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #2806] Improved Russian nation
Follow-up Comment #1, patch #2806 (project freeciv): According to legend, Slavic and Finnic tribes of Novgorod In 'Povest vremennyh let' Slovene (one slavic tribe) are mentioned only. Rurik established Kievan Rus' According to PVL, this was made by Oleg who had captured Kiev. Rurik was Novgorod prince only. Vladimir Monomakh was early then Vsevolod Bolshoe Gnezdo (actually, his grandfather.) ; Alternative titles for a Despotism is Knyaz/Knyaginya Veliky Novgorod Velikiy Novgorod looks better for me. Also lake/river (Ilmen/Volhov) Tver, river (Volga) Samara, river (Volga) Ryazan river (Oka) Yaroslavl river (Volga) Novosibirsk river (Ob') Smolensk, river (Dnepr) Saratov river (Volga) Well, almost all cities are on rivers. Just take most [historically] important from the start of list. Kirov, Ulyanovsk Komsomolsk-na-Amure (river) Dzerzhinsk, Engels, Chernyakhovsk, Can be/may be/maybe Soviet. Domodedovo, Village name. Not so good to my mind. Question on order in city list: what are weights of population/age/historical importance? ___ Reply to this item at: http://gna.org/patch/?2806 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [patch #2813] Xaw: [partially rewritten] connect dialog
Follow-up Comment #3, patch #2813 (project freeciv): This mean non-working metaserver for gui-xaw in 2.3.0. And non-working auth support. I don't know would it be better to have gui-xaw in distribution with these bugs or to haven't it. ___ Reply to this item at: http://gna.org/patch/?2813 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18058] trunk: data/nation data/flags/Makefile.am inconsistence
Follow-up Comment #5, bug #18058 (project freeciv): Obvious fix to check_flags inspired by africa/south_africa. (file #13685) ___ Additional Item Attachment: File name: check_flags-space.diff Size:0 KB ___ Reply to this item at: http://gna.org/bugs/?18058 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18376] Xaw: incorrect gray alpha png load
Update of bug #18376 (project freeciv): Status:None = Fixed Assigned to:None = evyscr Open/Closed:Open = Closed ___ Follow-up Comment #8: Patch was applied to affected S2_1, S2_2, S2_3 without any modification. ___ Reply to this item at: http://gna.org/bugs/?18376 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] [Freeciv-commits] r20042 - /branches/S2_3/client/text.c
On Sun, 31 Jul 2011 10:21:53 - Jacob Nevins wrote: Mark a couple of strings for i18n (Bulbs produced per turn, needed for technology upkeep). ... Modified: branches/S2_3/client/text.c String unfreeze? I still wish to add one from #2813 (since we had code unfreeze now.) -- Thanks, evyscr ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #18437] gui-xaw: segfault while connecting after searching LAN servers
URL: http://gna.org/bugs/?18437 Summary: gui-xaw: segfault while connecting after searching LAN servers Project: Freeciv Submitted by: evyscr Submitted on: Вск 31 Июл 2011 18:15:13 Category: None Severity: 3 - Normal Priority: 5 - Normal Status: None Assigned to: None Originator Email: Open/Closed: Open Release: Discussion Lock: Any Operating System: None Planned Release: ___ Details: S2_3, S2_2, possibly S2_1. Xaw client segfaults while connecting to freeciv server if there was search of LAN servers. Trunk is no more affected since r20044. Program terminated with signal 11, Segmentation fault. #0 delete_server_list (scan=0x867b500) at freeciv-s2_3/client/servers.c:545 545 int n = ptmp-nplayers; (gdb) bt full #0 delete_server_list (scan=0x867b500) at freeciv-s2_3/client/servers.c:545 i = value optimized out n = value optimized out ptmp_iter = 0xb755fae0 ptmp = 0xdc #1 server_scan_finish (scan=0x867b500) at freeciv-s2_3/client/servers.c:980 No locals. #2 0x080b8ad7 in close_connection_dialog () at freeciv-s2_3/client/gui-xaw/connectdlg.c:110 No locals. #3 0x08081aaf in handle_server_join_reply (you_can_join=true, message=0x85ed659 evyscr, добро пожаловать, capability=0x85edc59 +Freeciv-2.3-network , challenge_file=0x85ede59 challenge_5556_1, conn_id=1) at freeciv-s2_3/client/packhand.c:254 __FUNCTION__ = handle_server_join_reply #4 0x0808ab8d in client_handle_packet (type=PACKET_SERVER_JOIN_REPLY, packet=0x85ed658) at freeciv-s2_3/client/packhand_gen.c:32 ___ Reply to this item at: http://gna.org/bugs/?18437 ___ Message sent via/by Gna! http://gna.org/ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
