[Freeciv-Dev] (PR#39628) 'Take this player' should not be sensitive when cannot take
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39628 [EMAIL PROTECTED] - Mar. Aoû. 28 22:02:13 2007]: gtk-client: 'Take this player' and 'Observe this player' are sensitive even if current allowtake setting makes those actions impossible. 'Toggle player ready' seems to be sensitive for all human players. It does nothing if applied to other players, though. - ML I already describe how this tree view could be buggy in #39614. Set 'Take this player' and 'Observe this player' sensitive or not is not so easy. Maybe, it couldn't be implemented without changing packet definitions... ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#18641) [Bug] Cannot unload aircraft from carrier
URL: http://bugs.freeciv.org/Ticket/Display.html?id=18641 On 29/08/2007, Daniel Markstedt [EMAIL PROTECTED] wrote: In the end, I don't see what good the 'Unload' command would do even if it worked and suggest we just get rid of it. It was added so that player could arrange what unit goes to which transport, if there are several in the same tile. We still lack proper user interface for this, but I still don't think we should revert it. And one special case: I found this bug when testing some fixes to aircraft auto-return code. One bomber heading to another place unintentionally landed to Carrier in the end of first turn (with still fuel for another turn). It had 0 movement for that turn left, so I could not unload it by moving. This caused 1) it to move when Carrier moved 2) it took one cargo slot out, causing another bomber to run out of fuel - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39545) [Patch] Up to date freeciv.spec.in
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39545 On 29/08/2007, Egor Vyscrebentsov [EMAIL PROTECTED] wrote: PS. It seems to me that we may move away from alternatives, assuming that civclient is always gui-gtk-2.0 client. However, I had some thoughts about making civclient a wrapper that will try to find and start clients in our order. (Well, it can be created for *nix systems, not for win*; but we don't have rpm for win* :), so that shouldn't be a problem if we'll have patch, applying in spec.) Maybe there is more general solution. For testing compilation of all the clients after source changes, I considered modifying --enable-client configure option to support something like '--enable-client=gtk,sdl,xaw' or '--enable-client=all'. Then civclient would just start some certain gui-binary (maybe just as symbolic link to that particular gui-binary) Seems to be too much work for small gain, though. -ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39502) Readline memory leaks
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39502 On 07/08/2007, Marko Lindqvist [EMAIL PROTECTED] wrote: Valgrind reports several memory blocks allocated by readline not freed. ... Even if it turns out to be readline problem, this ticket should be used to create valgrind suppression file for those warnings. Here. It's not actually a script, but 'scripts' directory still seems like best place for it. 'tests' directory is meant for 'make tests' (or other related make targets) related stuff. Do we want this to be part of tarball? (nothing in 'scripts' is) Of course, for these ncurses suppressions it would be much better if they were part of ncurses or readline (or valgrind) so they would be available to all projects using those libraries. - ML freeciv.supp Description: Binary data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39629) Freeciv SDl/Client Win2000
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39629 I had the following bug while try to attack a city with a military unit : Assertion failed ! Program: civclient.exe File: goto.c Line: 862 Expression: unit_is_in_focus(punit) Nicolas CHAMPSAVOIR CNES - DCT/PS/SSC Tel: (05.61.2) 7.41.43 ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39562) [Patch] Improved choice asserts
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39562
On 14/08/2007, Marko Lindqvist [EMAIL PROTECTED] wrote:
In current trunk bad choice structures cause illegal memory access
(old iterators were more robust, but at the same time they hide bugs).
This patch makes easier to hunt those choice problems down.
This version has even stricter checking. It's not enough that id is
less or equal to maximum Freeciv can handle, but it has to be less or
equal to maximum in currently used ruleset.
This is meant for trunk only. Due to #39563, I assume that trunk
never executes code paths touched by this patch. Successful testing
(new asserts not causing trouble) with current trunk proves nothing.
So I have tested this (with required modifications) mainly in S2_1.
- ML
diff -Nurd -X.diff_ignore freeciv/ai/aicity.c freeciv/ai/aicity.c
--- freeciv/ai/aicity.c 2007-08-13 20:51:05.0 +0300
+++ freeciv/ai/aicity.c 2007-08-29 12:37:59.0 +0300
@@ -1380,7 +1380,7 @@
}
if (pcity-ai.choice.want != 0) {
-ASSERT_REAL_CHOICE_TYPE(pcity-ai.choice.type);
+ASSERT_CHOICE(pcity-ai.choice);
CITY_LOG(LOG_DEBUG, pcity, wants %s with desire %d.,
is_unit_choice_type(pcity-ai.choice.type)
@@ -1532,7 +1532,7 @@
/* Not dealing with this city a second time */
pcity-ai.choice.want = 0;
-ASSERT_REAL_CHOICE_TYPE(bestchoice.type);
+ASSERT_CHOICE(bestchoice);
/* Try upgrade units at danger location (high want is usually danger) */
if (pcity-ai.urgency 1) {
@@ -1692,6 +1692,7 @@
game.info.turn + myrand(RECALC_SPEED) + RECALC_SPEED;
}
TIMING_LOG(AIT_CITY_SETTLERS, TIMER_STOP);
+ASSERT_CHOICE(pcity-ai.choice);
} city_list_iterate_end;
city_list_iterate(pplayer-cities, pcity) {
diff -Nurd -X.diff_ignore freeciv/common/city.h freeciv/common/city.h
--- freeciv/common/city.h 2007-08-13 20:51:03.0 +0300
+++ freeciv/common/city.h 2007-08-29 12:40:38.0 +0300
@@ -150,25 +150,26 @@
enum choice_type {
CT_NONE = 0,
- CT_BUILDING = 0,
+ CT_BUILDING = 1,
CT_CIVILIAN,
CT_ATTACKER,
CT_DEFENDER,
CT_LAST
};
-/* FIXME:
-
- This should detect also cases where type is just initialized with
- CT_NONE (probably in order to silence compiler warnings), but no real value
- is given. You have to change value of CT_BUILDING into 1 before you
- can add this check. It's left this way for now, is case hardcoded
- value 0 is still used somewhere instead of CT_BUILDING.
-
- -- Caz
-*/
-#define ASSERT_REAL_CHOICE_TYPE(type)\
-assert(type = 0 type CT_LAST /* type != CT_NONE */ );
+#define ASSERT_CHOICE(c) \
+ do { \
+if ((c).want 0) { \
+ assert((c).type = 0 (c).type CT_LAST (c).type != CT_NONE);\
+ if ((c).type == CT_BUILDING) { \
+int _iindex = improvement_index((c).value.building); \
+assert(_iindex = 0 _iindex game.control.num_impr_types); \
+ } else { \
+int _uindex = utype_index((c).value.utype); \
+assert(_uindex = 0 _uindex game.control.num_unit_types); \
+ } \
+}\
+ } while(0);
struct ai_choice {
enum choice_type type;
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39629) Freeciv SDl/Client Win2000
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39629 On 8/29/07, Champsavoir Nicolas [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39629 I had the following bug while try to attack a city with a military unit : Assertion failed ! Program: civclient.exe File: goto.c Line: 862 Expression: unit_is_in_focus(punit) Nicolas CHAMPSAVOIR CNES - DCT/PS/SSC Tel: (05.61.2) 7.41.43 What version of Freeciv is this? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39631) Typos in tutorial
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39631 This transaction appears to have no content I have found a few typos in the tutorial.sav file. They are corrected in the diff file. And one question: in line 180, talking about big cities, where it says: Make sure you have enough taxes and cultural buildings to keep your\n\ citizens content. Shouldn't that be luxuries instead of taxes? I haven't changed that in the diff, though. Joan I have found a few typos in the tutorial.sav file. They are corrected in the diff file.And one question: in line 180, talking about big cities, where it says:Make sure you have enough taxes and cultural buildings to keep your\n\ citizens content.Shouldnt that be luxuries instead of taxes? I havent changed that in the diff, though.Joan Index: tutorial.sav === --- tutorial.sav (revision 13418) +++ tutorial.sav (working copy) @@ -87,7 +87,7 @@ The flag and background color indicate what civilization the city\n\ belongs to (this will be useful when you meet other civilizations).\n\ The top row of the bar also shows the name and size of the city, and\n\ -will show one or more starts to indicate if there are units in the\n\ +will show one or more stars to indicate if there are units in the\n\ city. The bottom row shows what the city is building, and how long it\n\ will take; it also shows how long the city will take to grow to the\n\ next largest size.)) @@ -227,7 +227,7 @@ existing cities. Generally when building new cities you want to make\n\ sure that all tiles are covered by at least one city, but after that\n\ it is best that your cities overlap as little as possible. Spreading\n\ -out cities properly gives each city access to more resrouces, allowing\n\ +out cities properly gives each city access to more resources, allowing\n\ them to grow to larger sizes.)) end settlersbuilt = settlersbuilt + 1 @@ -344,7 +344,7 @@ civilization is to be a peaceful trading nation or a conquering\n\ juggernaut. Each has advantages.\n\ \n\ -For now, you probably want to switch staight into Republic. In the\n\ +For now, you probably want to switch straight into Republic. In the\n\ Government menu, go to the Change Government submenu and choose\n\ Republic. Yes you want a revolution! Changing governments means\n\ going through a few turns of anarchy, so it is not without cost.\n\ ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39630) Typos in several nation rulesets
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39630 This transaction appears to have no content Several typos I have found in the ottoman, colombian, westphalian, malian, byzantium, and romanian rulesets while translating. See file for the details. Cheers, Joan Several typos I have found in the ottoman, colombian, westphalian, malian, byzantium, and romanian rulesets while translating. See file for the details.Cheers,Joan Index: ottoman.ruleset === --- ottoman.ruleset (revision 13418) +++ ottoman.ruleset (working copy) @@ -4,7 +4,7 @@ plural=_(?plural:Ottomans) groups=Medieval, Asian, European legend=_(In the beginning of the 14th century Osman, a leader of a\ - minor Turkic tribe in western Anatolia, conquered all his neigboring\ + minor Turkic tribe in western Anatolia, conquered all his neighboring\ tribes. A century later the Byzantine capital fell to\ Turkic rule which gave the Ottoman empire access to Europe. The\ Ottomans subsequently conquered large parts of south-eastern\ Index: colombian.ruleset === --- colombian.ruleset (revision 13418) +++ colombian.ruleset (working copy) @@ -5,7 +5,7 @@ groups=Modern, American legend=_(Colombia is a country in northern South America. The region was\ an Amerindian cultural center in pre-European time. The Spanish began\ - settling Colombia's north coast around 1500. In 1819 the The Republic of\ + settling Colombia's north coast around 1500. In 1819 the Republic of\ Colombia gained independence.) leader= Simón Bolívar, Index: westphalian.ruleset === --- westphalian.ruleset (revision 13418) +++ westphalian.ruleset (working copy) @@ -4,7 +4,7 @@ plural=_(?plural:Westphalians) groups=Medieval, European legend=_(Westphalia, before becoming a Prussian province, was the western\ - region the duchy of Saxony. Present-day it consists of the Northern part of\ + region of the duchy of Saxony. Present-day it consists of the Northern part of\ the largest German federal state, North Rhine-Westphalia.) leader = Widukind, Index: malian.ruleset === --- malian.ruleset (revision 13418) +++ malian.ruleset (working copy) @@ -7,7 +7,7 @@ for millennia. In medieval times, the region was home to a succession of\ empires called the Sahelian kingdoms. Of these, the Islamic Mali empire\ with it's capital in Timbuktu was the most influential. This empire\ - reigned from the 14th to the 17th century and was famed for it's wealth and\ + reigned from the 14th to the 17th century and was famed for its wealth and\ benevolent kings. The modern Republic of Mali derives its name from this\ empire.) leader= Index: byzantium.ruleset === --- byzantium.ruleset (revision 13418) +++ byzantium.ruleset (working copy) @@ -7,7 +7,7 @@ Constantine moved the empire's capital to Byzantium and formed a new empire\ mostly known as the Eastern Roman empire or the Byzantine empire. This\ empire lasted until 1453 when its capital fell to the Ottomans. At the time\ - of Justinian I, the Byzanines controlled nearly all of Middle East, nothern\ + of Justinian I, the Byzanines controlled nearly all of Middle East, northern\ Africa, Italy and parts of Spain.) leader= Justinianus I, Index: romanian.ruleset === --- romanian.ruleset (revision 13418) +++ romanian.ruleset (working copy) @@ -6,7 +6,7 @@ legend=_(Romania as a nation was formed at the beginning of the 20th\ century, when the states of Transylvania, Wallachia, and Moldavia merged.\ It is a country inhabited by people speaking a language reminiscent from\ - the time of ancient Rome. It's history is convoluted as it was always at\ + the time of ancient Rome. Its history is convoluted as it was always at\ the borders of great empires: Roman, Ottoman, Austro-Hungarian, and\ Russian.) ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39631) Typos in tutorial
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39631 On 8/30/07, Joan Creus [EMAIL PROTECTED] wrote: URL: http://bugs.freeciv.org/Ticket/Display.html?id=39631 This transaction appears to have no content I have found a few typos in the tutorial.sav file. They are corrected in the diff file. (...) Also in byzantium.ruleset: the Byzanines controlled nearly all of Middle East should be the Byzantines controlled nearly all of the Middle East ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39631) Typos in tutorial
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39631 On 8/30/07, Daniel Markstedt [EMAIL PROTECTED] wrote: Also in byzantium.ruleset: the Byzanines controlled nearly all of Middle East should be the Byzantines controlled nearly all of the Middle East ~Daniel Whoops. This should have gone into PR#39630 instead! ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
