Re: [Freeciv-Dev] (PR#39708) Issues with freeciv beta SDL on Win 98
http://bugs.freeciv.org/Ticket/Display.html?id=39708 > On 9/15/07, David Nuttall <[EMAIL PROTECTED]> wrote: > > http://bugs.freeciv.org/Ticket/Display.html?id=39708 > > > Issues with FreeCiv SDL Client 2.1.0 beta 6 > > (...) > > - During play > - How do you engage chat/server communication while playing in the client? Press 'Tab' to bring up the chatline. > - How do you save the game while playing in the client, other than > auto-save? >From the chatline, enter /save . > - How do you show the Civlopedia while playing in the client? I have only > found the HTML manual pages in the directory, but that does not interact with > the program. Middle-click on a tech in the tech dialog or unit or building in the production dialog. From there you can browse the civilopedia. > (...) I agree with your other points. Someone has to code these features, though. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39643) [Bug] Internal server exits silently for ruleset errors
http://bugs.freeciv.org/Ticket/Display.html?id=39643 > On 31/08/2007, Marko Lindqvist wrote: > > I have always hated how ruleset loading code just exit() for any > error in ruleset ... > - If internally server quits like that, no explanation is provided > for user (client) ... > S2_1 solution might be just to send chat message to all clients > before final exit(). Here are patches to send that chat message. Not that user is likely to notice it. gtk -client goes back to main menu immediately when server dies closing chat -window. Maybe new kind of event - which has popups enabled by default - should be used for this. - ML RulesetError_39643_TRUNK.diff.bz2 Description: BZip2 compressed data RulesetError_39643.diff.bz2 Description: BZip2 compressed data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39708) Issues with freeciv beta SDL on Win 98
http://bugs.freeciv.org/Ticket/Display.html?id=39708 > Issues with FreeCiv SDL Client 2.1.0 beta 6 - Opening window - Load Game is disabled. To restart a game I used /load during server control. - Picking Nation issues - If you select a nation and go back into the Nation Picker, please start with the old selection, rather than just jumping back to the first entry in the list. - Please provide a drop-down combo to present the names of leaders. It would make it easier to see all the available choices. - Sometimes pressing the arrows to change the leader name does not appear to change the leader name, but upon exiting, the server display shows the name had changed. - During play - How do you engage chat/server communication while playing in the client? - How do you save the game while playing in the client, other than auto-save? - How do you show the Civlopedia while playing in the client? I have only found the HTML manual pages in the directory, but that does not interact with the program. - Scroll bar clicks do not move the scroll button. You must click and drag on the scroll button in order to move it. I have gotten the occasional crash, but do not remember all the details as to what preceded it or the Windows crash message. I do recall it involved CivClient.exe, but I realize that does not help you that much. I will submit with more detail if this happens again. I am using a Windows 98 computer with a 400 MHz Celeron II processor. I have 320 MiB of RAM and dozens of GiB free on all hard drives. David Nuttall, Computer Specialist Nuttall Computer Consulting [EMAIL PROTECTED] Be smarter than spam. See how smart SpamGuard is at giving junk email the boot with the All-new Yahoo! Mail at http://mrd.mail.yahoo.com/try_beta?.intl=ca ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39707) [Patch] Remove duplicate player->nation zeroing
http://bugs.freeciv.org/Ticket/Display.html?id=39707 >
Seems that trunk already had proper player->nation zeroing before
S2_1 bugfix was ported.
To be committed to S2_2 and trunk.
- ML
diff -Nurd -X.diff_ignore freeciv/client/packhand.c freeciv/client/packhand.c
--- freeciv/client/packhand.c 2007-09-14 15:13:54.0 +0300
+++ freeciv/client/packhand.c 2007-09-14 21:49:05.0 +0300
@@ -2218,12 +2218,6 @@
nations_alloc(game.control.nation_count);
city_styles_alloc(game.control.styles_count);
- /* We are in inconsistent state. Players point to nations,
- * which do not point to players. Fix */
- for (i = 0; i < MAX_NUM_PLAYERS + MAX_NUM_BARBARIANS; i++) {
-game.players[i].nation = NULL;
- }
-
/* After nation ruleset free/alloc, nation->player pointers are NULL.
* We have to initialize player->nation too, to keep state consistent. */
players_iterate(pplayer) {
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#39694) [Patch] Removing gui-sdl specific get_unit_info_label_text2()
http://bugs.freeciv.org/Ticket/Display.html?id=39694 >
On 09/09/2007, Marko Lindqvist wrote:
>
> This patch makes linebreak behavior parameter of common
> get_unit_info_label_text2(), so also gui-sdl can use it. gui-sdl
> copies of these functions removed.
- Updated comments
This is for S2_2 and trunk only - don't want to modify common part in S2_1.
Ready for commit.
- ML
diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/gui_text.c freeciv/client/gui-ftwl/gui_text.c
--- freeciv/client/gui-ftwl/gui_text.c 2007-08-13 20:51:07.0 +0300
+++ freeciv/client/gui-ftwl/gui_text.c 2007-09-14 21:23:10.0 +0300
@@ -145,7 +145,7 @@
add_line(_("Location: (%d, %d) [%d]"),
ptile->x, ptile->y, ptile->continent);
#endif
- add_line("%s", tile_get_info_text(ptile));
+ add_line("%s", tile_get_info_text(ptile, 0));
if (count > 0) {
add_line("%s",
get_infrastructure_text(infrastructure));
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/mapview.c freeciv/client/gui-gtk-2.0/mapview.c
--- freeciv/client/gui-gtk-2.0/mapview.c 2007-08-04 18:38:42.0 +0300
+++ freeciv/client/gui-gtk-2.0/mapview.c 2007-09-14 21:23:10.0 +0300
@@ -212,7 +212,7 @@
get_unit_info_label_text1(punits));
gtk_label_set_text(GTK_LABEL(unit_info_label),
- get_unit_info_label_text2(punits));
+ get_unit_info_label_text2(punits, 0));
update_unit_pix_label(punits);
}
diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/menu.c freeciv/client/gui-gtk-2.0/menu.c
--- freeciv/client/gui-gtk-2.0/menu.c 2007-08-30 21:50:13.0 +0300
+++ freeciv/client/gui-gtk-2.0/menu.c 2007-09-14 21:23:10.0 +0300
@@ -1242,7 +1242,7 @@
struct tile newtile = *ptile;
tile_apply_activity(&newtile, activity);
- return tile_get_info_text(&newtile);
+ return tile_get_info_text(&newtile, 0);
}
/
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/mapview.c freeciv/client/gui-sdl/mapview.c
--- freeciv/client/gui-sdl/mapview.c 2007-08-25 15:28:38.0 +0300
+++ freeciv/client/gui-sdl/mapview.c 2007-09-14 21:23:10.0 +0300
@@ -473,201 +473,6 @@
return -1;
}
-/
- Return a (static) string with tile name describing terrain and specials.
- Same as tile_get_info_text() from client/text.c, but with an additional
- line break
-
- Examples:
-"Hills"
-"Hills (Coals)"
-"Hills (Coals)
- [Pollution]"
-/
-static const char *gui_sdl_tile_get_info_text(const struct tile *ptile)
-{
- static char s[256];
- bool first;
-
- sz_strlcpy(s, terrain_name_translation(ptile->terrain));
- if (tile_has_special(ptile, S_RIVER)) {
-sz_strlcat(s, "/");
-sz_strlcat(s, special_name_translation(S_RIVER));
- }
-
- if (ptile->resource) {
-cat_snprintf(s, sizeof(s), " (%s)",
- resource_name_translation(ptile->resource));
- }
-
- first = TRUE;
- if (tile_has_special(ptile, S_POLLUTION)) {
-if (first) {
- first = FALSE;
- sz_strlcat(s, "\n[");
-} else {
- sz_strlcat(s, "/");
-}
-sz_strlcat(s, special_name_translation(S_POLLUTION));
- }
- if (tile_has_special(ptile, S_FALLOUT)) {
-if (first) {
- first = FALSE;
- sz_strlcat(s, "\n[");
-} else {
- sz_strlcat(s, "/");
-}
-sz_strlcat(s, special_name_translation(S_FALLOUT));
- }
- if (!first) {
-sz_strlcat(s, "]");
- }
-
- return s;
-}
-
-/
- Return the text body for the unit info shown in the info panel.
- Same as get_unit_info_label_text2() from client/text.c, but calls
- gui_sdl_tile_get_info_text() instead.
-
- FIXME: this should be renamed.
-/
-static const char *gui_sdl_get_unit_info_label_text2(struct unit_list *punits)
-{
- static struct astring str = ASTRING_INIT;
- int count;
-
- astr_clear(&str);
-
- if (!punits) {
-return "";
- }
-
- count = unit_list_size(punits);
-
- /* This text should always have the same number of lines. Otherwise the
- * GUI widgets may be confused and try to resize themselves. */
-
- /* Line 1. Goto or activity text. */
- if (count > 0 && unit_list_size(hover_units) > 0) {
-int min, max;
-
-if (!goto_get_turns(&min, &max)) {
- astr_add_line(&str, _("Turns to target: %d"), min);
-} else if (min == max) {
- astr_add_line(&str, _("Turns to target: %d"), max);
-} else {
- astr_add_line(&str, _("Turns to target: %d to %d"), min, max);
-}
- } else if (count == 1) {
-astr_add_line(&str, "%s",
- unit_activity_text(unit_list_get(punits, 0)));
- } else if (count > 1) {
-astr_add_line(&str, PL_("%d unit selected",
- "%d units selected",
- count),
- count);
-
Re: [Freeciv-Dev] (PR#39693) [Patch] Unit info label for impossible goto
http://bugs.freeciv.org/Ticket/Display.html?id=39693 >
On 10/09/2007, William Allen Simpson wrote:
>
> I used the existing infinity and existing "Turns to target: %d", just to
> avoid making new translations. If that's not acceptable, and it's OK to
> add a new translation, then "Unreachable" would be fine there.
- Above fixed
- Made "Unreachable" qualified string since there is also unit class
flag "Unreachable"
- S2_1 version fixes also separate gui-sdl implementation. For S2_2
and trunk #39694 will take care of this too
- ML
diff -Nurd -X.diff_ignore freeciv/client/text.c freeciv/client/text.c
--- freeciv/client/text.c 2007-08-25 15:28:38.0 +0300
+++ freeciv/client/text.c 2007-09-14 21:10:39.0 +0300
@@ -700,7 +700,8 @@
int min, max;
if (!goto_get_turns(&min, &max)) {
- astr_add_line(&str, _("Turns to target: %d"), min);
+ /* TRANS: Impossible to reach goto target tile */
+ astr_add_line(&str, Q_("?goto:Unreachable"));
} else if (min == max) {
astr_add_line(&str, _("Turns to target: %d"), max);
} else {
diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/mapview.c freeciv/client/gui-sdl/mapview.c
--- freeciv/client/gui-sdl/mapview.c 2007-08-25 15:16:07.0 +0300
+++ freeciv/client/gui-sdl/mapview.c 2007-09-14 21:09:49.0 +0300
@@ -554,7 +554,8 @@
int min, max;
if (!goto_get_turns(&min, &max)) {
- astr_add_line(&str, _("Turns to target: %d"), min);
+ /* TRANS: Impossible to reach goto target tile */
+ astr_add_line(&str, Q_("?goto:Unreachable"), min);
} else if (min == max) {
astr_add_line(&str, _("Turns to target: %d"), max);
} else {
diff -Nurd -X.diff_ignore freeciv/client/text.c freeciv/client/text.c
--- freeciv/client/text.c 2007-08-25 15:16:07.0 +0300
+++ freeciv/client/text.c 2007-09-14 21:10:06.0 +0300
@@ -686,7 +686,8 @@
int min, max;
if (!goto_get_turns(&min, &max)) {
- astr_add_line(&str, _("Turns to target: %d"), min);
+ /* TRANS: Impossible to reach goto target tile */
+ astr_add_line(&str, Q_("?goto:Unreachable"));
} else if (min == max) {
astr_add_line(&str, _("Turns to target: %d"), max);
} else {
___
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] (PR#7294) Proposal: Reducing the bribe-power of Diplomats
http://bugs.freeciv.org/Ticket/Display.html?id=7294 > Hello, > On Tue, 11 Sep 2007, Per I. Mathisen wrote: > > Ok, "Spy", then. You want to remove most capabilities of spy/diplo for the sake of better game play. I wonder if you can. You're right that bribing, inciting, stealing techs and sabotage are kind of unbalanced, and sometimes buggy. I think this is so because the two game ideas of Freeciv, developing and fighting, are unbalanced in itself, contradictory so to say. The diplo is the most interesting figure of the game, because it stands between these two ideas. It connects them. You can remove the diplo, and you should be consequent then and do it completely. The game is simpler then. But better? I heavily doubt that. You're right when to rethink diplomats, their capabilities, the balancing and the popups. But then lets improve it - not remove. Making it more fair and transparent. > The changes: > * As discussed, new unique Spy unit can bribe units for free, and destroy > all defensive buildings in a city, by sacrificing itself. Available with > Writing. This makes her absolutely powerful in an early game phase. > The other rulesets not changed, and... well, let's face it, this is not > exactly civ1/2 compatible. And this is ok. But how its done I would like to see more ideas. Christian btw, Tech stealing is implemented in another way too, in conquering cities. > - Per > > Carpe noctem :) -- Christian Knoke* * *http://cknoke.de * * * * * * * * * Ceterum censeo Microsoft esse dividendum. ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39706) [Patch] Remove included gettext from include paths
http://bugs.freeciv.org/Ticket/Display.html?id=39706 > $subject For S2_2 and trunk. Ready for commit. - ML diff -Nurd -X.diff_ignore freeciv/ai/Makefile.am freeciv/ai/Makefile.am --- freeciv/ai/Makefile.am 2007-08-04 18:38:34.0 +0300 +++ freeciv/ai/Makefile.am 2007-09-14 20:18:15.0 +0300 @@ -2,9 +2,7 @@ noinst_LIBRARIES = libcivai.a -AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server -I../intl -I$(top_srcdir)/common/aicore - -## Above, note -I../intl instead of -I$(top_srdir/intl) is deliberate. +AM_CPPFLAGS = -I$(top_srcdir)/utility -I$(srcdir)/../common -I$(srcdir)/../server -I$(top_srcdir)/common/aicore libcivai_a_SOURCES = \ advdomestic.c \ diff -Nurd -X.diff_ignore freeciv/client/agents/Makefile.am freeciv/client/agents/Makefile.am --- freeciv/client/agents/Makefile.am 2007-08-04 18:38:37.0 +0300 +++ freeciv/client/agents/Makefile.am 2007-09-14 20:17:15.0 +0300 @@ -2,7 +2,7 @@ noinst_LIBRARIES = libagents.a -AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS) +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(top_srcdir)/common/aicore -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(srcdir)/../gui-gtk $(CLIENT_CFLAGS) libagents_a_SOURCES = \ agents.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-ftwl/Makefile.am freeciv/client/gui-ftwl/Makefile.am --- freeciv/client/gui-ftwl/Makefile.am 2007-08-04 18:39:05.0 +0300 +++ freeciv/client/gui-ftwl/Makefile.am 2007-09-14 20:16:03.0 +0300 @@ -3,9 +3,7 @@ SUBDIRS = noinst_LIBRARIES = libguiclient.a -AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include -I../../intl $(CLIENT_CFLAGS) - -## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate. +AM_CPPFLAGS = -I. -I$(top_srcdir)/utility -I$(top_srcdir)/utility/ftwl -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/.. -I$(srcdir)/../include $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ canvas.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-gtk-2.0/Makefile.am freeciv/client/gui-gtk-2.0/Makefile.am --- freeciv/client/gui-gtk-2.0/Makefile.am 2007-08-09 21:49:47.0 +0300 +++ freeciv/client/gui-gtk-2.0/Makefile.am 2007-09-14 20:16:39.0 +0300 @@ -1,9 +1,8 @@ ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libguiclient.a -AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS) $(GGZ_GTK_INCLUDES) +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/../agents $(CLIENT_CFLAGS) $(GGZ_GTK_INCLUDES) -## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate. # The AM_CPPFLAGS "-I." is so resources.c includes the locally generated # Freeciv.h in the builddir, in preference to the one # in the source dir (when compiling from another dir). --dwp diff -Nurd -X.diff_ignore freeciv/client/gui-sdl/Makefile.am freeciv/client/gui-sdl/Makefile.am --- freeciv/client/gui-sdl/Makefile.am 2007-08-04 18:39:04.0 +0300 +++ freeciv/client/gui-sdl/Makefile.am 2007-09-14 20:15:49.0 +0300 @@ -2,9 +2,7 @@ noinst_LIBRARIES = libguiclient.a -AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I../../intl -I$(srcdir)/../agents $(CLIENT_CFLAGS) - -## Above, note -I../../intl instead of -I$(top_srdir/intl) is deliberate. +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I$(top_srcdir)/common/aicore -I$(srcdir)/../agents $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ SDL_rotozoom.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-stub/Makefile.am freeciv/client/gui-stub/Makefile.am --- freeciv/client/gui-stub/Makefile.am 2007-08-04 18:39:12.0 +0300 +++ freeciv/client/gui-stub/Makefile.am 2007-09-14 20:17:53.0 +0300 @@ -1,9 +1,7 @@ ## Process this file with automake to produce Makefile.in noinst_LIBRARIES = libguiclient.a -AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common -I../../intl $(CLIENT_CFLAGS) - -## Above, note -I../../intl instead of -I$(top_srdir)/intl is deliberate. +AM_CPPFLAGS = -I. -I$(srcdir)/.. -I$(srcdir)/../include -I$(top_srcdir)/utility -I$(top_srcdir)/common $(CLIENT_CFLAGS) libguiclient_a_SOURCES = \ canvas.c \ diff -Nurd -X.diff_ignore freeciv/client/gui-win32/Makefile.am freeciv/client/gui-win32/Makefile.am --- freeciv/client/gui-win32/Makefile.am 2007-08-04 18:38:53.0 +0300 +++ freeciv/client/gui-win32/Makefil
[Freeciv-Dev] (PR#20772) [Patch] Air goto attack on unit or city not possible
http://bugs.freeciv.org/Ticket/Display.html?id=20772 >
Updating the patch for S2_1 at revision 13590.
Seulement dans common/aicore.old: aicore
Seulement dans common/aicore: .deps
diff -uad common/aicore.old/path_finding.c common/aicore/path_finding.c
--- common/aicore.old/path_finding.c 2007-09-14 19:20:47.0 +0200
+++ common/aicore/path_finding.c 2007-09-14 19:34:11.0 +0200
@@ -66,7 +66,7 @@
* from mainstream node.
*/
struct danger_node {
- bool is_dangerous;
+ enum dangerous_level is_dangerous;
bool waited; /* TRUE if waited to get here */
struct pf_danger_pos {
enum direction8 dir;
@@ -498,8 +498,8 @@
pf_map->lattice[pf_map->tile->index].extra_cost = 0;
pf_map->lattice[pf_map->tile->index].dir_to_here = -1;
if (pf_map->params->is_pos_dangerous) {
-/* The starting point is safe */
-pf_map->d_lattice[pf_map->tile->index].is_dangerous = FALSE;
+/* The starting point cannot be set dangerous */
+pf_map->d_lattice[pf_map->tile->index].is_dangerous = DL_SAFE;
}
return pf_map;
@@ -833,7 +833,7 @@
}
/* First iteration for determining segment length */
- while(d_node->is_dangerous) {
+ while(d_node->is_dangerous != DL_SAFE) {
length++;
ptile = mapstep(ptile, DIR_REVERSE(node->dir_to_here));
node = &pf_map->lattice[ptile->index];
@@ -864,14 +864,14 @@
}
/* Make sure we reached a safe node */
- assert(!pf_map->d_lattice[ptile->index].is_dangerous);
+ assert(pf_map->d_lattice[ptile->index].is_dangerous == DL_SAFE);
}
/**
Adjust cost taking into account possibility of making the move
**/
-static int danger_adjust_cost(const struct pf_map *pf_map, int cost,
- bool to_danger, int moves_left)
+static int danger_adjust_cost(const struct pf_map *pf_map, int cost,
+ enum dangerous_level to_danger, int moves_left)
{
if (cost == PF_IMPOSSIBLE_MC) {
@@ -881,7 +881,7 @@
cost = MIN(cost, get_move_rate(pf_map->params));
if (pf_map->params->turn_mode == TM_BEST_TIME) {
-if (to_danger && cost >= moves_left) {
+if (to_danger != DL_SAFE && cost >= moves_left) {
/* We would have to end the turn on a dangerous tile! */
return PF_IMPOSSIBLE_MC;
}
@@ -889,7 +889,7 @@
/* Default is TM_WORST_TIME.
* It should be specified explicitly though! */
if (cost > moves_left
-|| (to_danger && cost == moves_left)) {
+|| (to_danger != DL_SAFE && cost == moves_left)) {
/* This move is impossible (at least without waiting)
* or we would end our turn on a dangerous tile */
return PF_IMPOSSIBLE_MC;
@@ -950,8 +950,8 @@
/* Dangerous tiles can be updated even after being processed */
if ((pf_map->status[index1] == NS_PROCESSED
- || pf_map->status[index1] == NS_WAITING)
- && !d_node1->is_dangerous) {
+ || pf_map->status[index1] == NS_WAITING)
+ && d_node1->is_dangerous == DL_SAFE) {
continue;
}
@@ -999,7 +999,7 @@
}
/* Update costs and add to queue, if this is a better route to xy1 */
- if (!d_node1->is_dangerous) {
+ if (d_node1->is_dangerous != DL_DANGEROUS) {
int cost_of_path = get_total_CC(pf_map, cost, extra);
if (pf_map->status[index1] == NS_UNINIT
@@ -1013,7 +1013,7 @@
free(d_node1->danger_segment);
d_node1->danger_segment = NULL;
}
- if (d_node->is_dangerous) {
+ if (d_node->is_dangerous != DL_SAFE) {
/* Transition from red to blue, need to record the path back */
create_danger_segment(pf_map, d_node1);
} else {
@@ -1051,7 +1051,7 @@
adjc_dir_iterate_end;
}
- if (!d_node->is_dangerous
+ if (d_node->is_dangerous == DL_SAFE
&& pf_map->status[pf_map->tile->index] != NS_WAITING
&& (get_moves_left(pf_map, node->cost)
< get_move_rate(pf_map->params))) {
@@ -1086,7 +1086,7 @@
freelog(LOG_DEBUG, "Considering waiting at (%d, %d)",
pf_map->tile->x, pf_map->tile->y);
return danger_iterate_map(pf_map);
- } else if (pf_map->d_lattice[index].is_dangerous) {
+ } else if (pf_map->d_lattice[index].is_dangerous != DL_SAFE) {
/* We don't return dangerous tiles */
freelog(LOG_DEBUG, "Reached dangerous tile (%d, %d)",
pf_map->tile->x, pf_map->tile->y);
@@ -1124,13 +1124,13 @@
/* First iterate to find path length */
while(!same_pos(iter_tile, pf_map->params->start_tile)) {
-if (!d_node->is_dangerous && d_node->waited) {
+if (d_node->is_dangerous == DL_SAFE && d_node->waited) {
length += 2;
} else {
length++;
}
-if (!d_node->is_dangerous) {
+if (d_node->is_dangerous != DL_DANGEROUS) {
/* We are in the normal node and dir_to_here field is valid */
dir_next = node->dir_to_here;
/* d_node->danger_segment
Re: [Freeciv-Dev] (PR#34717) [wishlist] events upon the death of a unit / conquest of a city
http://bugs.freeciv.org/Ticket/Display.html?id=34717 > On 04/09/2007, Marko Lindqvist wrote: > > We lack quite a lot of important events. Adding these is bug-prone, > so it should take place in S2_1 only if event is really critical for > many (most) scenarios. I've looked these code paths a bit more closely, and it's obvious that adding these events to S2_1 is far too risky. We should release 2.1.0 soon. Scripting improvements should go only to already existing S2_2 branch (and trunk, of course). - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39459) Re: (PR#39583) 2.1.0-beta5 gtk2 client crash when founding a city
http://bugs.freeciv.org/Ticket/Display.html?id=39459 > On 19/08/2007, Benjamin K. Stuhl wrote: > > Platform: linux (freeciv built from source) > GTK+ version: 2.10.14 > Freeciv version: 2.1.0-beta5 (yes, I know it's not officially announced > yet, but that's the tarball it's built from) > > Steps to reproduce: > 1. start a new local game > 2. build a new city > > Expected results: > 1. a city should be built > > Actual results: > Freeciv crashes with the following backtrace: ... > (gdb) p g_object_get_data(G_OBJECT(rend), "column") > $12 = -1 Which gcc version you have used in compilation? This seems same problem I traced back to gcc-4.2 miscompilation. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39705) [gui-sdl] support for right-to-left writing systems
http://bugs.freeciv.org/Ticket/Display.html?id=39705 > As mentioned elsewhere, gui-sdl should have support for right-to-left writing systems. Font support was recently added, but letters appear in the wrong direction. Currently needed for Arabic, Hebrew, and Farsi/Iranian. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
Re: [Freeciv-Dev] Fwd: [Freeciv-commits] r13570 - /branches/S2_2/
We need version 'S2_2' to RT. I don't have permissions to add it. - ML ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] (PR#39704) [gui-sdl] crash with Greek locale
http://bugs.freeciv.org/Ticket/Display.html?id=39704 > On a recent checkout of S2_1: Start the client in Greek (el) locale, connect to a server, then open the nation selection screen - crash! Backtrace attached. ~Daniel backtrace Description: Binary data ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
[Freeciv-Dev] Fwd: [Freeciv-commits] r13570 - /branches/S2_2/
On 9/12/07, Christian Prochaska <[EMAIL PROTECTED]> wrote: > Author: cproc > Date: Wed Sep 12 13:39:31 2007 > New Revision: 13570 > > URL: http://svn.gna.org/viewcvs/freeciv?rev=13570&view=rev > Log: > Branching for 2.2 release. > > Added: > branches/S2_2/ > - copied from r13566, trunk/ > Ok, so now we have a 2.2 branch. The question is, what to do with it? According to the roadmap, it should include 'advanced govenments' rules. What is the status of this patch, Per? The editor also needs some more features, IMO. For example the ability to set the width/height of a map, start year, add/remove/edit players, to mention a few. ~Daniel ___ Freeciv-dev mailing list Freeciv-dev@gna.org https://mail.gna.org/listinfo/freeciv-dev
