[Freeciv-Dev] [bug #13541] [Patch] Fix bug hiding boolean columns in object list
Update of bug #13541 (project freeciv): Status: Ready For Test = Confirmed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13541 ___ 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] (PR#40229) [Patch] SaveScenario
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40229 [cazf...@gmail.com - Tue May 05 21:12:39 2009]: 2008/5/4 Marko Lindqvist cazf...@gmail.com: This adds server command for saving current game as scenario (and not as regular savegame) New version Scenario info structure now contains information whether current players or start positions should be saved to scenario. This patch has no client side UI for adjusting scenario parameters. I have been testing this just by sending hardcoded scenario info packets from client to server. If it's all right with you, I'll commit this patch so that the other work that has been done on top of it can go through. --- 盗んでもよろしいですか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40801) SVN Build Failure (ai/advdomestic)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40801 [mt.kine...@gmail.com - Sun May 31 23:53:54 2009]: advdomestic.c:42:25: error: advdomestic.h: No such file or directory advdomestic.c:237: warning: no previous prototype for ‘domestic_advisor_choose_build’ using current SVN HEAD revision Are you sure your svn checkout completed successfully and that you have not removed this file by mistake somehow? As far as I can see the file is present in the repository and a fresh checkout compiles cleanly. --- 君、どこから現れる。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #13586] [patch] economic report (was PR#40763) - help needed
Update of bug #13586 (project freeciv): Assigned to:None = mbook ___ Reply to this item at: http://gna.org/bugs/?13586 ___ 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 #13587] [patch] add upkeep information to units in city dialog
Update of bug #13587 (project freeciv): Assigned to:None = mbook ___ Reply to this item at: http://gna.org/bugs/?13587 ___ 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 #13580] [Patch] gold upkeep improvements (update for PR#40619)
Update of bug #13580 (project freeciv): Assigned to:None = mbook Release: = trunk ___ Reply to this item at: http://gna.org/bugs/?13580 ___ 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 #13580] [Patch] gold upkeep improvements (update for PR#40619)
Update of bug #13580 (project freeciv): Status:None = Confirmed Assigned to:None = mbook Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13580 ___ 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] [bug #13587] [patch] add upkeep information to units in city dialog
On 28/05/2009, Marko Lindqvist cazf...@gmail.com wrote: 2009/5/28 Matthias Pfafferodt: depends on 13856 You may want to make your patches a bit less interdependant. That way several of them could be handled parallel. Now it seems that I cannot handle any of them before book has finished handling first ones. Sorry, I will try to get to them as soon as possible (been a little distracted by the other freecivs). --- 夜俺はスーパーヒーローになる。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #13581] [patch] city_units_upkeep (was PR#40759)
Update of bug #13581 (project freeciv): Status:None = Confirmed Assigned to:None = mbook Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13581 ___ 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 #13582] [patch] extend the gold upkeep system (was PR#40760)
Update of bug #13582 (project freeciv): Assigned to:None = mbook ___ Follow-up Comment #1: Patch is fine except for the use of 'true' and 'false' which should be 'TRUE' and 'FALSE'. I will fix that and commit it. 本当の誠は何なのだ。 ___ Reply to this item at: http://gna.org/bugs/?13582 ___ 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 #13583] [patch] shield2gold_basics (was PR#40761)
Update of bug #13583 (project freeciv): Status:None = In Progress Assigned to:None = mbook ___ Follow-up Comment #1: Alright some basic stuff to fix for this patch: - Try to avoid purely whitespace changes in the future (a little is ok I guess, but keep it in mind). - Fix the typo 'teach' which should be 'tech' in the comment for city_unit_upkeep(). - Fix the typo 'shild' which should be 'shield' in the comment in utype_upkeep_cost(). - Try to avoid asking questions in comments in the code that really should be asked in the patch submission or on freeciv-dev. Use a FIXME: or TODO: if you feel it should be left for another later patch. - Fix incorrect spelling 'fallthru' which should be 'fall through'. The above is really minor stuff, but my main objection is the change to the default ruleset. I don't think this should be done; if you want to make it easier for us to test the new effect, provide a custom ruleset and savegame. 諸君、これ以上です。 ___ Reply to this item at: http://gna.org/bugs/?13583 ___ 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 #13585] [patch] shield2gold_units (was PR#40762)
Update of bug #13585 (project freeciv): Status:None = In Progress Assigned to:None = mbook ___ Follow-up Comment #1: This patch is fine except for the changes to the default ruleset which I do not agree with as stated in #13583. 我々の純潔を保たなければなりません。 ___ Reply to this item at: http://gna.org/bugs/?13585 ___ 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 #13586] [patch] economic report (was PR#40763) - help needed
Update of bug #13586 (project freeciv): Category:None = general Status:None = In Progress ___ Follow-up Comment #1: - the unit upkeep information is send to the clients in packet_unit and packet_unit_short_info (needed?) As far as I know, the short version of the unit info packet is for enemy units, or special circumstances (e.g. the unit goes out of sight hack). Probably upkeep information should not be included in those packets, or is not needed. at the moment the packet information do not reach the client. why? - HELP NEEDED This is probably because you do not call send_unit _info() when the upkeep values change at the server side. This should happen at least everytime you call city_units_upkeep() for all of the supported units. I would add that since city_units_upkeep() is never called from the client, it should probably have stayed in the server code (cityturn or tools). My own feeling is that putting things in common/ is not such a great idea, since it makes it easy to introduce hard-to-work-around constraints and dependencies. Ideally only very simple very modular code should be kept there. But that is a discussion for another ticket... 制約とか依存とかそんなものは嫌だ。 ___ Reply to this item at: http://gna.org/bugs/?13586 ___ 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 #13587] [patch] add upkeep information to units in city dialog
Update of bug #13587 (project freeciv): Status:None = In Progress ___ Follow-up Comment #2: possible problem: to much information for a diplomat/spy? Then the server should not send the information in the first place. You should assume that users could make their own clients to read this information. Anyway this information should not be sent as I said in #13586. A better design would be to pass the astr to the unit_upkeep_text() function, removing the need for non-reentrant static variables, and to allow the function to not append any string if the upkeep information does not exist. By the way, how would the client distinguish between a unit for which it has no upkeep information, and a unit which has all zero upkeep values? 今日の日本語の授業が終わりました。 ___ Reply to this item at: http://gna.org/bugs/?13587 ___ 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 #13524] [Patch] Alternate widget layout for small displays
Update of bug #13524 (project freeciv): Status: Ready For Test = Confirmed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13524 ___ 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 #13556] [RT #40485] Bug: AI does not change government
URL: http://gna.org/bugs/?13556 Summary: [RT #40485] Bug: AI does not change government Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:16 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: Bug: AI does not change government Date: Sun, 14 Sep 2008 12:07:41 +1200 To: rep...@rt.freeciv.org From: Nathan Currier nwcurr...@gmail.com Republic. I am running Freeciv-2.1.6-win-gtk2 on Windows Vista. It is approximately 0 AD, I have had Marco Polo's Embassy for a while, and all 19 AIs are living under Despotism. The number of turns for a revolution is at most 4, but for some reason the AIs do not consider it worthwile to change government. Some of them have had knowledge of Monarchy for ages but they will not change. I doubt there is any realistic situation where an AI would not benefit from changing from Despotism to Monarchy. I have been doing a lot of loading and saving so this might be related to the load/save revolutions bug (#14333), but I have never seen an AI get stuck in anarchy. public. ___ Reply to this item at: http://gna.org/bugs/?13556 ___ 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 #13557] [RT #40412] AI stops building wonders after game load
URL: http://gna.org/bugs/?13557 Summary: [RT #40412] AI stops building wonders after game load Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:19 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: Bug report Date: Mon, 28 Jul 2008 11:29:11 +0300 To: rep...@rt.freeciv.org From: gintl...@gmail.com Hi, every time I load saved game all AI players stops building all wonders if any are in progress. It happens every time and is easy to reproduce. Tried it with 2.1.4 and 2.1.5 versions which I downloaded from official site (GTK + client binary distribution). I run it under Windows XP SP3. Best regards Gintas ___ Reply to this item at: http://gna.org/bugs/?13557 ___ 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 #13558] [RT #40005] Strange autosettler behavior
URL: http://gna.org/bugs/?13558 Summary: [RT #40005] Strange autosettler behavior Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:21 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: Strange autosettler behavior in Freeciv 2.1.2. Date: Wed, 9 Jan 2008 01:30:53 +0100 To: rep...@rt.freeciv.org From: Dawid Ciężarkiewicz dawid.ciezarkiew...@jabster.pl Hi, I'm using 2.1.2 GTK client (and local server). I was playing with 5 city nation with large number of workers. When they finished almost everything possible with roads and irrigation they started to change grasslands to forests and that caused less food production and some of my cities sized down. Is this is bug in autosettler logic or I don't know about something? Best regards, Dawid Ciężarkiewicz ___ Reply to this item at: http://gna.org/bugs/?13558 ___ 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 #13560] [RT #39542] Cities Build too Many Expensive Buildings
Follow-up Comment #1, bug #13560 (project freeciv): Subject: Re: [Freeciv-Dev] (PR#39542) Cities Build too Many Expensive Buildings Date: Sun, 12 Aug 2007 16:31:27 +0300 To: rep...@bugs.freeciv.org From: Marko Lindqvist cazf...@gmail.com On 12/08/07, ba...@actrix.co.nz ba...@actrix.co.nz wrote: This is ok, until the Nation has put one Airport in every town, even when the towns are 3 squares away and connected by railway, in the middle of a island, a very long way away from any enemy. Known bug with Airports is that AI considers them Barracks - and yet it does not think them redundant if city already has Barracks and Port Facility (another building considered Barracks). There is FIXME: comment in aicity.c:improvement_effect_value():562: case EFT_VETERAN_BUILD: /* FIXME: check other reqs (e.g., unitclass, unitflag) */ - ML ___ Reply to this item at: http://gna.org/bugs/?13560 ___ 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 #13559] [RT #39700] AI should not ask for help against enemies we have not yet met
URL: http://gna.org/bugs/?13559 Summary: [RT #39700] AI should not ask for help against enemies we have not yet met Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:23 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: Diplomacy patch: AI should not ask for help against enemies we have not yet met Date: Tue, 11 Sep 2007 16:46:04 + (GMT) To: rep...@rt.freeciv.org From: Per Inge Mathisen p...@freeciv.org See lengthy $SUBJECT. Patch attached. - Per Carpe noctem ___ File Attachments: --- Date: Sunday 05/24/2009 at 03:23 Name: dontask.diff Size: 425B By: mbook http://gna.org/bugs/download.php?file_id=5807 ___ Reply to this item at: http://gna.org/bugs/?13559 ___ 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 #13561] [RT #39352] AI does not attack when it could
URL: http://gna.org/bugs/?13561 Summary: [RT #39352] AI does not attack when it could Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:36 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: AI stupidness Date: Sun, 22 Apr 2007 11:47:50 +0300 To: rep...@rt.freeciv.org From: Alexander Sayenko saye...@jyu.fi Hi There is a weird AI stupidness. There is a Portuguese city named Visue, in which a huge army resides. None a unit makes an attempt to attack my neighboring cities (though the AI skill level is hard), this army could crash them easily. A somewhat similar behavior was observed earlier when an army can stand near a city with city walls without trying to make any attempt to attack. Sincerely, Alexander Sayenko ___ File Attachments: --- Date: Sunday 05/24/2009 at 03:36 Name: civgame+1555m.sav.gz Size: 28kB By: mbook http://gna.org/bugs/download.php?file_id=5808 ___ Reply to this item at: http://gna.org/bugs/?13561 ___ 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 #13560] [RT #39542] Cities Build too Many Expensive Buildings
URL: http://gna.org/bugs/?13560 Summary: [RT #39542] Cities Build too Many Expensive Buildings Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:31 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: Cities Build too Many Expensive Buildings Date: Sun, 12 Aug 2007 14:07:26 +1200 To: The default queue rep...@rt.freeciv.org From: banjo ba...@actrix.com Hi Ive noticed that later on in a game, the AI's start to build Airports, lots of Airports, and other expensive buildings - especially in rndCiv where there can be so many more expensive buildings available. This is ok, until the Nation has put one Airport in every town, even when the towns are 3 squares away and connected by railway, in the middle of a island, a very long way away from any enemy. Ive found that this causes taxes to overtime got to 100% and science output disappears. The effect of this is that the AI's get to a certain tech level and then stagnate. The solution is prolly quite complex, but the AI needs to penalize building too many expensive to maintain buildings. This means taking into account what other cities are doing. Rough suggestions... * (where C = yearly building maintenance cost) allow AI to build in 1/C cities, So All cities can build 1gold buildings, but only 1/3 of cities build a 3gold airport. This is fairly arbitrary, but may get the AI out of the trap. * decrease want by some formula, that takes into account... - how useful building is - how expensive the building is to maintain - how much income the city produces - how may other cities nearby have this building -billy ___ Reply to this item at: http://gna.org/bugs/?13560 ___ 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 #13562] [RT #34224] Memory leak in ai diplomacy code
URL: http://gna.org/bugs/?13562 Summary: [RT #34224] Memory leak in ai diplomacy code Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:38 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: Memory loss in ai diplomacy Date: Sun, 21 Jan 2007 11:44:12 +0200 To: b...@freeciv.org From: Marko Lindqvist cazf...@gmail.com Form valgrind: ==3480== 1,036 (396 direct, 640 indirect) bytes in 35 blocks are definitely lost in loss record 2 of 6 ==3480== at 0x401C422: malloc (vg_replace_malloc.c:149) ==3480== by 0x804BD0D: fc_real_malloc (mem.c:82) ==3480== by 0x8072F52: handle_diplomacy_init_meeting_req (diplhand.c:690) ==3480== by 0x81131F7: ai_diplomacy_suggest (advdiplomacy.c:789) ==3480== by 0x8114F2C: ai_diplomacy_actions (advdiplomacy.c:1547) ==3480== by 0x8052EBE: main_loop (srv_main.c:662) ==3480== by 0x80533E3: srv_main (srv_main.c:1993) ==3480== by 0x804A63B: main (civserver.c:256) - ML ___ Reply to this item at: http://gna.org/bugs/?13562 ___ 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 #13563] [RT #34034] wishlist: contol AI aggressiveness
URL: http://gna.org/bugs/?13563 Summary: [RT #34034] wishlist: contol AI aggressiveness Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/24/2009 at 03:43 Category: ai Severity: 3 - Normal Priority: 1 - Later Status: None Assigned to: None Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Subject: wishlist: contol AI aggressiveness Date: Fri, 19 Jan 2007 11:07:06 +0900 To: Freeciv bug tracker b...@freeciv.org From: Daniel Markstedt markst...@gmail.com This is related to my ticket about AI difficulty but could be implemented separately. This idea would give AIs a new aggressiveness variable besides the difficulty level. In forum user Sol's words, it could for example be ...a 1-5 value box that would set how agressive the enemy AI is, with 1 being tree-hugger and 5 being Ghengis Khan... ~Daniel ___ Reply to this item at: http://gna.org/bugs/?13563 ___ 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 #13550] [Patch] Property editor widget overhaul
URL: http://gna.org/bugs/?13550 Summary: [Patch] Property editor widget overhaul Project: Freeciv Submitted by: mbook Submitted on: Friday 05/22/2009 at 20:03 Category: editor Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: The attached patch cleans up and simplifies some aspects of property editor interface. In light of other changes to support small displays, and because the default amplio tileset is so big, I have made the property editor window a popup dialog (as it once was). I think this is a just a simpler, cleaner UI design than trying to pack it into the bottom notebook. The various property page buttons (create, apply, etc.) have been moved to hopefully more intuitively logical places within the property pages. Also, the property panel frame now shows what kind of object's properties are being examined (e.g. Game Properties, Player Properties, etc.). Finally, lots of small tweaks to widget packing and layout. いらっしゃいませ！分解修理ですか。 ___ File Attachments: --- Date: Friday 05/22/2009 at 20:03 Name: 0001-Property-editor-widget-overhaul.patch Size: 29kB By: mbook http://gna.org/bugs/download.php?file_id=5804 ___ Reply to this item at: http://gna.org/bugs/?13550 ___ 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 #13498] client abort in 2.1.9+ GTK
Follow-up Comment #11, bug #13498 (project freeciv): I committed the last patch, but of course that does not really solve the underlying problem. I'll leave this ticket open for now, in case more information comes to light. 家に帰りたいだけなの。 ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13515] [Patch] Improved voting code from warclient
Update of bug #13515 (project freeciv): Status: Ready For Test = Confirmed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13515 ___ 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 #13542] [Patch] Game scenario properties in property editor
URL: http://gna.org/bugs/?13542 Summary: [Patch] Game scenario properties in property editor Project: Freeciv Submitted by: mbook Submitted on: Thursday 05/21/2009 at 06:04 Category: editor Severity: 3 - Normal Priority: 1 - Later Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patch implements the 4 new scenario fields of the game struct as editable properties of the game object in the property editor, and a few other small changes I did not feel like splitting into separate patches. Depends on RT#40229, GNA#13540. The main novelty is that the extviewer property widget is augmented so that the 'description' property can be edited in a full, multi-line textview. Some small improvements/changes in nearby code: - Removed the 'is_scenario' if-test in handle_scenario _info(), on both the client side and the server side (this is because the property editor expects that fields can be set individually). - Added editable gtktextviews to the types of widgets allowed to grab keyboard events in toplevel_handler() in gui_main.c (man was this annoying to track down). - Updated network capstring due to new packet fields. - Added error message for missing handler in extviewer_view_cell_toggled(). - Split up propval_free() into itself and propval_free _data() (I thought this would be needed, but then it turned out not to be; I left it anyway for posterity). - Factored out some common code in extviewer_clear _widgets() switch cases. - Fixed typo extviwer (twice). I'm not sure if the duplicated work in handle_scenario _info() and handle_edit_game() is ideal. Sure if there were a specialized gui widget for setting scenario parameters it would have to use the scenario info packet, but I think the property editor is enough (I will fix it up soon so that it is less annoying to use). I also noticed that I am basically reimplementing the delta code in the edit handlers... it would be great if the handler functions could access the delta bitfields so that the if-checks would not need to be run twice, but I suppose the delta compression could also just be turned off with the 'no-delta' flag in the packet definitions. I'll check which solution would be best later. 私のシナリオにある役割が欲しいか。 ___ File Attachments: --- Date: Thursday 05/21/2009 at 06:04 Name: game_scenario_properties.patch Size: 21kB By: mbook http://gna.org/bugs/download.php?file_id=5799 ___ Reply to this item at: http://gna.org/bugs/?13542 ___ 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 #13542] [Patch] Game scenario properties in property editor
Update of bug #13542 (project freeciv): Priority: 1 - Later = 5 - Normal ___ Reply to this item at: http://gna.org/bugs/?13542 ___ 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 #13543] [Patch] Sanitize strings in object list columns
URL: http://gna.org/bugs/?13543 Summary: [Patch] Sanitize strings in object list columns Project: Freeciv Submitted by: mbook Submitted on: Thursday 05/21/2009 at 06:26 Category: editor Severity: 2 - Minor Priority: 3 - Low Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: A small patch to pretty-print strings in columns of the object list in the property editor. Newlines, tabs, etc. are replaced by spaces and if the string is longer than 28 characters, it is truncated and suffixed with 絶妙な証明を発見した… ___ File Attachments: --- Date: Thursday 05/21/2009 at 06:26 Name: sanitize_object_list_strings.diff Size: 1kB By: mbook http://gna.org/bugs/download.php?file_id=5800 ___ Reply to this item at: http://gna.org/bugs/?13543 ___ 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 #13544] [Patch] Menu item for game/scenario properties
URL: http://gna.org/bugs/?13544 Summary: [Patch] Menu item for game/scenario properties Project: Freeciv Submitted by: mbook Submitted on: Thursday 05/21/2009 at 06:37 Category: editor Severity: 2 - Minor Priority: 3 - Low Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Patch implements a menu item in the Edit menu that when activated brings up the property editor showing the game property page. To support this, editgui_popup_properties() is made to take a preferred page argument, and all occurences and stubs are updated. メニューを見せていただけませんか。 ___ File Attachments: --- Date: Thursday 05/21/2009 at 06:37 Name: scenario_properties_menu_item.patch Size: 10kB By: mbook http://gna.org/bugs/download.php?file_id=5801 ___ Reply to this item at: http://gna.org/bugs/?13544 ___ 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] (PR#40229) [Patch] SaveScenario
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40229 [book - Tue May 12 16:17:19 2009]: [cazf...@gmail.com - Tue May 12 15:21:56 2009]: 2009/5/6 Marko Lindqvist cazf...@gmail.com: 2008/5/4 Marko Lindqvist cazf...@gmail.com: This adds server command for saving current game as scenario (and not as regular savegame) New version Scenario info structure now contains information whether current players or start positions should be saved to scenario. This patch has no client side UI for adjusting scenario parameters. I have been testing this just by sending hardcoded scenario info packets from client to server. Madeline, what kind of UI would best fit overall editor design? We should be able to set generic scenario parameters such as name, description and whether scenario has preset players or only starting locations. You can use the property editor system: add the scenario parameters as properties of the game object. The steps to do this are documented near the top of editprop.c, in the objprop declaration header. I can do this for you in the next few days if you like, I have done this now in GNA#13542. --- 失敗は構わん。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #13546] [Patch] Always select first object in property editor object list
URL: http://gna.org/bugs/?13546 Summary: [Patch] Always select first object in property editor object list Project: Freeciv Submitted by: mbook Submitted on: Thursday 05/21/2009 at 22:33 Category: editor Severity: 2 - Minor Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patch makes the property editor always automatically select the first object in the object list, for the convenience of the user. 懐中電灯を持ってきておきます。 ___ File Attachments: --- Date: Thursday 05/21/2009 at 22:33 Name: always_select_first_objbind.diff Size: 684B By: mbook http://gna.org/bugs/download.php?file_id=5803 ___ Reply to this item at: http://gna.org/bugs/?13546 ___ 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 #13540] [Patch] Enable/disable GObject signal callbacks
URL: http://gna.org/bugs/?13540 Summary: [Patch] Enable/disable GObject signal callbacks Project: Freeciv Submitted by: mbook Submitted on: Thursday 05/21/2009 at 03:48 Category: client-gtk-2.0 Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: A small convenience patch that changes enable/disable _widget_callback to work on gobjects, since some things in gtk to which signals are attached are not full gtk widgets (e.g. gtktextbuffer). 僕は大人になったらウィジェットになる。 ___ File Attachments: --- Date: Thursday 05/21/2009 at 03:48 Name: toggle_gobject_signal_callbacks.patch Size: 9kB By: mbook http://gna.org/bugs/download.php?file_id=5797 ___ Reply to this item at: http://gna.org/bugs/?13540 ___ 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 #13541] [Patch] Fix bug hiding boolean columns in object list
URL: http://gna.org/bugs/?13541 Summary: [Patch] Fix bug hiding boolean columns in object list Project: Freeciv Submitted by: mbook Submitted on: Thursday 05/21/2009 at 04:53 Category: editor Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patch fixes a bug in the property editor that caused boolean type object properties to not show up in the object list. 本当か嘘かもうわかんないよ。 ___ File Attachments: --- Date: Thursday 05/21/2009 at 04:53 Name: fix_hidden_boolean_columns.diff Size: 962B By: mbook http://gna.org/bugs/download.php?file_id=5798 ___ Reply to this item at: http://gna.org/bugs/?13541 ___ 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 #13498] client abort in 2.1.9+ GTK
Follow-up Comment #9, bug #13498 (project freeciv): This crash has happened to me 3 times in LTXV now. Each time was just after entering / destroying an empty size 1 city. Each time the city was the capital city and the losing player was not RIP. Kevin551 Confirmed. Thanks for the information. 役に立つ情報をありがとう。 ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13498] client abort in 2.1.9+ GTK
Update of bug #13498 (project freeciv): Assigned to:None = mbook ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13498] client abort in 2.1.9+ GTK
Update of bug #13498 (project freeciv): Severity: 3 - Normal = 4 - Important Priority: 5 - Normal = 7 - High Status:None = Confirmed ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13498] client abort in 2.1.9+ GTK
Follow-up Comment #10, bug #13498 (project freeciv): Hmm well, I managed to get one crash but then never again, even retracing the same steps from the same savegame with the same binary. Furthermore the back- trace showed a slightly different code path, but still basically a map redraw from a gui callback. Without a consistent way to reproduce the bug I cannot isolate the original cause; it surely is some corruption of ptile-worked, but whether this occurs due to incorrect behavior of handle_city _info or some other client function, or even due to something on the server-side, this is unknown. Maybe civilwar is involved somehow (or maybe it just causes more changes at the same time, raising the probability that the bug occurs). Anyway, as a temporary stopgap measure the attached patch checks for a corrupted ptile-worked pointer in find_city_or_settler_near_tile(), and if found ignores it. In trunk the worked field handling is already different (there in handle_tile_info for some reason, along with the strange invisible cities hack), so I will leave that version alone for the moment. Please test and report if it at least avoids the client crash (and any other bad behavior). 何でもありえる不思議な所だった。 (file #5791) ___ Additional Item Attachment: File name: avoid_mysterious_ptile_worked_crash.diff Size:0 KB ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13524] [Patch] Alternate widget layout for small displays
URL: http://gna.org/bugs/?13524 Summary: [Patch] Alternate widget layout for small displays Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/17/2009 at 01:18 Category: client-gtk-2.0 Severity: 4 - Important Priority: 6 Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patches for S2_1 and trunk implement a gui option to have the widgets in the main window rearranged so that they fit on a short display. The option 'small_display_layout' if enabled causes the overview, and the player and unit info boxes to extend over the entire left side of the window. If the option is disabled (the default), the current widget layout is preserved. To avoid complicated widget reparenting chicanery, the option only takes affect when the program is restarted. A call to gtk_widget_set_size_request() for the main map canvas is added, so that the order of packing the widgets does not cause the drawing area to shrink to a height of a few pixels. It would be good if this patch could be tested on other platforms where gtk widget packing might be implemented a little differently (e.g. win32, mac). Also attached is a screenshot with amplio showing the size of the smallest possible window. 小さい方は合点します。 ___ File Attachments: --- Date: Sunday 05/17/2009 at 01:18 Name: S2_1-small_display_layout_option.patch Size: 5kB By: mbook http://gna.org/bugs/download.php?file_id=5785 --- Date: Sunday 05/17/2009 at 01:18 Name: trunk-small_display_layout_option.patch Size: 5kB By: mbook http://gna.org/bugs/download.php?file_id=5786 --- Date: Sunday 05/17/2009 at 01:18 Name: minigui.jpg Size: 76kB By: mbook http://gna.org/bugs/download.php?file_id=5787 ___ Reply to this item at: http://gna.org/bugs/?13524 ___ 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 #13525] [Patch] Scrollable options window
URL: http://gna.org/bugs/?13525 Summary: [Patch] Scrollable options window Project: Freeciv Submitted by: mbook Submitted on: Sunday 05/17/2009 at 02:16 Category: client-gtk-2.0 Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patch for S2_1 and trunk makes the options list in the local options dialog appear in a scroll window if there are so many options that to display them all would take up more than 400 pixels of screen height. This is currently the case for the interface options, which have been proliferating lately. :) もうえさをやらないでください！ ___ File Attachments: --- Date: Sunday 05/17/2009 at 02:16 Name: scrollable_options.diff Size: 2kB By: mbook http://gna.org/bugs/download.php?file_id=5788 ___ Reply to this item at: http://gna.org/bugs/?13525 ___ 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 #13500] savenames with UTF-8 characters do not work
Follow-up Comment #1, bug #13500 (project freeciv): Setting value characters are read in until they fail is_ok_opt_value_char(), which looks like return (c == '-') || (c == '*') || (c == '+') || (c == '=') || my_isalnum(c); So full utf8 is not allowed as a value for settings. I suppose this is so that path separators or other such things cannot be sneaked into the strings. Maybe for hack access connections this restriction can be lifted. でも今はひどく疲れたんだ。 ___ Reply to this item at: http://gna.org/bugs/?13500 ___ 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] (PR#40775) Crash playing SDL version 2.1.9 on Windows 98
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40775 [danutt...@rocketmail.com - Thu May 14 00:43:53 2009]: The attached CIVCLIENT.RPT file was generated following a crash of FreeCiv-SDL on a Windows 98 box. I had built Marco Polo's Embassy, and had agreed to a cease-fire with all of my AI opponents. Now I had just agreed to peace with all but one of the opponents. I pressed F3 to contact the only opponent that was still in cease- fire, but the program crashed. I did not see the dialog before it went down. I saw no problems with the other opponents when I was talking with them. Can this please be fixed? If you need more details, please ask. The savegame immediately before the crash or some turns prior would be helpful. --- 保証しませんけど。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #13515] [Patch] Improved voting code from warclient
Follow-up Comment #1, bug #13515 (project freeciv): I decided that this temporary setback outways the advantage gained from... A rather funny corruption of the English language. :D Anyway, just so that I do not inadvertently cause some ugly neologism to come into being, and to fix the logic of that sentence for those who would care enough to try to understand it, here is a re-write: I decided that this temporary setback is acceptable in light of the advantage gained by synchronizing the two branches. 虫には夢があるかな。 ___ Reply to this item at: http://gna.org/bugs/?13515 ___ 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] (PR#40229) [Patch] SaveScenario
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40229 [cazf...@gmail.com - Tue May 12 15:21:56 2009]: 2009/5/6 Marko Lindqvist cazf...@gmail.com: 2008/5/4 Marko Lindqvist cazf...@gmail.com: This adds server command for saving current game as scenario (and not as regular savegame) New version Scenario info structure now contains information whether current players or start positions should be saved to scenario. This patch has no client side UI for adjusting scenario parameters. I have been testing this just by sending hardcoded scenario info packets from client to server. Madeline, what kind of UI would best fit overall editor design? We should be able to set generic scenario parameters such as name, description and whether scenario has preset players or only starting locations. You can use the property editor system: add the scenario parameters as properties of the game object. The steps to do this are documented near the top of editprop.c, in the objprop declaration header. I can do this for you in the next few days if you like, though it might be a good test to see if the property editor design is indeed as modular and easily modifiable by others as I had hoped. ;) --- これは試験だ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40773) Bug: Changing Nation/Name of different Player
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40773
Version 2 fixes the sdl client too.
---
こしょうも。
client/gui-gtk-2.0/dialogs.c | 47 -
client/gui-sdl/dialogs.c | 21 +-
2 files changed, 51 insertions(+), 17 deletions(-)
diff --git a/client/gui-gtk-2.0/dialogs.c b/client/gui-gtk-2.0/dialogs.c
index a4efb61..0f78848 100644
--- a/client/gui-gtk-2.0/dialogs.c
+++ b/client/gui-gtk-2.0/dialogs.c
@@ -60,7 +60,7 @@
/**/
static GtkWidget *races_shell;
-struct player *races_player;
+static char races_player_name[MAX_LEN_NAME];
static GtkWidget *races_nation_list[MAX_NUM_NATION_GROUPS + 1];
static GtkWidget *races_leader;
static GList *races_leader_list;
@@ -88,6 +88,7 @@ static void races_city_style_callback(GtkTreeSelection *select, gpointer data);
static gboolean races_selection_func(GtkTreeSelection *select,
GtkTreeModel *model, GtkTreePath *path,
gboolean selected, gpointer data);
+static const struct player *get_races_player(void);
static int selected_nation;
static int selected_sex;
@@ -625,6 +626,7 @@ static GtkWidget* create_list_of_nations_in_group(struct nation_group* group,
GtkTreeSelection *select;
GtkCellRenderer *render;
GtkTreeViewColumn *column;
+ const struct player *races_player = get_races_player();
store = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_BOOLEAN,
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
@@ -777,7 +779,11 @@ static void create_races_dialog(struct player *pplayer)
GTK_RESPONSE_ACCEPT,
NULL);
races_shell = shell;
- races_player = pplayer;
+ if (pplayer) {
+sz_strlcpy(races_player_name, player_name(pplayer));
+ } else {
+races_player_name[0] = '\0';
+ }
setup_dialog(shell, toplevel);
gtk_window_set_position(GTK_WINDOW(shell), GTK_WIN_POS_CENTER_ON_PARENT);
@@ -1233,13 +1239,22 @@ static void races_city_style_callback(GtkTreeSelection *select, gpointer data)
**/
static void races_response(GtkWidget *w, gint response, gpointer data)
{
+ const struct player *races_player;
+ int plrno;
+
+ races_player = get_races_player();
+ if (!races_player) {
+popdown_races_dialog();
+return;
+ }
+ plrno = player_number(races_player);
+
if (response == GTK_RESPONSE_ACCEPT) {
const char *s;
if (selected_nation == -1) {
- dsend_packet_nation_select_req(aconnection,
- races_player-player_no,
- -1, FALSE, , 0);
+ dsend_packet_nation_select_req(aconnection, plrno,
+ -1, FALSE, , 0);
popdown_races_dialog();
return;
}
@@ -1263,13 +1278,10 @@ static void races_response(GtkWidget *w, gint response, gpointer data)
return;
}
-dsend_packet_nation_select_req(aconnection,
- player_number(races_player), selected_nation,
- selected_sex, s, selected_city_style);
+dsend_packet_nation_select_req(aconnection, plrno, selected_nation,
+ selected_sex, s, selected_city_style);
} else if (response == GTK_RESPONSE_NO) {
-dsend_packet_nation_select_req(aconnection,
- player_number(races_player),
- -1, FALSE, , 0);
+dsend_packet_nation_select_req(aconnection, plrno, -1, FALSE, , 0);
} else if (response == GTK_RESPONSE_CANCEL) {
/* Nothing - this allows the player to keep his currently selected
* nation. */
@@ -1334,3 +1346,16 @@ void popdown_all_game_dialogs(void)
gui_dialog_destroy_all();
}
+/**
+ Helper function to work-around the fact that players may be renumbered
+ over the life-time of the nation selection dialog. It uses player names
+ ('races_player_name') to try to uniquely determine the player that the
+ user wants to modify.
+
+ NB: May return NULL.
+**/
+static const struct player *get_races_player(void)
+{
+ return find_player_by_name(races_player_name);
+}
+
diff --git a/client/gui-sdl/dialogs.c b/client/gui-sdl/dialogs.c
index ac9aab4..bb1164e 100644
--- a/client/gui-sdl/dialogs.c
+++ b/client/gui-sdl/dialogs.c
@@ -72,7 +72,7 @@
#include dialogs.h
-struct player *races_player;
+static char races_player_name[MAX_LEN_NAME];
extern bool is_unit_move_blocked;
extern void popdown_diplomat_dialog(void);
@@ -2197,6 +2197,7 @@ static int races_dialog_ok_callback(struct widget *pStart_Button)
if (Main.event.button.button == SDL_BUTTON_LEFT) {
struct NAT *pSetup = (struct NAT *)(pNationDlg-pEndWidgetList-data.ptr);
char *pStr = convert_to_chars(pSetup-pName_Edit-string16-text);
+const struct player *races_player;
/* perform a minimum of
[Freeciv-Dev] (PR#40773) Bug: Changing Nation/Name of different Player
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40773
[...@gdv.uni-hannover.de - Mon May 11 14:07:45 2009]:
Hi there,
this is a bug we stumble upon every couple of weeks:
Sometimes before the game starts, when you choose nation
and name, the nation and name of _another_ player is
changed instead. Example; Peter, Paul and Mary are logged
in and Peter chooses to be called english ruler Peter the
1st, may result in Mary becoming english with leader name
Peter the 1st, usualy spreading some confusion ;)
I belive (without having looked at the code yet) that
the following might be the cause: We play with aifill
17. Player A opens nation selection dialog. Player B
connects, removing an ai. Player A chooses his/her nation
with a now wrong player id.
Thank you for the detailed report; you are exactly right
with your guess, giving me the enough correct information
to easily find and fix the problem.
I have confirmed this bug in S2_1; trunk seems unaffected.
The cause of this bug appears to be due to the nation
picking dialog code assuming that players will never be
renumbered between its invocation and closing (i.e. that
player pointers are unique). This is not correct and it
is made apparent when aifill is in effect (players may
be renumbered when one is removed).
The attached patch is a somewhat hackish workaround that
uses player names to try and uniquely identify which
player should be affected by the nation picking dialog.
Some cursory testing shows that it avoids the reported
issue.
The solution is not terribly good since it just replaces
one assumption (unique player pointers) with another
(unique player names), but thankfully the design of
player handling is already improved in trunk (i.e. no
renumbering), so this temporary fix for the S2_1 branch
will not need to be kept in the future.
PS: The guest account of rt web interface is not working ...
Use the GNA bug tracker from now on:
https://gna.org/bugs/?group=freeciv
---
塩ください。
client/gui-gtk-2.0/dialogs.c | 47 -
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/client/gui-gtk-2.0/dialogs.c b/client/gui-gtk-2.0/dialogs.c
index a4efb61..0f78848 100644
--- a/client/gui-gtk-2.0/dialogs.c
+++ b/client/gui-gtk-2.0/dialogs.c
@@ -60,7 +60,7 @@
/**/
static GtkWidget *races_shell;
-struct player *races_player;
+static char races_player_name[MAX_LEN_NAME];
static GtkWidget *races_nation_list[MAX_NUM_NATION_GROUPS + 1];
static GtkWidget *races_leader;
static GList *races_leader_list;
@@ -88,6 +88,7 @@ static void races_city_style_callback(GtkTreeSelection *select, gpointer data);
static gboolean races_selection_func(GtkTreeSelection *select,
GtkTreeModel *model, GtkTreePath *path,
gboolean selected, gpointer data);
+static const struct player *get_races_player(void);
static int selected_nation;
static int selected_sex;
@@ -625,6 +626,7 @@ static GtkWidget* create_list_of_nations_in_group(struct nation_group* group,
GtkTreeSelection *select;
GtkCellRenderer *render;
GtkTreeViewColumn *column;
+ const struct player *races_player = get_races_player();
store = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_BOOLEAN,
GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING);
@@ -777,7 +779,11 @@ static void create_races_dialog(struct player *pplayer)
GTK_RESPONSE_ACCEPT,
NULL);
races_shell = shell;
- races_player = pplayer;
+ if (pplayer) {
+sz_strlcpy(races_player_name, player_name(pplayer));
+ } else {
+races_player_name[0] = '\0';
+ }
setup_dialog(shell, toplevel);
gtk_window_set_position(GTK_WINDOW(shell), GTK_WIN_POS_CENTER_ON_PARENT);
@@ -1233,13 +1239,22 @@ static void races_city_style_callback(GtkTreeSelection *select, gpointer data)
**/
static void races_response(GtkWidget *w, gint response, gpointer data)
{
+ const struct player *races_player;
+ int plrno;
+
+ races_player = get_races_player();
+ if (!races_player) {
+popdown_races_dialog();
+return;
+ }
+ plrno = player_number(races_player);
+
if (response == GTK_RESPONSE_ACCEPT) {
const char *s;
if (selected_nation == -1) {
- dsend_packet_nation_select_req(aconnection,
- races_player-player_no,
- -1, FALSE, , 0);
+ dsend_packet_nation_select_req(aconnection, plrno,
+ -1, FALSE, , 0);
popdown_races_dialog();
return;
}
@@ -1263,13 +1278,10 @@ static void races_response(GtkWidget *w, gint response, gpointer data)
return;
}
-dsend_packet_nation_select_req(aconnection,
- player_number(races_player), selected_nation,
- selected_sex, s, selected_city_style);
+
[Freeciv-Dev] (PR#40625) Lake tiles for 2.2, Amplio
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40625 [cazf...@gmail.com - Tue May 05 00:28:36 2009]: 2009/1/5 Madeline Book madeline.b...@gmail.com: [jwbj...@gmail.com - Sun Jan 04 22:01:23 2009]: I created the requested images for the lake terrain for the amplio tileset. see here: http://forum.freeciv.org/viewtopic.php?p=22599#22599 Alright I added the lake graphics at the bottom of terrain2.png (new version attached). I'm not sure though how exactly the terrain2.spec file needs to be changed... Actually, they go to water.png. New version attached along with specfile patch. Applies on top of gna patch #13479 Thank you for resolving this. I tried to add the lake graphics myself a few weeks ago but I couldn't for the love of me figure out how to make it work... :/ --- そのややこしい荷札では私は訳が分からなくなってしまった。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] [bug #13498] client abort in 2.1.9+ GTK
Follow-up Comment #6, bug #13498 (project freeciv): I'm going to commit soon the attached patch which splits the assertion in to two lines so we can better see what condition is failing. よく見えないからね。 (file #5765) ___ Additional Item Attachment: File name: split_up_city_assertion.diff Size:0 KB ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13498] client abort in 2.1.9+ GTK
Follow-up Comment #7, bug #13498 (project freeciv): Oops minor mistake in the last patch... しまった、終わりものを忘れた (file #5766) ___ Additional Item Attachment: File name: split_up_city_assertion_v2.diff Size:0 KB ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13490] [Patch] Some useful connection accessor functions
Update of bug #13490 (project freeciv): Status: Ready For Test = Confirmed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13490 ___ 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 #13494] control and save bugs in recent 2.1.9+
Update of bug #13494 (project freeciv): Status:None = Fixed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13494 ___ 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 #13494] control and save bugs in recent 2.1.9+
Update of bug #13494 (project freeciv): Assigned to:None = mbook ___ Follow-up Comment #3: I committed the hack access fix. If there are further issues with savegames, please make a separate ticket for each one. 毎度あり。 ___ Reply to this item at: http://gna.org/bugs/?13494 ___ 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 #13494] control and save bugs in recent 2.1.9+
Follow-up Comment #1, bug #13494 (project freeciv): Here's a fix for the loss of hack access bug at least. 三時間したら行ってきます。 (file #5757) ___ Additional Item Attachment: File name: fix_lost_hack_access.diff Size:0 KB ___ Reply to this item at: http://gna.org/bugs/?13494 ___ 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 #13498] client abort in 2.1.9+ GTK
Follow-up Comment #1, bug #13498 (project freeciv): Can you post the savegame where this happens? 解剖しましょう。 ___ Reply to this item at: http://gna.org/bugs/?13498 ___ 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 #13488] [Patch] free_tokens() helper function for S2_1
URL: http://gna.org/bugs/?13488 Summary: [Patch] free_tokens() helper function for S2_1 Project: Freeciv Submitted by: mbook Submitted on: Tuesday 05/05/2009 at 17:10 Category: general Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patch ports the utility helper function free_tokens() to S2_1, since it is often used in the coming warclient code. Trunk already has this function. トークンを切らしているという札があった。 ___ File Attachments: --- Date: Tuesday 05/05/2009 at 17:10 Name: S2_1-free_tokens_helper.diff Size: 1kB By: mbook http://gna.org/bugs/download.php?file_id=5749 ___ Reply to this item at: http://gna.org/bugs/?13488 ___ 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 #13490] [Patch] Some useful connection accessor functions
URL: http://gna.org/bugs/?13490 Summary: [Patch] Some useful connection accessor functions Project: Freeciv Submitted by: mbook Submitted on: Tuesday 05/05/2009 at 18:48 Category: general Severity: 3 - Normal Priority: 5 - Normal Status: Ready For Test Assigned to: mbook Originator Email: Open/Closed: Open Discussion Lock: Any Release: Operating System: None ___ Details: Attached patches for S2_1 and trunk add some useful connection accessor functions: - conn_controls_player - conn_is_global_observer - conn_get_access - conn_get_player These are used in the improved voting code coming from warclient, and will also be helpful to avoid struct field renaming conflicts in the future (cf. player/playing). 喧嘩に関する入門書を探しているの？ ___ File Attachments: --- Date: Tuesday 05/05/2009 at 18:48 Name: trunk-conn_accessors.diff Size: 3kB By: mbook http://gna.org/bugs/download.php?file_id=5751 --- Date: Tuesday 05/05/2009 at 18:48 Name: S2_1-conn_accessors.diff Size: 2kB By: mbook http://gna.org/bugs/download.php?file_id=5752 ___ Reply to this item at: http://gna.org/bugs/?13490 ___ 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 #13433] [Patch] Improved command/access levels
Update of bug #13433 (project freeciv): Status: Ready For Test = Confirmed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13433 ___ 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 #13401] [Patch] Fix wrong enum type for unit role
Update of bug #13401 (project freeciv): Status: Confirmed = Fixed Open/Closed:Open = Closed ___ Reply to this item at: http://gna.org/bugs/?13401 ___ 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] (PR#39464) metaserver's server list
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39464 [cazf...@gmail.com - Sat Apr 18 16:43:00 2009]: 2007/8/22 Guest rt-gu...@freeciv.org: Can be solve easy! $row[host] and $row[port] variables are destroy by players list query to database. Resquest sentences are build in same time in the pacth. You can also, use differents variable names than $row for players/variables list query. I decided to use latter method; avoiding reuse of variable $row, instead of the patch. I think this is more robust solution against future changes triggering similar bug again. Change is already in cazfi.net metaserver, which is currently acting also as http://meta.freeciv.org/metaserver.phtml Can someone test if this now works correctly? It works! The setting information of running games can now be seen (using warclient). I will close this ticket. --- やったと絶叫して小躍りした。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Where to begin?
On 17/04/2009, William Yount wyo...@gmail.com wrote: I realize this is a very basic question, but how else to learn than to ask? I have downloaded the source code for learning purposes. However, I am not sure where to start. I assume that there is a main file like in most other programs, but I can't seem to find it. I am just trying to start from the beginning and see if I can follow along with the code. I suggest you use a c source code inspection tool like cscope, or a find/follow function call feature if your ide has it. It is very useful especially when learning a new code base to trace out the code paths to see what everything is doing and where it is defined. I'll give you an overview to get you started, and maybe later other people can expand on it. You could try doc/HACKING and other readme files there, but they are pretty vague and out of date. Freeciv is designed as a client/server program, with the server hosting games and the client used by users to play. The directory structure in the source tree reflects this with the client/ subdirectory holding all code specific to the client program, and similarly for the server/ directory. The other directories are part of both the client and server programs and contain functions used by both (ai/, common/, utility/) and run-time data (data/, po/), among other things. The client tree is further split into the client core (client/) and various gui front ends (e.g. gui-gtk-2.0/ gui-sdl/). Because some gui libraries like to do tricky things with the main() function, like using #define to hijack it and replace it by their own, it is defined for each gui separately (e.g. in gui_main.c for gtk2) and is usually just a call to client_main() (in client_main.c) back in the client core. I think it would be great to make a wiki page that further adds to and expands on the above, since doc/HACKING is terribly out of date. I'll do this eventually, unless someone beats me to it. ;) --- 迷宮へようこそ。ゆっくりお楽しみください。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39464) metaserver does not send settings for running games (fix)
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39464 [guest - Wed Aug 22 18:00:10 2007]: Can be solve easy! $row[host] and $row[port] variables are destroy by players list query to database. Resquest sentences are build in same time in the pacth. You can also, use differents variable names than $row for players/variables list query. Marko can you please apply this patch to the metaserver running at cazfi.net, I checked it and it appears to be alright. It would fix a long-standing bug in the metaserver that causes it to not send setting information for running games to clients. I will later make a patch so that the 2.1.10 client can view this information like warclient. --- ついにパイロットはエンジンを始動させた。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40767) Revert resource identifiers and remove update22* fields
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40767
As per discussion in #40758 I am starting a new ticket
for this issue.
---
きっちりかっちりしなさい。
Index: server/ruleset.c
===
--- server/ruleset.c (revision 15611)
+++ server/ruleset.c (working copy)
@@ -69,10 +69,6 @@
#define UNIT_CLASS_SECTION_PREFIX unitclass_
#define UNIT_SECTION_PREFIX unit_
-/* savegame conversion: resource identifiers */
-char *update22one = NULL;
-char *update22two = NULL;
-
static const char name_too_long[] = Name \%s\ too long; truncating.;
#define check_name(name) (check_strlen(name, MAX_LEN_NAME, name_too_long))
#define name_strlcpy(dst, src) \
@@ -1622,16 +1618,6 @@
}
game.control.resource_count = nval;
- if (update22one) {
-free(update22one);
- }
- update22one = fc_calloc(nval, sizeof(char));
-
- if (update22two) {
-free(update22two);
- }
- update22two = fc_calloc(nval, sizeof(char));
-
/* avoid re-reading files */
if (resource_sections) {
free(resource_sections);
@@ -1932,33 +1918,6 @@
}
}
-update22one[i]
- = secfile_lookup_str_default(file, identifier,
- %s.update22one, rsection)[0];
-if (RESOURCE_NULL_IDENTIFIER == update22one[i]) {
- ruleset_error(LOG_ERROR, \%s\ [%s] update22one missing value.,
-filename, rsection);
-}
-if (RESOURCE_NONE_IDENTIFIER == update22one[i]) {
- ruleset_error(LOG_ERROR,
-\%s\ [%s] cannot use '%c' as an identifier;
- it is reserved.,
-filename, rsection, update22one[i]);
-}
-
-update22two[i]
- = secfile_lookup_str_default(file, identifier,
- %s.update22two, rsection)[0];
-if (RESOURCE_NULL_IDENTIFIER == update22two[i]) {
- ruleset_error(LOG_ERROR, \%s\ [%s] update22two missing value.,
-filename, rsection);
-}
-if (RESOURCE_NONE_IDENTIFIER == update22two[i]) {
- ruleset_error(LOG_ERROR,
-\%s\ [%s] cannot use '%c' as an identifier;
- it is reserved.,
-filename, rsection, update22two[i]);
-}
} resource_type_iterate_end;
/* base details */
Index: server/ruleset.h
===
--- server/ruleset.h (revision 15611)
+++ server/ruleset.h (working copy)
@@ -15,10 +15,6 @@
struct conn_list;
-/* savegame conversion: resource identifiers */
-extern char *update22one;
-extern char *update22two;
-
/* functions */
void load_rulesets(void);
void send_rulesets(struct conn_list *dest);
Index: server/savegame.c
===
--- server/savegame.c (revision 15611)
+++ server/savegame.c (working copy)
@@ -914,28 +914,6 @@
}
/
- Convert an older resource into the current value.
-/
-static struct resource *update22_resource(char c)
-{
- /* Different rulesets had different resources. */
- if (strcmp(game.rulesetdir, civ1) == 0) {
-resource_type_iterate(presource) {
- if (update22one[resource_index(presource)] == c) {
-return presource;
- }
-} resource_type_iterate_end;
- } else {
-resource_type_iterate(presource) {
- if (update22two[resource_index(presource)] == c) {
-return presource;
- }
-} resource_type_iterate_end;
- }
- return NULL;
-}
-
-/
Return the resource for the given identifier.
/
static struct resource *identifier_to_resource(char c)
@@ -945,9 +923,6 @@
|| c == RESOURCE_NONE_IDENTIFIER) {
return NULL;
}
- if (20199 game.version) {
-return update22_resource(c);
- }
return find_resource_by_identifier(c);
}
Index: data/default/terrain.ruleset
===
--- data/default/terrain.ruleset (revision 15611)
+++ data/default/terrain.ruleset (working copy)
@@ -674,8 +674,6 @@
; identifier = single-character identifier used in savegames. This
;must be unique for each resource, and changing it will
;break savegame compatibility.
-; update22one = single-character identifier in 2.2 civ1 savegames.
-; update22two = single-character identifier in 2.2 civ2 savegames.
; food = increased food production
; shield = increased shield production
; trade= increased trade production
@@ -685,7 +683,6 @@
graphic = ts.gold
graphic_alt = -
identifier = $
[Freeciv-Dev] (PR#40767) Revert resource identifiers and remove update22* fields
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40767 [guest - Mon Apr 13 18:37:54 2009]: I've created and tested a rollback patch, which removes all update22* references/code and revert back resource identifiers to the 2.1.x default. - Stéphane Messerli Also the terrain.ruleset files in the civ1 and civ2 ruleset directories need to be updated. I'll test it with recent and older savegames once these changes are made. Probably savegames already made in 2.1.99 will become incompatible, but that was to be expected. Hopefully this will be the only drawback. Thanks for doing this tedious work. :) --- お手数をお掛けしました。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40758) Bug with SVN Trunk rev 15609- disappearing grasslands shield
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40758 This ticket is now resolved; I have started a new ticket to deal with the resource identifier cleanup (#40767). Please continue the discussion there. --- 家の居間に入りましょう。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40765) Freeciv-2.1.9-win32 Help Browser reports Wonders obsoleted by their required technology
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40765
[dado...@sbcglobal.net - Sun Apr 12 05:51:02 2009]:
Version: Freeciv-2.1.9-win32 running on Windows XP pro
The Freeciv Help browser shows, for all Wonders (at least
in the default ruleset) Requirement: 0 and Obsolete by:
{the technology required to build the wonder}
This is surely a bug in the win32 client code, but I am
unsure if anyone is maintaining that client version anymore
(I am surprised that it compiles and that someone even made
an exe package for it).
Unfortunately I cannot compile win32 code so I cannot help
in this instance. Until someone with a windows machine
fixes this, might I suggest you try the (windows) gtk version?
---
作家であることは難しいね。
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] You must #define preprocessor constants before using them.
On 12/04/2009, James Supancic arrumm...@gmail.com wrote: I have recently updated my local copy of the freeciv trunk. I have noticed that the following: GAME_DEFAULT_GOLD_UPKEEP_STYLE GAME_MAX_GOLD_UPKEEP_STYLE GAME_MIN_GOLD_UPKEEP_STYLE Are used in ruleset.c but not #defined anywhere. I suspect someone commited ruelset.c but failed to commit ruleset.h? I think your svn update was somehow incomplete, since the defines are clearly made in common/game.h and this file is included in ruleset.c. Check inside your common/game.h and make sure that they exist there, otherwise re-checkout the sources. --- パソコンを信頼してはいけないよ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40759) [patch] calc_city_units_upkeep
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40759 [guest - Sun Apr 12 18:29:01 2009]: - Perhaps the values of the unit upkeep field should be sent in unit info packets so that they do not have to be recomputed at the client side. I will look into this. Should this be something like in the attached file (unit_upkeep_packages.patch.diff)? Or are additional changes needed? The field 'upkeep' being an array (i.e. pointer) you need to copy element by element (e.g. with a loop, memcpy, etc.). Your way would only work if the memory for the unit struct was not overwritten before the packet is serialized (likely true, but not a good assumption to make). Also you would need to unpack the value again at the client side (from packet to unit struct). See unit info handling functions in client/packhand.c. I was also wondering whether there are any places in the client that could make use of this extra information. This would involve checking where the upkeep calculation functions are called on the client side and simplifying the calling code to instead use the punit-upkeep field. Better yet would be to make an accessor unit_get_upkeep() (or with a similar name), that would wrap read access to the field. As a first step it could just use the old upkeep calculation functions (i.e. so that it ends up executing the old code path) so that you can test to make sure everything is alright, then if everything is ok you can make it use the punit-upkeep field by only having to change that one function. Hopefully the client uses the upkeep values in a simple enough way that this would be possible, that is it avoids any kind of tricky setting of the values or calculating virtual values (i.e. upkeep for a unit that does not actually exist in the game). --- 彼は陰険な奴である印象を受けた。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40758) Bug with SVN Trunk rev 15609- disappearing grasslands shield
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40758 [guest - Sat Apr 11 15:20:17 2009]: Indeed, loading a civ1/2 game with the default ruleset is kind of weird. Perhaps a dictionary (in terrain.ruleset) could look like this: [resourceids_dictionary] game_version = 2.2 gold = $ iron = / game = A ... [resourceids_dictionary] game_version = 2.1 gold = H iron = / game = e ... That would allow to load saved games from previous versions without messing up the resources. What do you think? I think this would be an excellent way to keep the backwards- conversion information distinct from the resources definitions. But I am still wondering if it would not just be simpler for the identifiers to be changed back to what they were before, i.e. the values they have in the update22* fields. I will check this and perhaps make a patch later if nobody can figure out a good reason why not to do this. --- 余計なもの出ていけ！ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40619) gold upkeep
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40619 [guest - Mon Mar 23 21:39:02 2009]: [book - Mi 11. Feb 2009, 22:41:35]: I tried to implement this: - calculate upkeep for all units at the beginning of the turn - save the upkeep values in the unit struct - use the saved value At the moment the patch does not compile. I don't find the reason for the following error: [ ... ] In file included from ../unitlist.h:18, from ../city.h:19, from aisupport.c:18: ../unit.h:146: error: ‘num_output_types’ undeclared here (not in a function) Try O_LAST instead of O_COUNT. I changed that. Furthermore, there was an closing tag missing (output_type_iterate_end). I corrected that and now I can compile the patch. I did not had the time to try a game ... unit_upkeep.patch.diff * save the unit upkeep within the unit struct * define a function there it is calculated each turn, so that it can be adapted depending on the government / research * based on the gold upkeep patch I committed gold_upkeep_v4.patch; is unit_upkeep.patch.diff intended to be applied on top of it as part of this ticket? Or perhaps it is already included in #40759-64? Anyway looking over the changes in it, I see that some things could be further optimized: - Since the upkeep value is removed from struct unitgold, the entire unitgold vector can be simplified to an array (c99 dynamic array if possible) of unit pointers. - Perhaps the values of the unit upkeep field should be sent in unit info packets so that they do not have to be recomputed at the client side. That's just what strikes me briefly glancing at the code. I'll give it a more thorough check later. --- この地図は、地球上にある場所でさえ表すか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40758) Bug with SVN Trunk rev 15609- disappearing grasslands shield
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40758 I have confirmed the bug and after further testing I have determined that all resources using the 'update22two' field in the default terrain.ruleset file are affected. [guest - Fri Apr 10 20:27:31 2009]: The issue is caused by the server/savegame.c code considering the dev version 2.1.99 to be a 2.1 instead of a 2.2. Resource identifiers are then converted when loading a 2.1.99 game, but they shouldn't be as they're already using 2.2 identifiers. I've attached a patch. I've quickly checked Tundra/Furs, and the resource now remains after loading a 2.1.99 game, while it disappeared without the patch. - Stéphane Messerli Thank you for examining the problem and providing a patch. I have tried your patch and it does appear to fix the issue, so I will commit the changes soon. I am not sure if the whole update22 system should kept. It appears terribly hackish with the hard-coded version numbers and ruleset names (why should the default ruleset ever care about savegames in the civ1 or civ2 rulesets?). I am thinking that perhaps the resource identifiers should be changed back to remove the need for the update22* fields, or the entire identifier system replaced by something more robust (e.g. a dictionary mapping identifiers to resource names included in the ruleset definition). --- そんなものは本当に必要なのだろうか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40757) Bug in v2.1.5
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40757 [ferg...@hotmail.com - Thu Apr 09 00:55:58 2009]: Some cities have squares in their zone (ie they should be able to work them for food and production) that are redded out, despite the fact that there are no other cities using these squares, and no enemy units or cities for miles. I am just guessing here, but it may be that those squares contained an enemy unit when I took control of the city. This bug has been reported before, and I think it has been fixed in the current version. Please try 2.1.9, and if the problem persists save the game at that point, post the savegame here, and I will check it out. --- この小切手を金塊に換えてください。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Bug with SVN Trunk rev 15609- disappearing grasslands shield
On 09/04/2009, Raahul Kumar raahul_da_...@yahoo.com wrote: Hi, I've experienced an extremely strange bug that I cannot track down the cause of. Any game that is started, find a grasslands shield resource. That shield resource will disappear if a savegame is loaded. I am not sure what this is a bug in. No other resources disappear, only grasslands shields. The square that previously claimed grassland(resource)2/1/0 will become just grassland 2/0/0. The two grasslands squares near Tokyo are a good example, here today, gone tomorrow. This only happens after reloading a game, if a game is just continually played through, no grassland squares disappear. I suspect the problem is in either saving or loading the game. I'll check it out. It could be related to S_RESOURCE_VALID, though I am not sure why only grassland shields would be affected. I also cannot log in to RT with guest/viceerf, so I hope someone will give me a RT login when they fix the website problems. Until the guest login is fixed you can just send an email to the bug reporting address shown in the image in the top left on bugs.freeciv.org to create a new ticket. For this issue I have already copied your message into a new ticket at: http://bugs.freeciv.org/Ticket/Display.html?id=40758 -- また壊れたか。まるで妨業のようだ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Freeciv 2.1.9
On 05/04/2009, Daniel Markstedt markst...@gmail.com wrote: Madeline, maybe you could point out a few specific highlights with the release? :) Although numerous bugs affecting all the clients and the server have been fixed, the main improvements have been for the gtk2 client. The most user visible changes are to the gui layout (almost all windows will now fit on an 800x600 display) and optimizations in the drawing code which make map interactions more responsive (for example using the selection rectangle or viewing goto lines). Of the many feature additions, about half are from ideas suggested by users on the forum or in multiplayer games, and half adapted from code originally in the warclient project (the unofficial multiplayer freeciv). All such features are disabled by default so as not to unduly disturb single- player users. They can be enabled in the interface tab in local options, where they also have detailed tooltips. Among these features, perhaps the most radical is the option to disable unit order clearing on selection. This is a depature from the behaviour of all previous freeciv versions (as far as I know) and gives units a more consistent RTS style of handling. Another nice optional change is to have the lower chat message area split between chat messages and event messages, so that the user does not have to manually switch tabs to view changes in either of them. It is a minor GUI convenience, but it saves a lot of tedious tab switching over the course of a game. Although the forum is currently in a less than usable state, I hope to get more user feedback about the new changes in 2.1.9 and also further suggestions about improvements that could be incorporated into 2.1.10. There is a lot of good stuff already planned for the next 2.1 releases and the future 2.2 versions, so ideally freeciv development may resume in full force once the current hosting problems are resolved. -- 大写しには化粧しないといけませんか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752
[book - Mon Mar 23 01:14:03 2009]:
Sorry for the double post, I forgot to change out of the
update page and refreshed it by mistake.
On 22/03/2009, Daniel Markstedt markst...@gmail.com wrote:
Same here, the old metaserver data was the fault.
Isn't this bound to affect everyone who updates to 2.1.9?
Yes. Here's a somewhat hackish patch that automatically
updates the default metaserver if it reads the old value
from the civclientrc.
Here is version 2 that works for trunk and with corrected
formatting.
---
なんて手落ち。
diff --git a/client/client_main.c b/client/client_main.c
index 32f9c1c..6334a8e 100644
--- a/client/client_main.c
+++ b/client/client_main.c
@@ -403,8 +403,18 @@ int client_main(int argc, char *argv[])
sz_strlcpy(server_host, default_server_host);
if (user_name[0] == '\0')
sz_strlcpy(user_name, default_user_name);
- if (metaserver[0] == '\0')
-sz_strlcpy(metaserver, default_metaserver);
+ if (metaserver[0] == '\0') {
+/* FIXME: Find a cleaner way to achieve this. */
+const char *oldaddr = http://meta.freeciv.org/metaserver.phtml;;
+if (0 == strcmp(default_metaserver, oldaddr)) {
+ freelog(LOG_NORMAL, _(Updating old metaserver address \%s\.),
+ oldaddr);
+ sz_strlcpy(default_metaserver, META_URL);
+ freelog(LOG_NORMAL, _(Default metaserver has been set to \%s\.),
+ META_URL);
+}
+sz_strlcpy(metaserver, default_metaserver);
+ }
if (server_port == -1) server_port = default_server_port;
/* This seed is not saved anywhere; randoms in the client should
diff --git a/client/civclient.c b/client/civclient.c
index d0c26ed..f56ab3d 100644
--- a/client/civclient.c
+++ b/client/civclient.c
@@ -72,6 +72,7 @@
#include pages_g.h
#include plrdlg_g.h
#include repodlgs_g.h
+#include servers.h
#include tilespec.h
#include themes_common.h
@@ -383,8 +384,18 @@ int main(int argc, char *argv[])
sz_strlcpy(server_host, default_server_host);
if (user_name[0] == '\0')
sz_strlcpy(user_name, default_user_name);
- if (metaserver[0] == '\0')
-sz_strlcpy(metaserver, default_metaserver);
+ if (metaserver[0] == '\0') {
+/* FIXME: Find a cleaner way to achieve this. */
+const char *oldaddr = http://meta.freeciv.org/metaserver.phtml;;
+if (0 == strcmp(default_metaserver, oldaddr)) {
+ freelog(LOG_NORMAL, _(Updating old metaserver address \%s\.),
+ oldaddr);
+ sz_strlcpy(default_metaserver, METALIST_ADDR);
+ freelog(LOG_NORMAL, _(Default metaserver has been set to \%s\.),
+ METALIST_ADDR);
+}
+sz_strlcpy(metaserver, default_metaserver);
+ }
if (server_port == -1) server_port = default_server_port;
/* This seed is not saved anywhere; randoms in the client should
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752 [dmarks - Sun Mar 22 10:26:12 2009]: I cannot test the fix. Getting Broken pipe message and no listed servers. This could also be due to the changes I made to the client server scanning API in 40707. Given that this does not happen on linux it might be very hard for me to debug. Any extra information (e.g. run with -d 4 and post the log files) would be appreciated and I will try to find the cause of the error. --- すぐに水道屋が呼ばれた。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752 [book - Sun Mar 22 17:39:32 2009]: [dmarks - Sun Mar 22 10:26:12 2009]: I cannot test the fix. Getting Broken pipe message and no listed servers. This could also be due to the changes I made to the client server scanning API in 40707. Given that this does not happen on linux it might be very hard for me to debug. Any extra information (e.g. run with -d 4 and post the log files) would be appreciated and I will try to find the cause of the error. Are you sure your client is not just using the old address for the metaserver read from your civclientrc? --- 先ずに彼は小さい金槌でパイプを打った。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752 [book - Sun Mar 22 17:39:32 2009]: [dmarks - Sun Mar 22 10:26:12 2009]: I cannot test the fix. Getting Broken pipe message and no listed servers. This could also be due to the changes I made to the client server scanning API in 40707. Given that this does not happen on linux it might be very hard for me to debug. Any extra information (e.g. run with -d 4 and post the log files) would be appreciated and I will try to find the cause of the error. Are you sure your client is not just using the old address for the metaserver read from your civclientrc? --- 先ずに彼は小さい金槌でパイプを打った。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752
Sorry for the double post, I forgot to change out of the
update page and refreshed it by mistake.
On 22/03/2009, Daniel Markstedt markst...@gmail.com wrote:
Same here, the old metaserver data was the fault.
Isn't this bound to affect everyone who updates to 2.1.9?
Yes. Here's a somewhat hackish patch that automatically
updates the default metaserver if it reads the old value
from the civclientrc.
---
カタカタ。カタカタ。
diff --git a/client/client_main.c b/client/client_main.c
index 32f9c1c..76880b5 100644
--- a/client/client_main.c
+++ b/client/client_main.c
@@ -73,6 +73,7 @@
#include pages_g.h
#include plrdlg_g.h
#include repodlgs_g.h
+#include servers.h
#include tilespec.h
#include themes_common.h
@@ -403,8 +404,17 @@ int client_main(int argc, char *argv[])
sz_strlcpy(server_host, default_server_host);
if (user_name[0] == '\0')
sz_strlcpy(user_name, default_user_name);
- if (metaserver[0] == '\0')
-sz_strlcpy(metaserver, default_metaserver);
+ if (metaserver[0] == '\0') {
+/* FIXME: Find a cleaner way to achieve this. */
+const char *oldaddr = http://meta.freeciv.org/metaserver.phtml;;
+if (0 == strcmp(default_metaserver, oldaddr)) {
+ freelog(LOG_NORMAL, _(Updating old metaserver address \%s\.),
+ oldaddr);
+ sz_strlcpy(default_metaserver, METALIST_ADDR);
+ freelog(LOG_NORMAL, _(Default metaserver has been set to \%s\.), METALIST_ADDR);
+}
+sz_strlcpy(metaserver, default_metaserver);
+ }
if (server_port == -1) server_port = default_server_port;
/* This seed is not saved anywhere; randoms in the client should
diff --git a/client/civclient.c b/client/civclient.c
index d0c26ed..8bd6a07 100644
--- a/client/civclient.c
+++ b/client/civclient.c
@@ -72,6 +72,7 @@
#include pages_g.h
#include plrdlg_g.h
#include repodlgs_g.h
+#include servers.h
#include tilespec.h
#include themes_common.h
@@ -383,8 +384,17 @@ int main(int argc, char *argv[])
sz_strlcpy(server_host, default_server_host);
if (user_name[0] == '\0')
sz_strlcpy(user_name, default_user_name);
- if (metaserver[0] == '\0')
-sz_strlcpy(metaserver, default_metaserver);
+ if (metaserver[0] == '\0') {
+/* FIXME: Find a cleaner way to achieve this. */
+const char *oldaddr = http://meta.freeciv.org/metaserver.phtml;;
+if (0 == strcmp(default_metaserver, oldaddr)) {
+ freelog(LOG_NORMAL, _(Updating old metaserver address \%s\.),
+ oldaddr);
+ sz_strlcpy(default_metaserver, METALIST_ADDR);
+ freelog(LOG_NORMAL, _(Default metaserver has been set to \%s\.), METALIST_ADDR);
+}
+sz_strlcpy(metaserver, default_metaserver);
+ }
if (server_port == -1) server_port = default_server_port;
/* This seed is not saved anywhere; randoms in the client should
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40753) Playing Freeciv online
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40753 [jo...@edenfoundation.org - Mon Mar 23 00:06:38 2009]: Hi, Was looking at this page: http://bugs.freeciv.org/Ticket/Display.html?id=40274 and wondering what I should do if I want to play Freeciv online. Is there a public freeciv server here, and how should I proceed to log in? If I type in guest as username when connecting to the server, I get the reply that Guests are not allowed on this server. For your first login, just type in the username that you want. If nobody else is using that name already, it will prompt you to enter a new password, and to confirm the same password again. If you are unlucky and someone else already has that name, you will just get a password prompt. In that case you will have to pick a different name. --- 簡単ね。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752 [book - Sat Mar 21 01:02:09 2009]: Attached patch makes http://www.cazfi.net/freeciv/metaserver/ the default metaserver. Here is a fixed version that updates all occurences and a version for trunk which has the definition in a different place. --- 違う場所に行ってしまったようだ。 diff --git a/client/servers.h b/client/servers.h index 1dcea79..6b7ec12 100644 --- a/client/servers.h +++ b/client/servers.h @@ -14,7 +14,7 @@ #ifndef FC__SERVERS_H #define FC__SERVERS_H -#define METALIST_ADDR http://meta.freeciv.org/metaserver.phtml; +#define METALIST_ADDR http://www.cazfi.net/freeciv/metaserver/; #define SERVER_LAN_PORT 4555 #define SERVER_LAN_TTL 1 diff --git a/server/meta.h b/server/meta.h index f2017ee..d7a02f8 100644 --- a/server/meta.h +++ b/server/meta.h @@ -16,7 +16,7 @@ #include shared.h /* bool type */ #define DEFAULT_META_SERVER_NO_SEND TRUE -#define DEFAULT_META_SERVER_ADDR http://meta.freeciv.org/metaserver.phtml; +#define DEFAULT_META_SERVER_ADDR http://www.cazfi.net/freeciv/metaserver/; #define METASERVER_REFRESH_INTERVAL (3*60) #define METASERVER_MIN_UPDATE_INTERVAL 7 /* not too short, not too long */ diff --git a/configure.ac b/configure.ac index 7b48134..b1d8b4e 100644 --- a/configure.ac +++ b/configure.ac @@ -14,7 +14,7 @@ PACKAGE=freeciv AC_DEFINE(FC_CONFIG_H, 1, [Configuration autogenerated]) AC_DEFINE(BUG_URL, http://bugs.freeciv.org/;, [Bug reporting URL]) -AC_DEFINE(META_URL, http://meta.freeciv.org/metaserver.phtml;, [Meta server URL]) +AC_DEFINE(META_URL, http://www.cazfi.net/freeciv/metaserver/;, [Meta server URL]) AC_DEFINE(WIKI_URL, http://www.freeciv.org/;, [Informational URL]) AC_DEFINE(DEFAULT_SOCK_PORT, 5556, [Connection TCP Port]) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40752) [Patch] Make cazfi.net the default metaserver
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40752 Attached patch makes http://www.cazfi.net/freeciv/metaserver/ the default metaserver. --- メタバグが大すぎるので、システムが壊れました。 diff --git a/client/servers.h b/client/servers.h index 1dcea79..6b7ec12 100644 --- a/client/servers.h +++ b/client/servers.h @@ -14,7 +14,7 @@ #ifndef FC__SERVERS_H #define FC__SERVERS_H -#define METALIST_ADDR http://meta.freeciv.org/metaserver.phtml; +#define METALIST_ADDR http://www.cazfi.net/freeciv/metaserver/; #define SERVER_LAN_PORT 4555 #define SERVER_LAN_TTL 1 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40619) gold upkeep
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40619 [book - Tue Feb 10 02:58:11 2009]: [matthias.pfaffer...@mapfa.de - Sun Jan 04 22:03:07 2009]: The gold upkeep patch (version 2) I have made some adjustments to your patch and attached it as version 3. Version 4 updated for latest trunk sources. --- あの城には金の手を持つ男が住んでいるそうです。 common/game.h |4 + common/packets.def|1 + data/civ1/game.ruleset| 12 ++ data/civ2/game.ruleset| 12 ++ data/default/game.ruleset | 12 ++ server/cityturn.c | 459 + server/ruleset.c | 11 + server/unittools.c| 42 server/unittools.h|1 - 9 files changed, 435 insertions(+), 119 deletions(-) diff --git a/common/game.h b/common/game.h index e39bc05..94a1b25 100644 --- a/common/game.h +++ b/common/game.h @@ -183,6 +183,10 @@ bool setting_class_is_changeable(enum sset_class class); #define GAME_MIN_AIFILL 0 #define GAME_MAX_AIFILL GAME_MAX_MAX_PLAYERS +#define GAME_DEFAULT_GOLD_UPKEEP_STYLE 0 +#define GAME_MIN_GOLD_UPKEEP_STYLE 0 +#define GAME_MAX_GOLD_UPKEEP_STYLE 1 + #define GAME_DEFAULT_FOODBOX 100 #define GAME_MIN_FOODBOX 1 #define GAME_MAX_FOODBOX 1 diff --git a/common/packets.def b/common/packets.def index 4a83f79..e5642c6 100644 --- a/common/packets.def +++ b/common/packets.def @@ -443,6 +443,7 @@ PACKET_GAME_INFO=15; sc UINT8 init_vis_radius_sq; BOOL pillage_select; UINT8 nuke_contamination; + UINT8 gold_upkeep_style; UINT8 granary_food_ini[MAX_GRANARY_INIS]; UINT8 granary_num_inis; UINT8 granary_food_inc; diff --git a/data/civ1/game.ruleset b/data/civ1/game.ruleset index f4c785d..762d2e8 100644 --- a/data/civ1/game.ruleset +++ b/data/civ1/game.ruleset @@ -56,6 +56,18 @@ pillage_select = 0 ; Fallout - Nuclear Fallout (distinct from industrial/population). nuke_contamination = Pollution +; Method of paying unit and improvement gold upkeep +; 0 - The player's total gold must be non-negative after paying upkeep +; costs associated with each city. If for any city the player's gold +; is negative, random buildings in the city are sold off. If the gold +; is still negative, then supported units with gold upkeep are +; disbanded. +; 1 - Gold upkeep for all buildings and units is paid in a lump sum after +; all cities have been processed. If the player does not have enough +; gold, random buildings from random cities are sold. If still more +; gold is needed, then random units with gold upkeep are disbanded. +gold_upkeep_style = 0 + ; Parameters used to generalize the calculation of city granary size: ; if city_size = num_inis: ; city_granary_size = (granary_food_ini[city_size] * foodbox / 100) diff --git a/data/civ2/game.ruleset b/data/civ2/game.ruleset index f822bf1..92a4361 100644 --- a/data/civ2/game.ruleset +++ b/data/civ2/game.ruleset @@ -50,6 +50,18 @@ pillage_select = 1 ; Fallout - Nuclear Fallout (distinct from industrial/population). nuke_contamination = Pollution +; Method of paying unit and improvement gold upkeep +; 0 - The player's total gold must be non-negative after paying upkeep +; costs associated with each city. If for any city the player's gold +; is negative, random buildings in the city are sold off. If the gold +; is still negative, then supported units with gold upkeep are +; disbanded. +; 1 - Gold upkeep for all buildings and units is paid in a lump sum after +; all cities have been processed. If the player does not have enough +; gold, random buildings from random cities are sold. If still more +; gold is needed, then random units with gold upkeep are disbanded. +gold_upkeep_style = 0 + ; Parameters used to generalize the calculation of city granary size: ; if city_size = num_inis: ; city_granary_size = (granary_food_ini[city_size] * foodbox / 100) diff --git a/data/default/game.ruleset b/data/default/game.ruleset index a0e19b3..86fbc2d 100644 --- a/data/default/game.ruleset +++ b/data/default/game.ruleset @@ -68,6 +68,18 @@ pillage_select = 1 ; Fallout - Nuclear Fallout (distinct from industrial/population). nuke_contamination = Fallout +; Method of paying unit and improvement gold upkeep +; 0 - The player's total gold must be non-negative after paying upkeep +; costs associated with each city. If for any city the player's gold +; is negative, random buildings in the city are sold off. If the gold +; is still negative, then supported units with gold upkeep are +; disbanded. +; 1 - Gold upkeep for all buildings and units is paid in a lump sum after +; all cities have been processed. If the player does not have enough +; gold, random buildings from random cities are sold. If still more +; gold is needed, then random
[Freeciv-Dev] (PR#40743) Split chat/message window crash
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40743 [bjo...@gmail.com - Fri Mar 13 06:20:47 2009]: Couldn't crash it anymore, used to do it 95% of the time (was using amplio and yellow freeciv theme too). Thanks for fixing it. I hope it wouldn't be too much to ask, but can you test the turn done blinking again with your new gtk ? http://forum.freeciv.org/viewtopic.php?p=23136#23136 With gtk 2.14.7 the button blinking works. Here is what I did: 1. Started a server. 2. Started a client and connected to the server. 3. Started another client with different user name and connected. 4. Started the game. 5. Pressed turn done in the first client. Now the turn done button in the second client starts blinking. If the above doesn't work for you, there is probably something wrong with your gtk (I would suggest upgrading...). --- まさかの時には点滅しているボタンを押して。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Difference between branches.
On 12/03/2009, new.york new.y...@tut.by wrote: On Wed, 11 Mar 2009 18:27:31 -0500 Madeline Book madeline.b...@gmail.com wrote: On 11/03/2009, new.york new.y...@tut.by wrote: Hello there! What is a difference between trunk branch and S2_1 branch? Experimental and not completely finalized changes go to trunk only. The S2_1 branch has to stay backwards compatible with older 2.1 clients, so usually only bug fixes are applied there. Lately I have also been porting basic multiplayer usability features from the 2.0 warclient project to the S2_1 branch, so that users will be less inclined to make their own warclients for 2.1. I am interesting because trunk branch have more nations than S2_1. When nations from trunk will be appears in S2_1 or maybe in S2_2? How it will be? Nations are actually a part of the ruleset, so any server operator can add them to his servers. However clients without those nation flag graphics will see question mark flags instead, which can be very annoying if there are many such nations. This is the reason the extra nations are not in the S2_1 branch. I guess someday stable version of trunk will be realised with all nations data files? And new version of server and client (2.2 or 2.3) will be packaged with all flags and nations? Is it true? Do you have approximate date when it will be? Volunteers work on this project when they have time and as they feel like it. So there are no deadlines or fixed schedules. It will be released when all the necessary work has been completed. --- 勝手にしろ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40743) Split chat/message window crash
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40743
[book - Wed Mar 11 23:46:54 2009]:
[bjo...@gmail.com - Sat Mar 07 04:50:45 2009]:
If no one else can reproduce it, it must be something wrong with my
GTK (Turn done button doesn't blink).
Ubuntu 8.10
checking for GTK+ - version = 2.4.0... yes (version 2.14.4)
I have confirmed the crash with gtk+-2.14.7. Investigating...
The attached patch contains a somewhat hackish
workaround for what would appear to be a bug
caused by the omission of a NULL pointer check
in the internal gtknotebook code (since gtk
version 2.10):
http://bugzilla.gnome.org/show_bug.cgi?id=477454
As far as I can tell my patch avoids the crash,
though I am not 100% certain since I could only
reproduce the original segfault sometimes (for
some reason it would help to use amplio and the
freeciv widget theme). I did try to make it crash
more than 100 times though, so I am pretty certain
that with the patch applied it should no longer
occur. Please test under your configuration to
see if this fixes the issue.
---
百パーセントは臆病者のだ。
diff --git a/client/gui-gtk-2.0/gui_main.c b/client/gui-gtk-2.0/gui_main.c
index 519c46c..7394381 100644
--- a/client/gui-gtk-2.0/gui_main.c
+++ b/client/gui-gtk-2.0/gui_main.c
@@ -1097,6 +1097,29 @@ void enable_menus(bool enable)
}
/**
+ Workaround for a crash that occurs when a button release event is
+ emitted for a notebook with no pages. See PR#40743.
+ FIXME: Remove this hack once gtk_notebook_button_release() in
+ gtk/gtknotebook.c checks for NULL notebook-cur_page.
+**/
+static gboolean right_notebook_button_release(GtkWidget *widget,
+ GdkEventButton *event)
+{
+ if (event-type != GDK_BUTTON_RELEASE) {
+return FALSE;
+ }
+
+ if (!GTK_IS_NOTEBOOK(widget)
+ || -1 == gtk_notebook_get_current_page(GTK_NOTEBOOK(widget))) {
+/* Make sure the default gtk handler
+ * does NOT get called in this case. */
+return TRUE;
+ }
+
+ return FALSE;
+}
+
+/**
do the heavy lifting for the widget setup.
**/
static void setup_widgets(void)
@@ -1445,6 +1468,8 @@ static void setup_widgets(void)
g_object_ref(right_notebook);
gtk_notebook_set_tab_pos(GTK_NOTEBOOK(right_notebook), GTK_POS_TOP);
gtk_notebook_set_scrollable(GTK_NOTEBOOK(right_notebook), TRUE);
+ g_signal_connect(right_notebook, button-release-event,
+ G_CALLBACK(right_notebook_button_release), NULL);
if (split_bottom_notebook) {
gtk_paned_pack2(GTK_PANED(hpaned), right_notebook, TRUE, TRUE);
}
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Difference between branches.
On 11/03/2009, new.york new.y...@tut.by wrote: Hello there! What is a difference between trunk branch and S2_1 branch? Experimental and not completely finalized changes go to trunk only. The S2_1 branch has to stay backwards compatible with older 2.1 clients, so usually only bug fixes are applied there. Lately I have also been porting basic multiplayer usability features from the 2.0 warclient project to the S2_1 branch, so that users will be less inclined to make their own warclients for 2.1. I am interesting because trunk branch have more nations than S2_1. When nations from trunk will be appears in S2_1 or maybe in S2_2? How it will be? Nations are actually a part of the ruleset, so any server operator can add them to his servers. However clients without those nation flag graphics will see question mark flags instead, which can be very annoying if there are many such nations. This is the reason the extra nations are not in the S2_1 branch. Where I can read about it? Can't find anything helpful on the site. It is discussed on the freeciv-dev and freeciv-maintainers mailing lists. It is generally not important to know unless you have write access to the repository. --- 窒素の海で強風が吹いている。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40743) Split chat/message window crash
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40743 [bjo...@gmail.com - Sat Mar 07 04:50:45 2009]: If no one else can reproduce it, it must be something wrong with my GTK (Turn done button doesn't blink). Ubuntu 8.10 checking for GTK+ - version = 2.4.0... yes (version 2.14.4) I have confirmed the crash with gtk+-2.14.7. Investigating... --- 頭がおかしくなさそうだ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40745) Separate nation name and adjective forms
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40745 As requested on the freeciv-i18n mailing list: On 07/03/2009, joedalt...@yahoo.dk joedalt...@yahoo.dk wrote: by the way, is there any way we could get this extension to our translation efforts. If we could introduce a separate string for a nation's adjective form in the rulesets, at least the Scandinavian languages could be rendered better. This would look something like: name=_(English) plural=_(?plural:English) adjective=_(?adjective:English) I'm not sure about the feasability of such a change (basically all calls to nation adjective/plural name functions would have to be checked and possibly updated), but I will check it out when I have some time later. --- あの時代には人の名前が大したものではなかった。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] A new 2.1 release may happen soon and a little wish
On 07/03/2009, joedalt...@yahoo.dk joedalt...@yahoo.dk wrote: by the way, is there any way we could get this extension to our translation efforts. If we could introduce a separate string for a nation's adjective form in the rulesets, at least the Scandinavian languages could be rendered better. This would look something like: name=_(English) plural=_(?plural:English) adjective=_(?adjective:English) I made a ticket for this request (40745); I'm not sure how feasible it would be to add this, but I'll check it out later when I have some time. --- 我々は無名の群衆に取り囲まれた。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40744) Slight error in new strings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40744 [book - Sat Mar 07 20:30:02 2009]: [joan.cr...@gmail.com - Sat Mar 07 18:28:20 2009]: While updating my translation, I have noticed that a few new strings in text.c had a double singular/plural form, but the plural one was the same as the singular. The sentences were about %d turns cease-fire Patch included, in case you feel it should be committed. Freeciv.pot should be updated, too. Thanks for noticing the typos and making a patch. I must have made the mistakes when copying the new code; I'll commit your fix as soon as possible. I checked the original (before my recent popit text patch) and it too had N turn cease-fire (N 1). I think in English saying 5 turn cease-fire is grammatically fine, at least I gather as much from my gut instinct. I assume the reason this string was wrapped in PL_() was for other languages for which some part of the phrase might need to be modified for N 1. So unless someone can convince me that indeed 5 turns cease-fire is more correct according to some rule of English grammar, I will keep the current strings as they are. --- 文法屋が町を出たという噂を聞きましたか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40744) Slight error in new strings
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40744 [joan.cr...@gmail.com - Sat Mar 07 18:28:20 2009]: While updating my translation, I have noticed that a few new strings in text.c had a double singular/plural form, but the plural one was the same as the singular. The sentences were about %d turns cease-fire Patch included, in case you feel it should be committed. Freeciv.pot should be updated, too. Thanks for noticing the typos and making a patch. I must have made the mistakes when copying the new code; I'll commit your fix as soon as possible. --- ご苦労さん！ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40742) Wish List: conserve vertical space for widescreens
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40742 [rod@gmail.com - Fri Mar 06 20:00:46 2009]: In these days of widescreen displays, we need to be more conservative in the use of vertical room, and we can compensate by being more generous wih the horizontal space. Hi, Have you tried the latest client in svn (either trunk or S2_1 branch)? I have already made some changes to the gui layout that makes the overall widget layout smaller. I'll see about your other suggestions as I have time to process them... ;) --- 私の新しい毛皮のコートを見ましたか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40743) Split chat/message window crash
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40743 [bjo...@gmail.com - Fri Mar 06 04:30:41 2009]: I keep getting segfaults when I double click on the [Messages X] title tab to separate it, with dual/split chat and messages enabled. The separate window pops up then whole thing dies. Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0xb6e559b0 (LWP 15070)] 0xb7caf3e0 in gtk_notebook_button_release (widget=0xad58ae0, event=0xc2c8f40) at /build/buildd/gtk+2.0-2.14.4/gtk/gtknotebook.c:2825 2825/build/buildd/gtk+2.0-2.14.4/gtk/gtknotebook.c: No such file or directory. in /build/buildd/gtk+2.0-2.14.4/gtk/gtknotebook.c I'm starting another ticket for the issue reported in 40705. --- 明日は新たな日です。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40743) Split chat/message window crash
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40743 [bjo...@gmail.com - Fri Mar 06 04:30:41 2009]: I keep getting segfaults when I double click on the [Messages X] title tab to separate it, with dual/split chat and messages enabled. The separate window pops up then whole thing dies. Program received signal SIGSEGV, Segmentation fault. [Switching to Thread 0xb6e559b0 (LWP 15070)] 0xb7caf3e0 in gtk_notebook_button_release (widget=0xad58ae0, event=0xc2c8f40) at /build/buildd/gtk+2.0-2.14.4/gtk/gtknotebook.c:2825 2825/build/buildd/gtk+2.0-2.14.4/gtk/gtknotebook.c: No such file or directory. in /build/buildd/gtk+2.0-2.14.4/gtk/gtknotebook.c Unfortunately I cannot figure out the cause of the crash from just that much backtrace information. Try the steps listed in the following link for a longer backtrace: http://freeciv.wikia.com/wiki/Bug_Reporting Furthermore, I cannot make the program crash trying out the behaviour you mentioned. Perhaps something has changed in newer gtk versions (I have 2.10.13 installed), so if a full backtrace does not reveal the cause, I suppose I will have to upgrade gtk. :( --- 朝ご飯はハチミツだけだ。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40743) Split chat/message window crash
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40743 [bjo...@gmail.com - Sat Mar 07 04:50:45 2009]: If no one else can reproduce it, it must be something wrong with my GTK (Turn done button doesn't blink). Ubuntu 8.10 checking for GTK+ - version = 2.4.0... yes (version 2.14.4) (gdb) bt full [...] Alright, thanks for the extra information. I'll try to figure out the cause of the crash and a way to fix it. --- 週末でさえ働かなければならなさそうですね。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#40305) G++ not tested in autogen.sh
URL: http://bugs.freeciv.org/Ticket/Display.html?id=40305 [cproc - Wed Mar 04 12:57:26 2009]: [joan.cr...@gmail.com - Sun Jun 22 15:36:48 2008]: I can't build version 2.2, because g++ is not installed. The error message is: ../../../../bootstrap/depcomp: line 470: exec: g++: not found make[5]: *** [toluaxx.bind.o] Error 127 I can install g++, sure, but perhaps autogen.sh should have checked g++'s existence before? Right now, autogen doesn't report any problems. Joan Patch attached. AC_PROG_CXX does not abort when no C++ compiler is found, it just sets CXX to g++ in this case. So a separate check is needed. How come a c++ compiler is needed at all? --- そういう物はいつ必要になりましたか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#16243) Freeciv 2.1.0-beta1: trade routes
URL: http://bugs.freeciv.org/Ticket/Display.html?id=16243 [book - Tue Dec 16 20:40:48 2008]: [guest - Mon Sep 04 13:56:42 2006]: A small comment concerning this pop-up window. It would be nice if it has a frame. Being of the same color as the main dialog, it creates the data overlap effect when activated. Attached patch adds a frame around the label in the popup. Since there are other issues in this ticket, I did not mark it as resolved. I did however already apply the above patch to trunk (r15396), which I am noting here so that I do not confuse myself again. --- これはもうやったか。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#12825) freeciv doesn't work on small-resolution displays
URL: http://bugs.freeciv.org/Ticket/Display.html?id=12825 [cproc - Sat Feb 28 21:54:33 2009]: something that makes me wonder: when I decrease the height of the window, there's a certain limit where the height cannot be decreased anymore. One part that defines this limit is a certain minimum height of the map and of the widgets on the left side, that's ok. But the message pane doesn't seem to have such a minimum height - I can shrink it down to zero with the pane separator. And when I do this, at the same time the upper pane increases its height again, so now it should be possible to decrease the window height even more until the upper pane has reached its minimum height again. But for some reason that's not possible? I think this just due to how the widget size requisition/ allocation code is implemented in gtk, in particular for the paned widget. When widgets are packed into the panes the programmar can specify whether they are allowed to be shrunk below their requisition, which is what allows you to resize the message pane below its requested height (if the top part was packed with those parameters too, you could also move the pane separator up through the top widgets beyond their requested height; I tried altering the code to allow this but it really just resulted in ugly overlap effects). Resizing the window cannot make the area inside the panes shrink because the paned widget is telling the window that it wants the whole area, i.e. since the user moved the separator to increase the total height of the paned widget. If the above is confusing and you still want to try to understand what is going on, there is the free gnome programming book online with a chapter discussing how gtk widget size allocation works: http://developer.gnome.org/doc/GGAD/sec-containers.html --- 本で読んだから、本当だろうね。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] A new 2.1 release may happen soon
Hopefully there will be a new release of the S2_1 branch soon (in a week or two), so I would remind translators to please submit any updated translations they have been working on. The exact release date will depend on the other maintainers (and may get pushed back if some critical bugs are found), but should be at least one and a half weeks from today, so perhaps around March 14. -- 頭巾をかぶった男が奴隷をムチで激しく打ち始めた。 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
