[Freeciv-Dev] (PR#39809) Use @bindir@ where appropriate
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39809 [jordi - Mon Oct 29 11:44:21 2007]: data/*dsc.in files include a line: CommandLine = @prefix@/bin/civclient which assumes binaries will go to /something/bin. The FHS mandates are installed in /usr/games, and Debian abides to this. Both dsc.in files should use @bindir@/civclient or @bindir@/civserver instead. Untested patch. Also updates url. ~Daniel bindir+people.diff Description: Binary data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39787) Ubuntu don't redistribute stdsounds
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39787 Package with including COPYING: ftp://ftp.freeciv.org/freeciv/contrib/audio/stdsounds3.tar.gz ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39808) Use $sysconfdir in relevant Makefiles.
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39808
data/Makefile.am installs GGZ stuff in the wrong place.
Attached patch should fix it.
--- freeciv-2.1.0.orig/data/Makefile.am
+++ freeciv-2.1.0/data/Makefile.am
@@ -85,8 +85,8 @@
if GGZ_SERVER
ggzroom_DATA = civserver.room
-ggzroomdir = ${prefix}/etc/ggzd/rooms/
+ggzroomdir = ${sysconfdir}/ggzd/rooms/
ggzgame_DATA = civserver.dsc
-ggzgamedir = ${prefix}/etc/ggzd/games/
+ggzgamedir = ${sysconfdir}/ggzd/games/
endif
--- freeciv-2.1.0.orig/data/Makefile.in
+++ freeciv-2.1.0/data/Makefile.in
@@ -253,10 +253,10 @@
SUBDIRS = icons $(CLIENTDATADIRS) $(SERVERDATADIRS)
@[EMAIL PROTECTED] = civserver.room
[EMAIL PROTECTED]@ggzroomdir = ${prefix}/etc/ggzd/rooms/
[EMAIL PROTECTED]@ggzroomdir = ${sysconfdir}/ggzd/rooms/
@[EMAIL PROTECTED] = civserver.dsc
[EMAIL PROTECTED]@ggzgamedir = ${prefix}/etc/ggzd/games/
[EMAIL PROTECTED]@ggzgamedir = ${sysconfdir}/ggzd/games/
subdir = data
mkinstalldirs = $(SHELL) $(top_srcdir)/bootstrap/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39811) BUG: oddball iterators
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39811
Some months ago, I began a project to review iterators, and covered
most of the major ones. Here are those remaining, infrequently used,
mostly only in one or two files. Where they have the lack of name
qualification nesting problems, they were able to work around by
careful selection of leading __, ___, etc. -- and in one case, by
naming variables with leading GRI_! (Not good practice.)
Another technique seems to be copying the parameters into some local
variables, just in case the parameters are overwritten. While not
inherently evil, it does violate the principle of least astonishment.
These are insufficiently used to worry much about efficiency, so I left
them in place for future review. However, I reorganized some conditional
blocks to be more efficient, and eliminated some variables or duplicate
function calls entirely.
In one case, the function documentation block is completely wrong.
Presumably, the iterator having been converted from indexes to pointers
sometime in the distant past. Some of these haven't been reviewed in a
long time
server/generator/utilities.h
axis_iterate (was iterate_axe)
whole_map_iterate_filtered
common/terrain.c
variable_adjc_iterate
common/unitlist.h
unit_list_iterate_safe
ai/aiunit.h
simple_ai_unit_type_iterate
ai/aicity.c
city_range_iterate
client/agents/cma_core.c
my_city_map_iterate
client/citydlg_common.c
citydlg_iterate
client/mapview_common.h
gui_rect_iterate
This last looks like a big change, but should have no real change at all.
Please devote some eyeballs to it to catch any mistakes -- and the
unit_list_iterate_safe, too.
Index: server/generator/utilities.h
===
--- server/generator/utilities.h(revision 13898)
+++ server/generator/utilities.h(working copy)
@@ -33,44 +33,47 @@
}
/***
- iterate axe iterate on selected axe ( x if Xaxe is TRUE) over a intervale
- of -dist to dist arround the tile indexed by index0
- this iterator create 2 vars:
- index : the map index of the iterate pointed tile
- i : the position in the intervale of iteration (from -dist to dist)
- index0, dist, Xaxe are side effect safe.
+ iterate on selected axe (x if X_axis is TRUE) over a interval of -dist
+ to dist around the center_tile
+ _index : the position in the interval of iteration (from -dist to dist)
+ _tile : the tile pointer
***/
-#define iterate_axe(iter_tile, i, center_tile, dist, Xaxe) \
- {\
-const int ___dist = (dist);
\
-const struct tile *_center_tile = (center_tile); \
-const bool ___Xaxe = (Xaxe); \
-int i, ___x, ___y; \
-struct tile *iter_tile;\
+#define axis_iterate(center_tile, _tile, _index, dist, X_axis) \
+{ \
+ int _index##_x, _index##_y; \
+ struct tile *_tile; \
+ const struct tile *_tile##_center = (center_tile); \
+ const bool _index##_axis = (X_axis); \
+ const int _index##_d = (dist); \
+ int _index = -(_index##_d); \
\
-for (i = -___dist; i = ___dist; i++) {\
- ___x = _center_tile-nat_x + (___Xaxe ? i : 0); \
- ___y = _center_tile-nat_y + (___Xaxe ? 0 : i); \
- iter_tile = native_pos_to_tile(___x, ___y); \
- if (!iter_tile) {
\
- continue; \
- }
+ for (; _index = _index##_d; _index++) { \
+_index##_x = _tile##_center-nat_x + (_index##_axis ? _index : 0); \
+_index##_y = _tile##_center-nat_y + (_index##_axis ? 0 : _index); \
+_tile = native_pos_to_tile(_index##_x, _index##_y);
\
+if (NULL != _tile) {
-#define iterate_axe_end \
-} \
+#define axis_iterate_end \
+} \
+ }\
}
-#define whole_map_iterate_filtered(ptile, pdata, pfilter) \
-{
[Freeciv-Dev] (PR#39812) Bug: Cannot Rename Global worklists in FC210
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39812 Hi! Just downloaded installed FreeCiv 210 (not Beta) on WinXP SP2 etc. I cannot seem to rename the Global Worklist in the GTK2 Client GUI, now i have multiple lists named new. used to be able to do this in FC210b6. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39811) BUG: oddball iterators
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39811 Since TRUNK and S2_2 AI is very much broken, I tested this with S2_1 (patch applied cleanly except one line change in unitlist.h) There seems to be some regression. Autogames differ. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39813) civil war nation turk is unknown
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39813 After changing to Turkish, somebody forgot to update the civilwar nations. Note these names are the rule name=_(...) in the ruleset, not the ruleset name, nor the section name (too many names) Also, Bosnian-Herzegovinian! Patch that fixes the nation and po files (with fuzzy). Index: data/nation/phoenician.ruleset === --- data/nation/phoenician.ruleset (revision 13898) +++ data/nation/phoenician.ruleset (working copy) @@ -33,7 +33,7 @@ init_buildings= init_government=Despotism init_units= -civilwar_nations=turk, carthaginian, israeli +civilwar_nations=turkish, carthaginian, israeli cities = Sur,; English: Tyre Index: data/nation/moldovan.ruleset === --- data/nation/moldovan.ruleset(revision 13898) +++ data/nation/moldovan.ruleset(working copy) @@ -31,7 +31,7 @@ init_government=Despotism init_units= -civilwar_nations = romanian, ukrainian, turk +civilwar_nations = romanian, ukrainian, turkish cities = ChiÅinau, Index: data/nation/ottoman.ruleset === --- data/nation/ottoman.ruleset (revision 13898) +++ data/nation/ottoman.ruleset (working copy) @@ -35,7 +35,7 @@ init_government=Despotism init_units= -conflicts_with=turk +conflicts_with=turkish civilwar_nations=arab, armenian, hellenic ; Cities from all over the empire Index: data/nation/azeri.ruleset === --- data/nation/azeri.ruleset (revision 13898) +++ data/nation/azeri.ruleset (working copy) @@ -47,7 +47,7 @@ init_units= conflicts_with=soviet -civilwar_nations=turk, persian, armenian +civilwar_nations=turkish, persian, armenian ; http://de.wikipedia.org/wiki/Liste_der_Städte_in_Aserbaidschan cities = Index: data/nation/hellenic.ruleset === --- data/nation/hellenic.ruleset(revision 13898) +++ data/nation/hellenic.ruleset(working copy) @@ -25,7 +25,7 @@ init_units= conflicts_with = greek, byzantine -civilwar_nations = turk, italian +civilwar_nations = turkish, italian cities = Athina, Index: data/nation/thracian.ruleset === --- data/nation/thracian.ruleset(revision 13898) +++ data/nation/thracian.ruleset(working copy) @@ -29,7 +29,7 @@ init_government=Despotism init_units= -civilwar_nations=turk, illyrian +civilwar_nations=turkish, illyrian cities = Uscudama, Index: data/nation/syrian.ruleset === --- data/nation/syrian.ruleset (revision 13898) +++ data/nation/syrian.ruleset (working copy) @@ -23,7 +23,7 @@ ; Similar flags: conflicts_with=iraqi -civilwar_nations=turk, israeli +civilwar_nations=turkish, israeli ; http://pl.wikipedia.org/wiki/Miasta_Syrii cities = Index: data/nation/byzantium.ruleset === --- data/nation/byzantium.ruleset (revision 13898) +++ data/nation/byzantium.ruleset (working copy) @@ -35,7 +35,7 @@ ; Byzantium was a successor-empire of the Hellenic culture conflicts_with = greek -civilwar_nations = greek, italian, turk, arab +civilwar_nations = greek, italian, turkish, arab cities = Konstantinoupolis (ocean), ; Constantinople / Istanbul Index: data/nation/kurd.ruleset === --- data/nation/kurd.ruleset(revision 13898) +++ data/nation/kurd.ruleset(working copy) @@ -35,7 +35,7 @@ init_government=Despotism init_units= -civilwar_nations = iranian, iraqi, turk, syrian +civilwar_nations = iranian, iraqi, turkish, syrian cities = Hewlêr, ; Kurdish name for Arbil (Iraq) Index: data/nation/serbian.ruleset === --- data/nation/serbian.ruleset (revision 13898) +++ data/nation/serbian.ruleset (working copy) @@ -42,7 +42,7 @@ init_government=Despotism init_units= -civilwar_nations = slovenian, croatian, bosnia +civilwar_nations = slovenian, croatian, bosnian-herzegovinian cities = Beograd, Index: data/nation/uyghur.ruleset === --- data/nation/uyghur.ruleset (revision 13898) +++ data/nation/uyghur.ruleset (working copy) @@ -34,7 +34,7 @@ init_buildings= init_government=Despotism init_units= -civilwar_nations = turk, tocharian +civilwar_nations = turkish, tocharian cities = Ãrümqi, Index: po/cs.po === --- po/cs.po(revision 13898) +++ po/cs.po(working copy) @@ -26504,7 +26504,8 @@ msgstr #: data/nation/turk.ruleset:3 -msgid Turk +#,
[Freeciv-Dev] (PR#39751) [Bug] Can't see top menu bar in WinXP...
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39751 [EMAIL PROTECTED] - Mon Oct 29 15:04:42 2007]: Update: Here's what i found, when the client is started it tries to fill the desktop except for a small horizontal strip at the bottom, which i assumed was so we M$ Windows users would be able to see their TaskBar, i do not have my TaskBar at the bottom of the desktop, but rather at the top, so i was annoyed by this behavior. I could not get the client to start up without this anomaly, so i set my Taskbar to auto-hide and was frequently annoyed that iff i moused up too far it would unhide and cover the Client GUI top menu - repeatedly! So my mouse skills were also tested as i played - who says FreeCiv is not a 1st person shooter game! ;) later, i found that if i clicked on the bottom pixel of the client window i would get a normal window which could be moved away from my TaskBar - yh! But if i did anything in local options the window would again resize and be covered bu the TaskBar - rgh! I also noticed that that i had this set to fullscreen, i will try and resolve the 'issue' by setting the game to not fullscreen and hope i find my gaming Nirvana. On the side of Development, the GUI people may want to really look into this, either take the whole Desktop or know where the TaskBar IS and allow for it so there is NO overlap of the default Client GUI window and TaskBar, or just set the default to non-fullscreen (aka Windowed). Thanks for a really great GAME!! =) Thanks for a detailed report! This is actually a known issue. The current workaround is to go to 'View'-'Fullscreen' then save settings and restart the client. The bug is that You have to restart for this to take effect. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39811) BUG: oddball iterators
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39811 Marko Lindqvist wrote: There seems to be some regression. Autogames differ. A regression is the return of a previously reported and fixed bug. What bug are you reporting has returned? ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39811) BUG: oddball iterators
URL: http://bugs.freeciv.org/Ticket/Display.html?id=39811 Come to think of it, I hadn't been applying these iterator patches against 2.1. They were trunk-only (nee 2.2). It's kinda nice to hear that they apply cleanly, but wasn't my expectation. They were written for 2.2. When I was testing 2.1 six months ago, I was never able to replicate two 2.1 games. I did manage to get some of the random variables saved in 2.1, although more is done in 2.2/trunk. I'll try adding these patches to 2.1 one at a time, and see which one changes the output I didn't expect that any output would change! Still, you haven't reported an actual bug. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
