Re: [Freeciv-Dev] 2.1 abandoned, now 2.2
Daniel Markstedt wrote: Most of the discussion took place in PR#39690 IIRC. Not somewhere I'd expect such a major decision to be discussed, buried at the end of a thread discussing something else entirely. I'm opposed to removing embassies from the game code. It's required for proper civ* emulation support -- better to make everything configurable. Seems to me that the entire project is forking. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39721) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721
This transaction appears to have no content
With gcc-4.2, I have bug.
How to reproduce :
- Start game
- Build a city
- Press F1 (open city panel management)
- select city(ies)
- menu Change - CMA - Food Max (anyone except none)
- nothing append
- Open city panel by click on city on map, apply CMA
- Go to F1 panel
- menu Change - CMA - Food Max (anyone except none)
- CMA of city is set to none
It's not happend with gcc4.1 and seems due to
when you ask once GINT_TO_POINTER(-1) and after call to
GINT_TO_POINTER(x) is :
GINT_TO_POINTER(x) = GINT_TO_POINTER(-1).
Patch, put CMA called 'none' at the end of list of preset CMA.
Cheers
--
Carl
With gcc-4.2, I have bug. How to reproduce : - Start game- Build a city- Press F1 (open city panel management)- select city(ies)- menu Change - CMA - Food Max (anyone except none)
- nothing append- Open city panel by click on city on map, apply CMA- Go to F1 panel- menu Change - CMA - Food Max (anyone except none)- CMA of city is set to none
Its not happend with gcc4.1 and seems due to when you ask once GINT_TO_POINTER(-1) and after call toGINT_TO_POINTER(x) is :GINT_TO_POINTER(x) = GINT_TO_POINTER(-1).Patch, put CMA called none at the end of list of preset CMA.
Cheers -- Carl
diff -urNad warclient//server/stdinhand.c warclient.new//server/stdinhand.c
--- warclient//server/stdinhand.c 2007-09-24 18:07:39.0 +0200
+++ warclient.new//server/stdinhand.c 2007-09-24 18:23:54.0 +0200
@@ -1341,7 +1341,7 @@
sz_strlcpy(buf, arg);
remove_leading_trailing_spaces(buf);
- if (!buf || !buf[0])
+ if (!buf[0])
{
cmd_reply(CMD_METAMESSAGE, caller, C_COMMENT,
_(Metaserver message string is \%s\.),
@@ -4859,7 +4859,7 @@
* srvarg.load_filename, which we edit down below. */
sz_strlcpy(arg, filename);
- if (!arg || arg[0] == '\0')
+ if (arg[0] == '\0')
{
cmd_reply(CMD_LOAD, caller, C_FAIL, _(Usage: load filename));
send_load_game_info(FALSE);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39722) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39722
This transaction appears to have no content
Sorry erase previous PR#39721, I submit wrong patch file :(
With gcc-4.2, I have bug.
How to reproduce :
- Start game
- Build a city
- Press F1 (open city panel management)
- select city(ies)
- menu Change - CMA - Food Max (anyone except none)
- nothing append
- Open city panel by click on city on map, apply CMA
- Go to F1 panel
- menu Change - CMA - Food Max (anyone except none)
- CMA of city is set to none
It's not happend with gcc4.1 and seems due to
when you ask once GINT_TO_POINTER(-1) and after call to
GINT_TO_POINTER(x) is :
GINT_TO_POINTER(x) = GINT_TO_POINTER(-1).
Patch, put CMA called 'none' at the end of list of preset CMA.
Cheers
--
Carl
Sorry erase previous PR#39721, I submit wrong patch file :(With gcc-4.2, I have bug. How to reproduce : - Start game- Build a city- Press F1 (open city panel management)- select city(ies)
- menu Change - CMA - Food Max (anyone except none)
- nothing append- Open city panel by click on city on map, apply CMA- Go to F1 panel- menu Change - CMA - Food Max (anyone except none)- CMA of city is set to none
Its not happend with gcc4.1 and seems due to when you ask once GINT_TO_POINTER(-1) and after call toGINT_TO_POINTER(x) is :GINT_TO_POINTER(x) = GINT_TO_POINTER(-1).Patch, put CMA called none at the end of list of preset CMA.
Cheers-- Carl
diff -urda client/gui-gtk-2.0/cityrep.c.orig client/gui-gtk-2.0/cityrep.c
--- client/gui-gtk-2.0/cityrep.c.orig 2007-07-09 11:59:02.0 +0200
+++ client/gui-gtk-2.0/cityrep.c 2007-09-25 18:26:47.0 +0200
@@ -470,7 +470,7 @@
gtk_tree_model_get(GTK_TREE_MODEL(city_model), it, 0, res, -1);
pcity = res;
- if (idx == CMA_NONE) {
+ if (idx == cmafec_preset_num()) {
cma_release_city(pcity);
} else {
cma_put_city_under_agent(pcity, cmafec_preset_get_parameter(idx));
@@ -548,8 +548,8 @@
gtk_menu_item_set_submenu(parent_item, menu);
if (change_cma) {
-for (i = -1; i cmafec_preset_num(); i++) {
- w = (i == -1 ? gtk_menu_item_new_with_label(_(none))
+for (i = 0; i = cmafec_preset_num(); i++) {
+ w = (i == cmafec_preset_num() ? gtk_menu_item_new_with_label(_(none))
: gtk_menu_item_new_with_label(cmafec_preset_get_descr(i)));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
g_signal_connect(w, activate, G_CALLBACK(select_cma_callback),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39721) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721 PR#39722 duplication... ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39721) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721 2007/9/25, Pepeto _ [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721 PR#39722 duplication... Fuck wrong patch -- Carl 2007/9/25, Pepeto _ [EMAIL PROTECTED]: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721 PR#39722 duplication...Fuck wrong patch -- Carl ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39721) Change CMA by F1 panel don't work (gcc-4.2 specific bug)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39721
[EMAIL PROTECTED] - Mar. Sep. 25 16:17:25 2007]:
Cette opération semble ne pas avoir de contenu
Hmmm, I submitted wrong patch file sorry...
diff -urda client/gui-gtk-2.0/cityrep.c.orig client/gui-gtk-2.0/cityrep.c
--- client/gui-gtk-2.0/cityrep.c.orig 2007-07-09 11:59:02.0 +0200
+++ client/gui-gtk-2.0/cityrep.c 2007-09-25 18:26:47.0 +0200
@@ -470,7 +470,7 @@
gtk_tree_model_get(GTK_TREE_MODEL(city_model), it, 0, res, -1);
pcity = res;
- if (idx == CMA_NONE) {
+ if (idx == cmafec_preset_num()) {
cma_release_city(pcity);
} else {
cma_put_city_under_agent(pcity, cmafec_preset_get_parameter(idx));
@@ -548,8 +548,8 @@
gtk_menu_item_set_submenu(parent_item, menu);
if (change_cma) {
-for (i = -1; i cmafec_preset_num(); i++) {
- w = (i == -1 ? gtk_menu_item_new_with_label(_(none))
+for (i = 0; i = cmafec_preset_num(); i++) {
+ w = (i == cmafec_preset_num() ? gtk_menu_item_new_with_label(_(none))
: gtk_menu_item_new_with_label(cmafec_preset_get_descr(i)));
gtk_menu_shell_append(GTK_MENU_SHELL(menu), w);
g_signal_connect(w, activate, G_CALLBACK(select_cma_callback),
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] 2.1 abandoned, now 2.2
On Tue, 25 Sep 2007, William Allen Simpson wrote: I'm opposed to removing embassies from the game code. It's required for proper civ* emulation support -- better to make everything configurable. Seems to me that the entire project is forking. Your attitude is not very constructive. I can understand that some people want my rules changes to be in a separate branch, since rules changes need much tweaking, and nobody not want a repeat of the 2.1 release process. It does not make much difference if this rules changes branch is called trunk or something else, except that trunk makes it more official and more attention may be given to changes done there, which is essential for rules changes. The make everything configurable issue has been debated over and over on this list, and I had hoped that we would have come further than to repeat it again now. Some configurability item have *very* high costs in terms of development time, user interface complexity, maintainability and AI complexity, and IMHO we need to simplify some rules to allow much better configuratibility elsewhere. It took a lot of discussion before we could remove random movement, and I have never heard anyone who have missed it. On the other hand, we still do not have AI support for bombardment, several years after it was added. Also, we cannot, for instance, allow much scripting control over city actions as long as the present citizen-working-tiles system is in place. Scripting control over diplomacy requires that the underlying diplomacy system is well defined and well understood by the AI. In short, configurability and scripting requires that some parts of the rules are set in stone and streamlined. IMHO, Freeciv is and should be a game of its own, not a payciv emulator. - Per ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] 2.1 abandoned, now 2.2
--- Per I. Mathisen [EMAIL PROTECTED] wrote: On Tue, 25 Sep 2007, William Allen Simpson wrote: I'm opposed to removing embassies from the game code. It's required for proper civ* emulation support -- better to make everything configurable. Seems to me that the entire project is forking. [edit] configurability and scripting requires that some parts of the rules are set in stone and streamlined. IMHO, Freeciv is and should be a game of its own, not a payciv emulator. Are rules changes kept up to date in human-readable form in the version control? It'd be good to know so that people can follow the changes in the default rules in trunk. IMHO, the AI will never be able to be truly independent of the rule set. The default rules of the main install will always get tested more, so even code written to be very general will tend to work best on the default rules. Be a better Heartthrob. Get better relationship answers from someone who knows. Yahoo! Answers - Check it out. http://answers.yahoo.com/dir/?link=listsid=396545433 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39723) Typo in server/settings.c
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39723 This transaction appears to have no content I have found a small typo in server/settings.c. It says investiged instead of investigated. Patch attached. Joan I have found a small typo in server/settings.c. It says investiged instead of investigated.Patch attached.Joan Index: settings.c === --- settings.c (revision 13643) +++ settings.c (working copy) @@ -403,7 +403,7 @@ N_(Amount of huts (minor tribe villages)), N_(This setting gives the exact number of huts that will be placed on the entire map. Huts are small tribal villages - that may be investiged by units.), NULL, + that may be investigated by units.), NULL, MAP_MIN_HUTS, MAP_MAX_HUTS, MAP_DEFAULT_HUTS) /* Options affecting numbers of players and AI players. These only ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39724) Typos in server/settings.c
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39724 This transaction appears to have no content Excuse me; there were two more typos in server/settings.c. Please ignore my former report. This is the good one. -- Forwarded message -- From: Joan Creus [EMAIL PROTECTED] Date: 25/09/2007 22:17 Subject: Typo in server/settings.c To: [EMAIL PROTECTED] I have found a small typo in server/settings.c. It says investiged instead of investigated. Patch attached. Joan Excuse me; there were two more typos in server/settings.c. Please ignore my former report. This is the good one.-- Forwarded message --From: Joan Creus [EMAIL PROTECTED]Date: 25/09/2007 22:17Subject: Typo in server/settings.cTo: [EMAIL PROTECTED] I have found a small typo in server/settings.c. It says investiged instead of investigated.Patch attached.Joan Index: settings.c === --- settings.c (revision 13643) +++ settings.c (working copy) @@ -403,7 +403,7 @@ N_(Amount of huts (minor tribe villages)), N_(This setting gives the exact number of huts that will be placed on the entire map. Huts are small tribal villages - that may be investiged by units.), NULL, + that may be investigated by units.), NULL, MAP_MIN_HUTS, MAP_MAX_HUTS, MAP_DEFAULT_HUTS) /* Options affecting numbers of players and AI players. These only @@ -508,7 +508,7 @@ SSET_RULES, SSET_SCIENCE, SSET_RARE, SSET_TO_CLIENT, N_(Penalty when getting tech or gold from treaty), N_(For each technology you gain from a diplomatic treaty, you - lost research points equal to this percentage of the cost to + lose research points equal to this percentage of the cost to research a new technology. You can end up with negative research points if this is non-zero. Also applies to gold transfers in diplomatic treaties.), NULL, @@ -547,7 +547,7 @@ GEN_INT(aqueductloss, game.info.aqueductloss, SSET_RULES, SSET_ECONOMICS, SSET_RARE, SSET_TO_CLIENT, - N_(Percentage food lost when need aqueduct), + N_(Percentage food lost when aqueduct needed), N_(If a city would expand, but it can't because it needs an Aqueduct (or Sewer System), it loses this percentage of its foodbox (or half that amount if it has a ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39725) Two small typos in client
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39725
This transaction appears to have no content
Two more small typos in debug messages for the client
Joan
Two more small typos in debug messages for the clientJoan
Index: gui-sdl/gui_string.c
===
--- gui-sdl/gui_string.c (revision 13643)
+++ gui-sdl/gui_string.c (working copy)
@@ -279,7 +279,7 @@
freelog(LOG_DEBUG,
_(SDL_create_str16_surf: Font is generally %d big, and
string is %hd big), TTF_FontHeight(pString-font), pText-h);
-freelog(LOG_DEBUG, _(SDL_create_str16_surf: String is %d lenght),
+freelog(LOG_DEBUG, _(SDL_create_str16_surf: String is %d length),
pText-w);
} else {
freelog(LOG_DEBUG, SDL_create_str16_surf: pText NULL);
Index: audio.c
===
--- audio.c (revision 13643)
+++ audio.c (working copy)
@@ -256,7 +256,7 @@
freelog(LOG_ERROR,
_(No real audio subsystem managed to initialize!));
freelog(LOG_ERROR,
-_(Perhaps there is some misconfigurationg or bad permissions));
+_(Perhaps there is some misconfiguration or bad permissions));
freelog(LOG_NORMAL, _(Proceeding with sound support disabled));
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39726) Typo in helpdata.txt
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39726 This transaction appears to have no content One small typo: fist for first Joan One small typo: fist for firstJoan Index: helpdata.txt === --- helpdata.txt (revision 13643) +++ helpdata.txt (working copy) @@ -780,7 +780,7 @@ Cease-fire, Armistice, Peace, and Alliance. The first is the default state, \ while the others can be achieved by signing diplomatic treaties.\ ), _(\ - To have a diplomatic relationship with another player, you must fist \ + To have a diplomatic relationship with another player, you must first \ establish first contact with that player. To establish first contact, you \ have to move one of your units next to a city or unit belonging to that \ player, or vice versa. Unless you establish an embassy with that player, \ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39727) typo in gui-sdl/cityrep.c
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39727 $s patch attached ~Daniel gui-sdl_cityrep_c_typo.diff Description: Binary data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39704) [gui-sdl] crash with Greek locale
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39704 On 9/24/07, Daniel Markstedt [EMAIL PROTECTED] wrote: On 9/24/07, Christian Prochaska [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39704 [dmarks - Fr 14. Sep 2007, 10:58:04]: On a recent checkout of S2_1: Start the client in Greek (el) locale, connect to a server, then open the nation selection screen - crash! Backtrace attached. ~Daniel The attached patch fixes the crash, but the real problem is with the translation of some nation names. For example: #: data/nation/aborigines.ruleset:4 msgid ?plural:Aborigines msgstr ?plural: This makes nation_plural_translation() return an empty string instead of the untranslated name. Patches for el.po ~Daniel Fixes for el.po committed to S2_1 S2_2 trunk. You can commit your patch if still needed. ~Daniel ___ 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
