Re: [Freeciv-Dev] [Freeciv-i18n] .po entry makes trouble (PR#39425)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39425 Hello, Du schriebst am 02. Jul um 01:43 Uhr: It works for me. Did you remember to change +50%% also in the msgstr section? Yes, silly me. You have to change tutorial and po file at the same time. Here's a patch. Christian -- Christian Knoke* * *http://cknoke.de * * * * * * * * * Ceterum censeo Microsoft esse dividendum. --- data/scenario/tutorial.sav.orig 2007-07-01 15:58:59.0 +0200 +++ data/scenario/tutorial.sav 2007-07-02 10:04:37.530729288 +0200 @@ -148,7 +148,7 @@ to change your tax rates (by pressing shift-T) to dedicate some of\n\ your taxes directly to luxuries (every two luxuries will pacify one\n\ citizen). Building a marketplace enhances the benefit from this\n\ -by providing +50% luxuries to the city.)) +by providing +50%% luxuries to the city.)) growth5msg = true elseif size == 8 and not growth8msg then notify.event(city.owner, city.tile, E.TUTORIAL, ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#19204) superfluous call to set_client_page() in clinet.c?
URL: http://bugs.freeciv.org/Ticket/Display.html?id=19204 I reported the bug '#39423: Takes two clicks to cancel gtk client in Start New Game, Tutorial, etc in 2.1', it is a byproduct of this bug, so it should be marked dependant or invalid. I just think that this should be handled in the client gui code and not in the net code, therefore it would be better to have the client state changed notifications in the net code, and the appropriate responses in the client gui code. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39426) BUG: government/nation name translation
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39426 Committed trunk revision 13038. Surprisingly few differences from S2_1. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39405) S2_1 compile fails in gui-sdl
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39405 As of r13039, building fails in diplodlg.c (again): diplodlg.c: In function `gold_callback': diplodlg.c:369: warning: implicit declaration of function `gettext' diplodlg.c:369: warning: passing arg 1 of `append_output_window' makes pointer from integer without a cast diplodlg.c: In function `popup_diplomatic_objects': diplodlg.c:447: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:456: warning: passing arg 1 of `skip_intl_qualifier_prefix' makes pointer from integer without a cast diplodlg.c:470: warning: passing arg 1 of `skip_intl_qualifier_prefix' makes pointer from integer without a cast diplodlg.c:485: warning: passing arg 1 of `skip_intl_qualifier_prefix' makes pointer from integer without a cast diplodlg.c:506: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:519: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:527: warning: format argument is not a pointer (arg 4) diplodlg.c:541: warning: format argument is not a pointer (arg 4) diplodlg.c:558: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:573: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:607: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:614: error: structure has no member named `name' diplodlg.c:639: error: structure has no member named `name' diplodlg.c:685: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c: In function `update_diplomacy_dialog': diplodlg.c:825: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:877: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:889: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c: In function `popup_war_dialog': diplodlg.c:1298: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:1315: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:1328: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:1338: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c: In function `popup_diplomacy_dialog': diplodlg.c:1426: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:1444: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:1458: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:1460: warning: passing arg 3 of `my_snprintf' makes pointer from integer without a cast diplodlg.c:1483: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:1500: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast diplodlg.c:1514: warning: passing arg 2 of `copy_chars_to_string16' makes pointer from integer without a cast make[3]: *** [diplodlg.o] Error 1 make[2]: *** [all-recursive] Error 1 make[1]: *** [all-recursive] Error 1 make: *** [all] Error 2 ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] [Freeciv-commits] r13034 - /trunk/data/nation/lithuanian.ruleset
Hi Andrius, I checked the changes done to the ruleset and it looks like a quality update, BUT please post a patch with your changes to the rt system before committing any changes to anything outside of po/. See: http://freeciv.wikia.com/wiki/Commit_rules ~Daniel On 7/2/07, Andrius Štikonas [EMAIL PROTECTED] wrote: Author: stikonas Date: Mon Jul 2 08:41:47 2007 New Revision: 13034 URL: http://svn.gna.org/viewcvs/freeciv?rev=13034view=rev Log: Updated lithuanian ruleset (thanks to Mindaugas Šukys) Modified: trunk/data/nation/lithuanian.ruleset ___ Freeciv-commits mailing list [EMAIL PROTECTED] https://mail.gna.org/listinfo/freeciv-commits ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39405) S2_1 compile fails in gui-sdl
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39405
That turned out to be relatively easy to fix. Send more reports!
Committed S2_1 release 13041.
Index: client/gui-xaw/repodlgs.c
===
--- client/gui-xaw/repodlgs.c (revision 13039)
+++ client/gui-xaw/repodlgs.c (working copy)
@@ -228,7 +228,7 @@
if (research-researching == A_UNSET) {
my_snprintf(current_text, sizeof(current_text),
_(Researching %s: %d/%s),
- advances[A_NONE].name,
+ advance_name_translation(A_NONE),
research-bulbs_researched,
_(unknown));
} else {
@@ -242,19 +242,19 @@
if (research-tech_goal == A_UNSET) {
my_snprintf(goal_text, sizeof(goal_text),
_(Goal: %s (%d steps)),
- advances[A_NONE].name,
+ advance_name_translation(A_NONE),
0);
} else {
my_snprintf(goal_text, sizeof(goal_text),
_(Goal: %s (%d steps)),
- advances[research-tech_goal].name,
+ advance_name_translation(research-tech_goal),
num_unknown_techs_for_goal(game.player_ptr,
research-tech_goal));
}
for(i=A_FIRST, j=0; igame.control.num_tech_types; i++)
if(get_invention(game.player_ptr, i)==TECH_KNOWN) {
- tech_list_names_ptrs[j]=advances[i].name;
+ tech_list_names_ptrs[j]=advance_name_translation(i);
j++;
}
tech_list_names_ptrs[j]=0;
@@ -340,7 +340,7 @@
for(i=A_FIRST, flag=0; igame.control.num_tech_types; i++)
if(get_invention(game.player_ptr, i)==TECH_REACHABLE) {
Widget entry=
- XtVaCreateManagedWidget(advances[i].name, smeBSBObjectClass,
+ XtVaCreateManagedWidget(advance_name_translation(i), smeBSBObjectClass,
popupmenu, NULL);
XtAddCallback(entry, XtNcallback, science_change_callback,
(XtPointer) i);
@@ -357,7 +357,7 @@
(num_unknown_techs_for_goal(game.player_ptr, i) 11
|| i == research-tech_goal)) {
Widget entry=
- XtVaCreateManagedWidget(advances[i].name, smeBSBObjectClass,
+ XtVaCreateManagedWidget(advance_name_translation(i), smeBSBObjectClass,
goalmenu, NULL);
XtAddCallback(entry, XtNcallback, science_goal_callback,
(XtPointer) i);
@@ -405,7 +405,7 @@
XtVaGetValues(science_help_toggle, XtNstate, b, NULL);
if (b == TRUE) {
-popup_help_dialog_typed(advances[to].name, HELP_TECH);
+popup_help_dialog_typed(advance_name_translation(to), HELP_TECH);
} else {
dsend_packet_player_research(aconnection, to);
}
@@ -422,7 +422,7 @@
XtVaGetValues(science_help_toggle, XtNstate, b, NULL);
if (b == TRUE) {
-popup_help_dialog_typed(advances[to].name, HELP_TECH);
+popup_help_dialog_typed(advance_name_translation(to), HELP_TECH);
} else {
dsend_packet_player_tech_goal(aconnection, to);
}
@@ -489,7 +489,7 @@
if (research-researching == A_UNSET) {
my_snprintf(text, sizeof(text),
_(Researching %s: %d/%s),
- advances[A_NONE].name,
+ advance_name_translation(A_NONE),
research-bulbs_researched,
_(unknown));
} else {
@@ -505,12 +505,12 @@
if (research-tech_goal == A_UNSET) {
my_snprintf(text, sizeof(text),
_(Goal: %s (%d steps)),
- advances[A_NONE].name,
+ advance_name_translation(A_NONE),
0);
} else {
my_snprintf(text, sizeof(text),
_(Goal: %s (%d steps)),
- advances[research-tech_goal].name,
+ advance_name_translation(research-tech_goal),
num_unknown_techs_for_goal(game.player_ptr,
research-tech_goal));
}
@@ -519,7 +519,7 @@
for(i=A_FIRST, j=0; igame.control.num_tech_types; i++)
if(get_invention(game.player_ptr, i)==TECH_KNOWN) {
- tech_list_names_ptrs[j]=advances[i].name;
+ tech_list_names_ptrs[j]=advance_name_translation(i);
j++;
}
tech_list_names_ptrs[j]=0;
@@ -537,7 +537,7 @@
for(i=A_FIRST, flag=0; igame.control.num_tech_types; i++)
if(get_invention(game.player_ptr, i)==TECH_REACHABLE) {
Widget entry=
- XtVaCreateManagedWidget(advances[i].name, smeBSBObjectClass,
+ XtVaCreateManagedWidget(advance_name_translation(i),
smeBSBObjectClass,
popupmenu, NULL);
XtAddCallback(entry, XtNcallback, science_change_callback,
(XtPointer) i);
@@ -561,7 +561,7 @@
(num_unknown_techs_for_goal(game.player_ptr, i) 11
|| i == research-tech_goal)) {
Widget entry=
-
[Freeciv-Dev] (PR#39405) S2_1 compile fails in gui-sdl
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39405
[wsimpson - Mo 02. Jul 2007, 23:20:27]:
That turned out to be relatively easy to fix. Send more reports!
Committed S2_1 release 13041.
Some pointer-to-integer conversion warnings are left. Patch attached.
Index: client/gui-sdl/citydlg.c
===
--- client/gui-sdl/citydlg.c (Revision 13041)
+++ client/gui-sdl/citydlg.c (Arbeitskopie)
@@ -3213,8 +3213,6 @@
dest.x += pBuf2-w + adj_size(5);
} else {
-struct impr_type *pImpr =
- improvement_by_number(pCity-production.value);
if (improvement_has_flag(pCity-production.value, IF_GOLD)) {
@@ -3240,7 +3238,7 @@
}
-copy_chars_to_string16(pStr, improvement_name_translation(pImpr));
+copy_chars_to_string16(pStr, improvement_name_translation(pCity-production.value));
pBuf = create_text_surf_from_str16(pStr);
pBuf2 = get_building_surface(pCity-production.value);
Index: client/gui-sdl/mapview.c
===
--- client/gui-sdl/mapview.c (Revision 13041)
+++ client/gui-sdl/mapview.c (Arbeitskopie)
@@ -815,7 +815,7 @@
if (pOwner pOwner != game.player_ptr) {
/* TRANS: (nation,diplomatic_state) */
cat_snprintf(buffer, sizeof(buffer), _(\n(%s,%s)),
- nation_name_translation(nation_of_city(pOwner)),
+ nation_name_for_player(pOwner),
diplo_city_adjectives[game.player_ptr-
diplstates[pOwner-player_no].type]);
}
Index: client/gui-sdl/cityrep.c
===
--- client/gui-sdl/cityrep.c (Revision 13041)
+++ client/gui-sdl/cityrep.c (Arbeitskopie)
@@ -496,10 +496,9 @@
togrow = unit_build_shield_cost(pUnitType);
pName = utype_name_translation(pUnitType);
} else {
- struct impr_type *pImprv = improvement_by_number(pCity-production.value);
pLogo = ResizeSurface(get_building_surface(pCity-production.value), adj_size(36), adj_size(24), 1);
togrow = impr_build_shield_cost(pCity-production.value);
- pName = improvement_name_translation(pImprv);
+ pName = improvement_name_translation(pCity-production.value);
}
if(!worklist_is_empty((pCity-worklist))) {
@@ -1015,10 +1014,9 @@
togrow = unit_build_shield_cost(pUnitType);
pName = utype_name_translation(pUnitType);
} else {
-struct impr_type *pImprv = improvement_by_number(pCity-production.value);
pLogo = ResizeSurface(get_building_surface(pCity-production.value), adj_size(36), adj_size(24), 1);
togrow = impr_build_shield_cost(pCity-production.value);
-pName = improvement_name_translation(pImprv);
+pName = improvement_name_translation(pCity-production.value);
}
if(!worklist_is_empty((pCity-worklist))) {
Index: client/gui-sdl/wldlg.c
===
--- client/gui-sdl/wldlg.c (Revision 13041)
+++ client/gui-sdl/wldlg.c (Arbeitskopie)
@@ -989,7 +989,6 @@
SDL_Rect dst;
char cBuf[128];
struct unit_type *pUnit = NULL;
- struct impr_type *pImpr = NULL;
char *state = NULL;
bool advanced_tech;
bool can_build, can_eventually_build;
@@ -1323,11 +1322,9 @@
if ((advanced_tech can_eventually_build) ||
(!advanced_tech can_build)) {
- pImpr = improvement_by_number(imp);
-
pIcon = crop_rect_from_surface(pMain, NULL);
- my_snprintf(cBuf, sizeof(cBuf), %s, improvement_name_translation(pImpr));
+ my_snprintf(cBuf, sizeof(cBuf), %s, improvement_name_translation(imp));
copy_chars_to_string16(pStr, cBuf);
pStr-style |= TTF_STYLE_BOLD;
pText_Name = create_text_surf_smaller_that_w(pStr, pIcon-w - 4);
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39405) S2_1 compile fails in gui-sdl
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39405 On 7/3/07, Christian Prochaska [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39405 [wsimpson - Mo 02. Jul 2007, 23:20:27]: That turned out to be relatively easy to fix. Send more reports! Committed S2_1 release 13041. Some pointer-to-integer conversion warnings are left. Patch attached. In any case, gui-sdl builds and runs now! Back in business. :) I'm getting a bunch of new, exciting crashes though. Will post separate bug reports. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39428) [gui-sdl] crash when entering city production dialog
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39428 S2_1 r13041 on MacOSX 10.3.9: To reproduce, join a new server, start the game, find a city, enter the city dialog, click the 'Change Production' button, crash! ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39429) [gui-sdl] can't continue after being disconnected during pregame
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39429 S2_1 r13041 on MacOSX 10.3.9: To reproduce, start a new civserver, join it with the SDL client, while the client is showing the pregame screen, terminate civserver; now click the Back button in the client and the game freezes showing the start splash without a main menu. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
