[Freeciv-commits] r25616 - /branches/S2_5/common/unit.c
Author: pepeto
Date: Sat Jul 19 11:06:03 2014
New Revision: 25616
URL: http://svn.gna.org/viewcvs/freeciv?rev=25616view=rev
Log:
Recursive transport:
* remove unrelated test from could_unit_load() ;
* re-establish the rule a transporter cannot carry a cargo unit which can
transport it.
Reported by Jacob Nevins (jtn@gna)
See gna bug #22050
Modified:
branches/S2_5/common/unit.c
Modified: branches/S2_5/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.c?rev=25616r1=25615r2=25616view=diff
==
--- branches/S2_5/common/unit.c (original)
+++ branches/S2_5/common/unit.c Sat Jul 19 11:06:03 2014
@@ -814,13 +814,6 @@
/* Make sure this transporter can carry this type of unit. */
if (!can_unit_transport(ptrans, pcargo)) {
-return FALSE;
- }
-
- /* Transporter must be native to the tile it is on (or it itself is
- * transported). */
- if (!can_unit_exist_at_tile(ptrans, unit_tile(ptrans))
- !unit_transported(ptrans)) {
return FALSE;
}
@@ -2400,8 +2393,9 @@
Returns whether 'pcargo' in 'ptrans' is a valid transport. Note that
'pcargo' can already be (but doesn't need) loaded into 'ptrans'.
- It may fail if the cargo has the same type of one of the transport
- (recursively).
+ It may fail if one of the cargo unit has the same type of one of the
+ transporter unit or if one of the cargo unit can transport one of
+ the transporter (recursively).
/
bool unit_transport_check(const struct unit *pcargo,
const struct unit *ptrans)
@@ -2412,7 +2406,8 @@
/* Check transporters. */
for (plevel = ptrans; NULL != plevel;
plevel = unit_transport_get(plevel)) {
-if (unit_type(plevel) == cargo_utype) {
+if (unit_type(plevel) == cargo_utype
+|| can_unit_type_transport(cargo_utype, unit_class(plevel))) {
return FALSE;
}
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25617 - in /branches/S2_4: common/game.h common/unit.c common/unit.h server/sanitycheck.c
Author: pepeto
Date: Sat Jul 19 11:06:11 2014
New Revision: 25617
URL: http://svn.gna.org/viewcvs/freeciv?rev=25617view=rev
Log:
Recursive transport:
* remove incorrect and unrelated tests from could_unit_load() ;
* drop any rule which would limit recursive transporting ;
* remove test duplicate in sanity check module.
Reported by Jacob Nevins (jtn@gna)
See gna bug #22050
Modified:
branches/S2_4/common/game.h
branches/S2_4/common/unit.c
branches/S2_4/common/unit.h
branches/S2_4/server/sanitycheck.c
Modified: branches/S2_4/common/game.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/common/game.h?rev=25617r1=25616r2=25617view=diff
==
--- branches/S2_4/common/game.h (original)
+++ branches/S2_4/common/game.h Sat Jul 19 11:06:11 2014
@@ -569,9 +569,6 @@
/* Max distance from the capital used to calculat the bribe cost. */
#define GAME_UNIT_BRIBE_DIST_MAX 32
-/* Max number of recursive transports. */
-#define GAME_TRANSPORT_MAX_RECURSIVE 5
-
/* ruleset settings */
#define RS_MAX_VALUE 1
Modified: branches/S2_4/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/common/unit.c?rev=25617r1=25616r2=25617view=diff
==
--- branches/S2_4/common/unit.c (original)
+++ branches/S2_4/common/unit.c Sat Jul 19 11:06:11 2014
@@ -751,21 +751,8 @@
return FALSE;
}
- /* Check iff this is a valid transport. */
- if (unit_transported(pcargo)
- !unit_transport_check(pcargo, ptrans)) {
-return FALSE;
- }
-
/* Make sure this transporter can carry this type of unit. */
if (!can_unit_transport(ptrans, pcargo)) {
-return FALSE;
- }
-
- /* Transporter must be native to the tile it is on (or it itself is
- * transported). */
- if (!can_unit_exist_at_tile(ptrans, unit_tile(ptrans))
- !unit_transported(ptrans)) {
return FALSE;
}
@@ -2158,57 +2145,6 @@
return ptrans-transporting;
}
-/*
- Returns if pcargo in ptrans is a valid transport.
-*/
-bool unit_transport_check(const struct unit *pcargo,
- const struct unit *ptrans)
-{
- struct unit_list *ptrans_recursive = unit_list_new();
- /* Get !const unit struct for pcargo. */
- struct unit *plevel = game_unit_by_number(pcargo-id);
- bool transport_ok = TRUE;
-
- /* Recursive loop over all transporters up to max level. */
- while (transport_ok plevel unit_list_size(ptrans_recursive)
-GAME_TRANSPORT_MAX_RECURSIVE) {
-/* Check if the unit can be transported. If the unit can be transported
- * by any of the previous transporters, fail. THis disallows to carry
- * units of one type within the same unit type. */
-unit_list_iterate(ptrans_recursive, pcargo_recursive) {
- if (can_unit_transport(pcargo_recursive, plevel)) {
-transport_ok = FALSE;
-break;
- }
-} unit_list_iterate_end;
-
-if (!transport_ok) {
-#ifdef DEBUG
- char buf[512] = ;
- fc_snprintf(buf, sizeof(buf), %s [Error] ,
- unit_name_translation(plevel));
- unit_list_iterate(ptrans_recursive, pcargo_recursive) {
-cat_snprintf(buf, sizeof(buf), in %s,
- unit_name_translation(pcargo_recursive));
- } unit_list_iterate_end;
- log_error(Invalid transport at level %d (%s).,
-unit_list_size(ptrans_recursive), buf);
-#endif /* DEBUG */
- break;
-}
-
-/* Insert cargo at the beginning of the list. */
-unit_list_prepend(ptrans_recursive, plevel);
-
-/* Check for next level. */
-plevel = unit_transport_get(plevel);
- }
-
- unit_list_destroy(ptrans_recursive);
-
- return transport_ok;
-}
-
/
Returns whether 'pcargo' is transported by 'ptrans', either directly
or indirectly.
Modified: branches/S2_4/common/unit.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/common/unit.h?rev=25617r1=25616r2=25617view=diff
==
--- branches/S2_4/common/unit.h (original)
+++ branches/S2_4/common/unit.h Sat Jul 19 11:06:11 2014
@@ -389,8 +389,6 @@
struct unit *unit_transport_get(const struct unit *pcargo);
bool unit_transported(const struct unit *pcargo);
struct unit_list *unit_transport_cargo(const struct unit *ptrans);
-bool unit_transport_check(const struct unit *pcargo,
- const struct unit *ptrans);
bool unit_contained_in(const struct unit *pcargo, const struct unit *ptrans);
#ifdef __cplusplus
Modified: branches/S2_4/server/sanitycheck.c
URL:
[Freeciv-commits] r25615 - /trunk/common/unit.c
Author: pepeto
Date: Sat Jul 19 11:05:58 2014
New Revision: 25615
URL: http://svn.gna.org/viewcvs/freeciv?rev=25615view=rev
Log:
Recursive transport:
* remove unrelated test from could_unit_load() ;
* re-establish the rule a transporter cannot carry a cargo unit which can
transport it.
Reported by Jacob Nevins (jtn@gna)
See gna bug #22050
Modified:
trunk/common/unit.c
Modified: trunk/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unit.c?rev=25615r1=25614r2=25615view=diff
==
--- trunk/common/unit.c (original)
+++ trunk/common/unit.c Sat Jul 19 11:05:58 2014
@@ -804,13 +804,6 @@
/* Make sure this transporter can carry this type of unit. */
if (!can_unit_transport(ptrans, pcargo)) {
-return FALSE;
- }
-
- /* Transporter must be native to the tile it is on (or it itself is
- * transported). */
- if (!can_unit_exist_at_tile(ptrans, unit_tile(ptrans))
- !unit_transported(ptrans)) {
return FALSE;
}
@@ -2361,8 +2354,9 @@
Returns whether 'pcargo' in 'ptrans' is a valid transport. Note that
'pcargo' can already be (but doesn't need) loaded into 'ptrans'.
- It may fail if the cargo has the same type of one of the transport
- (recursively).
+ It may fail if one of the cargo unit has the same type of one of the
+ transporter unit or if one of the cargo unit can transport one of
+ the transporter (recursively).
/
bool unit_transport_check(const struct unit *pcargo,
const struct unit *ptrans)
@@ -2373,7 +2367,8 @@
/* Check transporters. */
for (plevel = ptrans; NULL != plevel;
plevel = unit_transport_get(plevel)) {
-if (unit_type(plevel) == cargo_utype) {
+if (unit_type(plevel) == cargo_utype
+|| can_unit_type_transport(cargo_utype, unit_class(plevel))) {
return FALSE;
}
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25618 - in /trunk: ai/default/aiair.c common/movement.c common/movement.h common/unit.c server/unittools.c server/unittools.h
Author: pepeto
Date: Sat Jul 19 11:14:09 2014
New Revision: 25618
URL: http://svn.gna.org/viewcvs/freeciv?rev=25618view=rev
Log:
Really take in account embark/disembark restriction rules when moving. It was
resulting units standing on undesirable tiles. Remove confusing
unit_class_transporter_capacity(), and prefer transport_from_tile().
See gna bug #22299
Modified:
trunk/ai/default/aiair.c
trunk/common/movement.c
trunk/common/movement.h
trunk/common/unit.c
trunk/server/unittools.c
trunk/server/unittools.h
Modified: trunk/ai/default/aiair.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/default/aiair.c?rev=25618r1=25617r2=25618view=diff
==
--- trunk/ai/default/aiair.c(original)
+++ trunk/ai/default/aiair.cSat Jul 19 11:14:09 2014
@@ -61,7 +61,6 @@
struct pf_path **path)
{
struct player *pplayer = unit_owner(punit);
- const struct unit_type *punittype = unit_type(punit);
struct pf_parameter parameter;
struct pf_map *pfm;
@@ -75,7 +74,7 @@
break;
}
-if (is_airunit_refuel_point(ptile, pplayer, punittype, FALSE)) {
+if (is_airunit_refuel_point(ptile, pplayer, punit)) {
if (path) {
*path = pf_map_path(pfm, ptile);
}
@@ -273,8 +272,7 @@
break; /* Too far! */
}
-if (!is_airunit_refuel_point(ptile, pplayer,
- unit_type(punit), FALSE)) {
+if (!is_airunit_refuel_point(ptile, pplayer, punit)) {
continue; /* Cannot refuel here. */
}
@@ -346,8 +344,7 @@
/* We are on a GOTO. Check if it will get us anywhere */
NULL != punit-goto_tile
!same_pos(unit_tile(punit), punit-goto_tile)
- is_airunit_refuel_point(punit-goto_tile,
- pplayer, unit_type(punit), FALSE)) {
+ is_airunit_refuel_point(punit-goto_tile, pplayer, punit)) {
pfm = pf_map_new(parameter);
path = pf_map_path(pfm, punit-goto_tile);
if (path) {
Modified: trunk/common/movement.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.c?rev=25618r1=25617r2=25618view=diff
==
--- trunk/common/movement.c (original)
+++ trunk/common/movement.c Sat Jul 19 11:14:09 2014
@@ -570,8 +570,7 @@
/* 5) */
if (!(can_exist_at_tile(punittype, dst_tile)
-|| unit_class_transporter_capacity(dst_tile, puowner,
- utype_class(punittype)) 0)) {
+|| NULL != transport_from_tile(punit, dst_tile))) {
return MR_NO_TRANSPORTER_CAPACITY;
}
@@ -640,9 +639,7 @@
if (!(is_native_move(utype_class(punittype), src_tile, dst_tile)
/* Allow non-native moves into cities or boarding transport. */
|| pcity
-|| 0 unit_class_transporter_capacity(dst_tile,
- puowner,
- utype_class(punittype {
+|| NULL != transport_from_tile(punit, dst_tile))) {
return MR_NON_NATIVE_MOVE;
}
@@ -678,7 +675,8 @@
Search transport suitable for given unit from tile. It has to have
free space in it.
**/
-struct unit *transport_from_tile(struct unit *punit, struct tile *ptile)
+struct unit *transport_from_tile(const struct unit *punit,
+ const struct tile *ptile)
{
unit_list_iterate(ptile-units, ptransport) {
if (could_unit_load(punit, ptransport)) {
@@ -687,30 +685,6 @@
} unit_list_iterate_end;
return NULL;
-}
-
-/**
- Returns the number of free spaces for units of given class.
- Can be 0.
-**/
-int unit_class_transporter_capacity(const struct tile *ptile,
-const struct player *pplayer,
-const struct unit_class *pclass)
-{
- int availability = 0;
-
- unit_list_iterate(ptile-units, punit) {
-if (unit_owner(punit) == pplayer
-|| pplayers_allied(unit_owner(punit), pplayer)) {
-
- if (can_unit_type_transport(unit_type(punit), pclass)) {
-availability += get_transporter_capacity(punit);
-availability -= get_transporter_occupancy(punit);
- }
-}
- } unit_list_iterate_end;
-
- return availability;
}
static int move_points_denomlen = 0;
Modified: trunk/common/movement.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/movement.h?rev=25618r1=25617r2=25618view=diff
==
--- trunk/common/movement.h (original)
+++ trunk/common/movement.h Sat Jul 19 11:14:09 2014
@@ -90,10 +90,8 @@
bool
[Freeciv-commits] r25619 - in /branches/S2_5: ai/default/ common/ server/
Author: pepeto
Date: Sat Jul 19 11:14:15 2014
New Revision: 25619
URL: http://svn.gna.org/viewcvs/freeciv?rev=25619view=rev
Log:
Really take in account embark/disembark restriction rules when moving. It was
resulting units standing on undesirable tiles. Prefer transport_from_tile()
to unit_class_transporter_capacity().
See gna bug #22299
Modified:
branches/S2_5/ai/default/aiair.c
branches/S2_5/common/movement.c
branches/S2_5/common/movement.h
branches/S2_5/common/unit.c
branches/S2_5/server/unittools.c
branches/S2_5/server/unittools.h
Modified: branches/S2_5/ai/default/aiair.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ai/default/aiair.c?rev=25619r1=25618r2=25619view=diff
==
--- branches/S2_5/ai/default/aiair.c(original)
+++ branches/S2_5/ai/default/aiair.cSat Jul 19 11:14:15 2014
@@ -56,7 +56,6 @@
struct pf_path **path)
{
struct player *pplayer = unit_owner(punit);
- const struct unit_type *punittype = unit_type(punit);
struct pf_parameter parameter;
struct pf_map *pfm;
@@ -69,7 +68,7 @@
break;
}
-if (is_airunit_refuel_point(ptile, pplayer, punittype, FALSE)) {
+if (is_airunit_refuel_point(ptile, pplayer, punit)) {
if (path) {
*path = pf_map_path(pfm, ptile);
}
@@ -265,8 +264,7 @@
break; /* Too far! */
}
-if (!is_airunit_refuel_point(ptile, pplayer,
- unit_type(punit), FALSE)) {
+if (!is_airunit_refuel_point(ptile, pplayer, punit)) {
continue; /* Cannot refuel here. */
}
@@ -338,8 +336,7 @@
/* We are on a GOTO. Check if it will get us anywhere */
NULL != punit-goto_tile
!same_pos(unit_tile(punit), punit-goto_tile)
- is_airunit_refuel_point(punit-goto_tile,
- pplayer, unit_type(punit), FALSE)) {
+ is_airunit_refuel_point(punit-goto_tile, pplayer, punit)) {
pfm = pf_map_new(parameter);
path = pf_map_path(pfm, punit-goto_tile);
if (path) {
Modified: branches/S2_5/common/movement.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/movement.c?rev=25619r1=25618r2=25619view=diff
==
--- branches/S2_5/common/movement.c (original)
+++ branches/S2_5/common/movement.c Sat Jul 19 11:14:15 2014
@@ -485,8 +485,7 @@
/* 4) */
if (!(can_exist_at_tile(punittype, dst_tile)
-|| unit_class_transporter_capacity(dst_tile, puowner,
- utype_class(punittype)) 0)) {
+|| NULL != transport_from_tile(punit, dst_tile))) {
return MR_NO_TRANSPORTER_CAPACITY;
}
@@ -583,7 +582,8 @@
Search transport suitable for given unit from tile. It has to have
free space in it.
**/
-struct unit *transport_from_tile(struct unit *punit, struct tile *ptile)
+struct unit *transport_from_tile(const struct unit *punit,
+ const struct tile *ptile)
{
unit_list_iterate(ptile-units, ptransport) {
if (could_unit_load(punit, ptransport)) {
Modified: branches/S2_5/common/movement.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/movement.h?rev=25619r1=25618r2=25619view=diff
==
--- branches/S2_5/common/movement.h (original)
+++ branches/S2_5/common/movement.h Sat Jul 19 11:14:15 2014
@@ -95,7 +95,8 @@
int unit_class_transporter_capacity(const struct tile *ptile,
const struct player *pplayer,
const struct unit_class *pclass);
-struct unit *transport_from_tile(struct unit *punit, struct tile *ptile);
+struct unit *transport_from_tile(const struct unit *punit,
+ const struct tile *ptile);
void init_move_fragments(void);
const char *move_points_text_full(int mp, bool reduce, const char *prefix,
Modified: branches/S2_5/common/unit.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/unit.c?rev=25619r1=25618r2=25619view=diff
==
--- branches/S2_5/common/unit.c (original)
+++ branches/S2_5/common/unit.c Sat Jul 19 11:14:15 2014
@@ -2069,9 +2069,8 @@
}
if (!can_type_transport_units_cargo(to_unittype, punit)) {
-/* TODO: allow transported units to be reassigned. Check for
- * unit_class_transporter_capacity() here and make changes to
- * upgrade_unit. */
+/* TODO: allow transported units to be reassigned. Check here
+ * and make changes to upgrade_unit. */
return UU_NOT_ENOUGH_ROOM;
}
Modified: branches/S2_5/server/unittools.c
URL:
[Freeciv-commits] r25621 - /branches/S2_5/server/savegame.c
Author: cazfi Date: Sat Jul 19 11:21:05 2014 New Revision: 25621 URL: http://svn.gna.org/viewcvs/freeciv?rev=25621view=rev Log: Set up citizen nationality information when loading pre-2.3 savegame Reported by pepeto pepeto See bug #20538 Modified: branches/S2_5/server/savegame.c Modified: branches/S2_5/server/savegame.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/savegame.c?rev=25621r1=25620r2=25621view=diff == --- branches/S2_5/server/savegame.c (original) +++ branches/S2_5/server/savegame.c Sat Jul 19 11:21:05 2014 @@ -35,6 +35,7 @@ #include ai.h #include bitvector.h #include capability.h +#include citizens.h #include city.h #include game.h #include government.h @@ -51,6 +52,7 @@ /* server */ #include aiiface.h #include barbarian.h +#include citizenshand.h #include citytools.h #include cityturn.h #include diplhand.h @@ -2524,6 +2526,7 @@ /* copied into city-name */ pcity = create_city_virtual(plr, pcenter, name); adv_city_alloc(pcity); +citizens_init(pcity); fc_assert_exit_msg(secfile_lookup_int(file, pcity-id, player%d.c%d.id, plrno, i), @@ -2909,6 +2912,10 @@ BV_SET(pcity-city_options, j); } } + +/* Create new citizens info, since these old savegames do not contain + * it. */ +citizens_update(pcity, NULL); fc_snprintf(citystr, sizeof(citystr), player%d.c%d, plrno, i); CALL_FUNC_EACH_AI(city_load, file, pcity, citystr); ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25620 - /trunk/server/savegame.c
Author: cazfi Date: Sat Jul 19 11:20:59 2014 New Revision: 25620 URL: http://svn.gna.org/viewcvs/freeciv?rev=25620view=rev Log: Set up citizen nationality information when loading pre-2.3 savegame Reported by pepeto pepeto See bug #20538 Modified: trunk/server/savegame.c Modified: trunk/server/savegame.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame.c?rev=25620r1=25619r2=25620view=diff == --- trunk/server/savegame.c (original) +++ trunk/server/savegame.c Sat Jul 19 11:20:59 2014 @@ -35,6 +35,7 @@ #include ai.h #include bitvector.h #include capability.h +#include citizens.h #include city.h #include game.h #include government.h @@ -52,6 +53,7 @@ /* server */ #include aiiface.h #include barbarian.h +#include citizenshand.h #include citytools.h #include cityturn.h #include diplhand.h @@ -2269,6 +2271,7 @@ /* copied into city-name */ pcity = create_city_virtual(plr, pcenter, name); adv_city_alloc(pcity); +citizens_init(pcity); fc_assert_exit_msg(secfile_lookup_int(file, pcity-id, player%d.c%d.id, plrno, i), @@ -2596,6 +2599,10 @@ BV_SET(pcity-city_options, j); } } + +/* Create new citizens info, since these old savegames do not contain + * it. */ +citizens_update(pcity, NULL); fc_snprintf(citystr, sizeof(citystr), player%d.c%d, plrno, i); CALL_FUNC_EACH_AI(city_load, file, pcity, citystr); ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25622 - /branches/S2_4/server/savegame.c
Author: cazfi Date: Sat Jul 19 11:21:16 2014 New Revision: 25622 URL: http://svn.gna.org/viewcvs/freeciv?rev=25622view=rev Log: Set up citizen nationality information when loading pre-2.3 savegame Reported by pepeto pepeto See bug #20538 Modified: branches/S2_4/server/savegame.c Modified: branches/S2_4/server/savegame.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/server/savegame.c?rev=25622r1=25621r2=25622view=diff == --- branches/S2_4/server/savegame.c (original) +++ branches/S2_4/server/savegame.c Sat Jul 19 11:21:16 2014 @@ -35,6 +35,7 @@ #include ai.h #include bitvector.h #include capability.h +#include citizens.h #include city.h #include game.h #include government.h @@ -51,6 +52,7 @@ /* server */ #include aiiface.h #include barbarian.h +#include citizenshand.h #include citytools.h #include cityturn.h #include diplhand.h @@ -2979,6 +2981,7 @@ /* copied into city-name */ pcity = create_city_virtual(plr, pcenter, name); adv_city_alloc(pcity); +citizens_init(pcity); fc_assert_exit_msg(secfile_lookup_int(file, pcity-id, player%d.c%d.id, plrno, i), @@ -3365,6 +3368,10 @@ BV_SET(pcity-city_options, j); } } + +/* Create new citizens info, since these old savegames do not contain + * it. */ +citizens_update(pcity); fc_snprintf(citystr, sizeof(citystr), player%d.c%d, plrno, i); CALL_FUNC_EACH_AI(city_load, file, pcity, citystr); ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25623 - /trunk/common/aicore/path_finding.c
Author: pepeto Date: Sat Jul 19 11:22:12 2014 New Revision: 25623 URL: http://svn.gna.org/viewcvs/freeciv?rev=25623view=rev Log: Path-finding for fueled units: instead of registering all full segments, try to link pf_fuel_pos to each others. See gna patch #4930 Modified: trunk/common/aicore/path_finding.c [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/common/aicore/path_finding.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/path_finding.c?rev=25623r1=25622r2=25623view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25624 - /trunk/common/aicore/path_finding.c
Author: pepeto
Date: Sat Jul 19 11:37:11 2014
New Revision: 25624
URL: http://svn.gna.org/viewcvs/freeciv?rev=25624view=rev
Log:
Path-finding for fueled units: cache step move costs.
See gna patch #4932
Modified:
trunk/common/aicore/path_finding.c
Modified: trunk/common/aicore/path_finding.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/aicore/path_finding.c?rev=25624r1=25623r2=25624view=diff
==
--- trunk/common/aicore/path_finding.c (original)
+++ trunk/common/aicore/path_finding.c Sat Jul 19 11:37:11 2014
@@ -1919,6 +1919,7 @@
* FIXME: this is right only for units with
* constant move costs! */
unsigned short extra_tile;/* EC */
+ unsigned char cost_to_here[DIR8_MAGIC_MAX]; /* Step cost[dir to here] */
/* Segment leading across the danger area back to the nearest safe node:
* need to remeber costs and stuff. */
@@ -2599,30 +2600,43 @@
continue;
}
-/* Evaluate the cost of the move. */
-if (PF_ACTION_NONE != node1-action) {
- if (NULL != params-is_action_possible
- !params-is_action_possible(tile, scope, tile1,
- node1-action, params)) {
+cost = node1-cost_to_here[dir];
+if (0 == cost) {
+ /* Evaluate the cost of the move. */
+ if (PF_ACTION_NONE != node1-action) {
+if (NULL != params-is_action_possible
+ !params-is_action_possible(tile, scope, tile1,
+ node1-action, params)) {
+ node1-cost_to_here[dir] = PF_IMPOSSIBLE_MC + 2;
+ continue;
+}
+/* action move cost depends on action and unit type. */
+if (node1-action == PF_ACTION_ATTACK
+ (utype_has_flag(params-utype, UTYF_ONEATTACK)
+|| uclass_has_flag(utype_class(params-utype),
+ UCF_MISSILE))) {
+ cost = params-move_rate;
+} else {
+ cost = SINGLE_MOVE;
+}
+ } else if (node1-node_known_type == TILE_UNKNOWN) {
+cost = params-utype-unknown_move_cost;
+ } else {
+cost = params-get_MC(tile, scope, tile1, node1-move_scope,
+ params);
+ }
+#ifdef PF_DEBUG
+ fc_assert(1 (8 * sizeof(node1-cost_to_here[dir])) cost + 2);
+ fc_assert(0 cost + 2);
+#endif
+ node1-cost_to_here[dir] = cost + 2;
+ if (cost == PF_IMPOSSIBLE_MC) {
continue;
}
- /* action move cost depends on action and unit type. */
- if (node1-action == PF_ACTION_ATTACK
- (utype_has_flag(params-utype, UTYF_ONEATTACK)
- || uclass_has_flag(utype_class(params-utype),
- UCF_MISSILE))) {
-cost = params-move_rate;
- } else {
-cost = SINGLE_MOVE;
- }
-} else if (node1-node_known_type == TILE_UNKNOWN) {
- cost = params-utype-unknown_move_cost;
+} else if (cost == PF_IMPOSSIBLE_MC - 2) {
+ continue;
} else {
- cost = params-get_MC(tile, scope, tile1, node1-move_scope,
-params);
-}
-if (cost == PF_IMPOSSIBLE_MC) {
- continue;
+ cost -= 2;
}
cost = pf_fuel_map_adjust_cost(cost, loc_moves_left,
params-move_rate);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25625 - /branches/S2_4/po/pl.po
Author: jtn Date: Sat Jul 19 12:14:04 2014 New Revision: 25625 URL: http://svn.gna.org/viewcvs/freeciv?rev=25625view=rev Log: Updated Polish translation by Hubert Kowalewski (hubkow@gna). Pulled from https://www.dropbox.com/sh/71c35xdmxe53y2d/SycNW254Ga. 99.9%: 7196 translated, 1 fuzzy, 3 untranslated. Modified: branches/S2_4/po/pl.po Modified: branches/S2_4/po/pl.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/pl.po?rev=25625r1=25624r2=25625view=diff == --- branches/S2_4/po/pl.po (original) +++ branches/S2_4/po/pl.po Sat Jul 19 12:14:04 2014 @@ -35,9 +35,9 @@ msgstr Project-Id-Version: freeciv\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-07-09 02:14+0300\n -PO-Revision-Date: 2014-07-05 13:18+0100\n -Last-Translator: Hubert Kowalewski hub...@gmai.com\n +POT-Creation-Date: 2014-07-12 23:09+0300\n +PO-Revision-Date: 2014-07-13 11:53+0100\n +Last-Translator: Hubert Kowalewski hub...@gmail.com\n Language-Team: polski hub...@gmail.com\n Language: pl\n MIME-Version: 1.0\n @@ -3194,7 +3194,7 @@ #: client/gui-gtk-3.0/editprop.c:3513 client/gui-gtk-3.0/editprop.c:4156 #: client/gui-gtk-3.0/editprop.c:4177 client/gui-gtk-3.0/pages.c:1315 #: client/gui-gtk-3.0/pages.c:2681 client/gui-gtk-3.0/wldlg.c:1001 -#: data/Freeciv.in:97 manual/civmanual.c:368 modinst/modinst.c:283 +#: data/Freeciv.in:97 manual/civmanual.c:368 modinst/modinst.c:343 msgid Name msgstr Nazwa @@ -4734,7 +4734,7 @@ #: client/gui-gtk-2.0/pages.c:1119 client/gui-gtk-2.0/pages.c:1162 #: client/gui-gtk-3.0/pages.c:1145 client/gui-gtk-3.0/pages.c:1190 -#: modinst/modinst.c:288 +#: modinst/modinst.c:348 msgid Version msgstr Wersja @@ -4949,7 +4949,7 @@ #: client/gui-gtk-2.0/pages.c:2653 client/gui-gtk-2.0/unitselect.c:470 #: client/gui-gtk-3.0/pages.c:2687 client/gui-gtk-3.0/unitselect.c:472 -#: modinst/modinst.c:150 +#: modinst/modinst.c:210 msgid Ready msgstr Gotowy @@ -8395,13 +8395,13 @@ #: client/helpdata.c:1779 msgid * All players start with this improvement in their first city.\n -msgstr +msgstr * Wszyscy gracze rozpoczynajÄ z tym budynkiem w pierwszym mieÅcie.\n #. TRANS: %s is a nation plural #: client/helpdata.c:1798 #, c-format msgid * The %s start with this improvement in their first city.\n -msgstr +msgstr * %s rozpoczynajÄ z tym budynkiem w pierwszym mieÅcie.\n #. TRANS: don't translate 'savepalace' #: client/helpdata.c:1808 @@ -8489,9 +8489,9 @@ #, c-format msgid * The %s start the game with %d of these units.\n msgid_plural * The %s start the game with %d of these units.\n -msgstr[0] -msgstr[1] -msgstr[2] +msgstr[0] * %s rozpoczynajÄ z %d takÄ jednostkÄ .\n +msgstr[1] * %s rozpoczynajÄ z %d takimi jednostkami.\n +msgstr[2] * %s rozpoczynajÄ z %d takimi jednostkami.\n #. TRANS: %s is a list of unit types separated by or. #: client/helpdata.c:1979 @@ -8850,15 +8850,14 @@ msgstr Ta liczba może siÄ zmieniaÄ w zależnoÅci od badaÅ innych graczy.\n #: client/helpdata.c:2393 -#, fuzzy msgid * All players start the game with knowledge of this technology.\n -msgstr * Pozwala wszystkim graczom ze znajomoÅciÄ %s budowaÄ jednostki %s.\n +msgstr * Wszyscy gracze rozpoczynajÄ grÄ z tÄ technologiÄ .\n #. TRANS: %s is a nation plural #: client/helpdata.c:2411 -#, fuzzy, c-format +#, c-format msgid * The %s start the game with knowledge of this technology.\n -msgstr Wymagania: znajomoÅÄ technologii %s.\n +msgstr * %s rozpoczynajÄ grÄ z tÄ technologiÄ .\n #: client/helpdata.c:2420 #, c-format @@ -13243,6 +13242,8 @@ msgid Reduces the corruption in a city by 50%. Has no effect in your capital city. msgstr +Zmniejsza korupcjÄ w mieÅcie o 50%. Nie ma przynosi żadnych korzyÅci w +stolicy. #: data/civ1/buildings.ruleset:227 data/civ2/buildings.ruleset:284 #: data/default/buildings.ruleset:324 data/experimental/buildings.ruleset:329 @@ -13389,7 +13390,6 @@ #: data/civ1/buildings.ruleset:435 data/default/buildings.ruleset:584 #: data/experimental/buildings.ruleset:636 -#, fuzzy msgid Makes a city the capital and the center of your government. Corruption in other cities is related to how far away from the capital they are, except @@ -13397,11 +13397,11 @@ your capital itself is half of what it would otherwise be (as if it had a Courthouse). msgstr -Miasto, w którym zostaÅ wybudowany staje siÄ twojÄ stolicÄ (oÅrodkiem +Miasto w którym zostaÅ wybudowany staje siÄ twojÄ stolicÄ (oÅrodkiem wÅadzy). Korupcja w pozostaÅych miastach jest obliczana na podstawie odlegÅoÅci od stolicy, chyba że twoim ustrojem jest Demokracja lub Komunizm. -Koszt wzniecenia buntu w danym mieÅcie jest także proporcjonalny do -odlegÅoÅci od stolicy (w każdym ustroju). +Ponadto korupcja w stolicy jest o poÅowÄ niższa w porównaniu z miastem +niestoÅecznym (tak jakby miasto miaÅo SÄ d). #: data/civ1/buildings.ruleset:441
[Freeciv-commits] r25626 - in /branches/S2_5/translations: freeciv/pl.po nations/pl.po
Author: jtn Date: Sat Jul 19 12:20:06 2014 New Revision: 25626 URL: http://svn.gna.org/viewcvs/freeciv?rev=25626view=rev Log: Updated Polish translation by Hubert Kowalewski (hubkow@gna). Pulled from https://www.dropbox.com/sh/71c35xdmxe53y2d/SycNW254Ga. freeciv: 99.8%: 5940 translated, 3 fuzzy, 7 untranslated. nations: 99.9%: 1843 translated, 1 fuzzy. Modified: branches/S2_5/translations/freeciv/pl.po branches/S2_5/translations/nations/pl.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/pl.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/pl.po?rev=25626r1=25625r2=25626view=diff Modified: branches/S2_5/translations/nations/pl.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/nations/pl.po?rev=25626r1=25625r2=25626view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25627 - in /trunk/translations: freeciv/pl.po nations/pl.po ruledit/pl.po
Author: jtn Date: Sat Jul 19 12:39:14 2014 New Revision: 25627 URL: http://svn.gna.org/viewcvs/freeciv?rev=25627view=rev Log: Updated Polish translation by Hubert Kowalewski (hubkow@gna). Pulled from https://www.dropbox.com/sh/71c35xdmxe53y2d/SycNW254Ga. freeciv: 99.7%: 6480 translated, 9 fuzzy, 8 untranslated. nations: 99.9%: 1843 translated, 1 fuzzy. ruledit: 89%: 24 translated, 3 untranslated. Modified: trunk/translations/freeciv/pl.po trunk/translations/nations/pl.po trunk/translations/ruledit/pl.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/translations/freeciv/pl.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/freeciv/pl.po?rev=25627r1=25626r2=25627view=diff Modified: trunk/translations/nations/pl.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/nations/pl.po?rev=25627r1=25626r2=25627view=diff Modified: trunk/translations/ruledit/pl.po URL: http://svn.gna.org/viewcvs/freeciv/trunk/translations/ruledit/pl.po?rev=25627r1=25626r2=25627view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25628 - /branches/S2_4/NEWS
Author: jtn Date: Sat Jul 19 13:19:39 2014 New Revision: 25628 URL: http://svn.gna.org/viewcvs/freeciv?rev=25628view=rev Log: Refresh NEWS from wiki NEWS-2.4.0. Modified: branches/S2_4/NEWS Modified: branches/S2_4/NEWS URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/NEWS?rev=25628r1=25627r2=25628view=diff == --- branches/S2_4/NEWS (original) +++ branches/S2_4/NEWS Sat Jul 19 13:19:39 2014 @@ -168,7 +168,7 @@ Changes affecting supplied rulesets * Nations: - + The number of playable nations has increased from 387 to 541. + + The number of playable nations has increased from 385 to 539. + Out of these, a subset of 50 core nations has been defined, based mostly on nations that have appeared in the Civilization series of games. For localised versions of Freeciv, these ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25629 - /branches/S2_4/doc/FAQ
Author: jtn Date: Sat Jul 19 13:26:45 2014 New Revision: 25629 URL: http://svn.gna.org/viewcvs/freeciv?rev=25629view=rev Log: Update FAQ semi-manually from wiki. Modified: branches/S2_4/doc/FAQ Modified: branches/S2_4/doc/FAQ URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/doc/FAQ?rev=25629r1=25628r2=25629view=diff == --- branches/S2_4/doc/FAQ (original) +++ branches/S2_4/doc/FAQ Sat Jul 19 13:26:45 2014 @@ -25,8 +25,8 @@ 1.14 How compatible is Freeciv with the commercial Civilization games? 1.15 My opponents seem to be able to play two moves at once! - 1.16 I am far superior to my opponent but his last city is on - a 1x1 island so I cannot conquer it, and he won't give up. + 1.16 I am far superior to my opponent but their last city is on + a 1x1 island so I cannot conquer it, and they won't give up. What can I do? 1.17 Why are the AI players so hard on 'novice' or 'easy'? 1.18 Why are the AI players so easy on 'hard'? @@ -83,7 +83,7 @@ 3.29.3 Graphic display 3.29.4 Network 4 Windows - 4.1 How do I use Freeciv under MS Windows ? + 4.1 How do I use Freeciv under MS Windows? 4.2 Retrieving the Native Windows Freeciv 4.3 OK, I've downloaded and installed it, how do I run it? 4.4 I've started the Freeciv client, but don't know what to do @@ -125,7 +125,7 @@ Once the game is started you can find information in its Help menu. If you've never played a Civilization-style game before you may want to - look at the help on Strategy and tactics. + look at the help on Strategy and Tactics. You can continue to change the game settings through the Remote Server menu item in the Options submenu of the Game menu. Type /help in the @@ -190,7 +190,7 @@ In SDL Freeciv you have to press Tab to access the chatline. - The chatline can be used for normal chatting or for issuing server + The chatline can be used for normal chatting, or for issuing server commands by typing a forward-slash '/' followed by the server command. --- @@ -261,7 +261,7 @@ through the chatline by: /set spacerace 0 - . From 2.4, you can allow space races without them ending the game by + From 2.4, you can allow space races without them ending the game by instead changing the endspaceship setting. A single player who defeats all enemies will always win the game -- @@ -382,9 +382,9 @@ 100% compatible with Civilization⢠I and II, but only as an option. This is why Freeciv comes with three game configurations (rulesets): - the civ1 and civ2 modpacks implement game rules, elements and features + the civ1 and civ2 rulesets implement game rules, elements and features that bring it as close as possible to Civilization I and Civilization - II respectively, while the default modpack tries to reflect the most + II respectively, while the default ruleset tries to reflect the most popular settings among Freeciv players. Unimplemented Civilization I and II features are mainly those that would have little or no benefit in multiplayer mode, and nobody is working on closing this gap. @@ -393,8 +393,8 @@ similar games, such as SMAC, CTP or Civilization III. So the goal of compatibility is mainly used as a limiting factor in - development: When a new feature is added to Freeciv that makes gameplay - different, it is always implemented in such a way that the + development: when a new feature is added to Freeciv that makes gameplay + different, it is generally implemented in such a way that the traditional behaviour remains available as an option. See also Projects. @@ -409,21 +409,20 @@ players to surprise their opponents by clever use of goto or quick fingers. - In Freeciv 2.2 an alternating movement server option (phasemode) is - available, in which only one player can move their units at a time. - - Other server settings to mitigate this problem include: + Server settings to mitigate this problem include: + * phasemode, which has an alternating movement mode, in which only + one player can move their units at a time. * timeaddenemymove (which extends the turn timeout when an enemy's - unit is seen moving) + unit is seen moving). * (since 2.3.x) unitwaittime (which imposes a minimum time between moves of a single unit on successive turns). --- -1.16 I am far superior to my opponent but his last city is on a 1x1 island so I -cannot conquer it, and he won't give up. What can I do? - - Research 'amphibious warfare', build a marine, and get him. +1.16 I am far superior to my opponent but their last city is on a 1x1 island so +I
[Freeciv-commits] r25630 - /branches/S2_5/doc/FAQ
Author: jtn Date: Sat Jul 19 14:34:24 2014 New Revision: 25630 URL: http://svn.gna.org/viewcvs/freeciv?rev=25630view=rev Log: Update FAQ semi-manually from wiki. (copy of S2_4 r25629) Modified: branches/S2_5/doc/FAQ Modified: branches/S2_5/doc/FAQ URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/doc/FAQ?rev=25630r1=25629r2=25630view=diff == --- branches/S2_5/doc/FAQ (original) +++ branches/S2_5/doc/FAQ Sat Jul 19 14:34:24 2014 @@ -25,8 +25,8 @@ 1.14 How compatible is Freeciv with the commercial Civilization games? 1.15 My opponents seem to be able to play two moves at once! - 1.16 I am far superior to my opponent but his last city is on - a 1x1 island so I cannot conquer it, and he won't give up. + 1.16 I am far superior to my opponent but their last city is on + a 1x1 island so I cannot conquer it, and they won't give up. What can I do? 1.17 Why are the AI players so hard on 'novice' or 'easy'? 1.18 Why are the AI players so easy on 'hard'? @@ -83,7 +83,7 @@ 3.29.3 Graphic display 3.29.4 Network 4 Windows - 4.1 How do I use Freeciv under MS Windows ? + 4.1 How do I use Freeciv under MS Windows? 4.2 Retrieving the Native Windows Freeciv 4.3 OK, I've downloaded and installed it, how do I run it? 4.4 I've started the Freeciv client, but don't know what to do @@ -125,7 +125,7 @@ Once the game is started you can find information in its Help menu. If you've never played a Civilization-style game before you may want to - look at the help on Strategy and tactics. + look at the help on Strategy and Tactics. You can continue to change the game settings through the Remote Server menu item in the Options submenu of the Game menu. Type /help in the @@ -155,9 +155,9 @@ under Local Area Network. To host your own game, we recommend starting a separate server by hand. - (It has been possible to host a network game from the client, but we - don't recommend it, as if the client crashes or quits, the server and - hence the game will be lost.) + (As of 2.4.0, it's no longer possible to host a network game from the + client; in any case, we didn't recommend it, as if the client crashed + or quit, the server and hence the game would be lost.) To start the server, enter freeciv-server in a terminal or by double-clicking on the executable. This will start up a text-based @@ -190,7 +190,7 @@ In SDL Freeciv you have to press Tab to access the chatline. - The chatline can be used for normal chatting or for issuing server + The chatline can be used for normal chatting, or for issuing server commands by typing a forward-slash '/' followed by the server command. --- @@ -261,7 +261,7 @@ through the chatline by: /set spacerace 0 - . From 2.4, you can allow space races without them ending the game by + From 2.4, you can allow space races without them ending the game by instead changing the endspaceship setting. A single player who defeats all enemies will always win the game -- @@ -382,9 +382,9 @@ 100% compatible with Civilization⢠I and II, but only as an option. This is why Freeciv comes with three game configurations (rulesets): - the civ1 and civ2 modpacks implement game rules, elements and features + the civ1 and civ2 rulesets implement game rules, elements and features that bring it as close as possible to Civilization I and Civilization - II respectively, while the default modpack tries to reflect the most + II respectively, while the default ruleset tries to reflect the most popular settings among Freeciv players. Unimplemented Civilization I and II features are mainly those that would have little or no benefit in multiplayer mode, and nobody is working on closing this gap. @@ -393,8 +393,8 @@ similar games, such as SMAC, CTP or Civilization III. So the goal of compatibility is mainly used as a limiting factor in - development: When a new feature is added to Freeciv that makes gameplay - different, it is always implemented in such a way that the + development: when a new feature is added to Freeciv that makes gameplay + different, it is generally implemented in such a way that the traditional behaviour remains available as an option. See also Projects. @@ -409,21 +409,20 @@ players to surprise their opponents by clever use of goto or quick fingers. - In Freeciv 2.2 an alternating movement server option (phasemode) is - available, in which only one player can move their units at a time. - - Other server settings to mitigate this problem include: + Server settings to mitigate this problem include: + *
[Freeciv-commits] r25631 - /trunk/doc/FAQ
Author: jtn Date: Sat Jul 19 14:35:50 2014 New Revision: 25631 URL: http://svn.gna.org/viewcvs/freeciv?rev=25631view=rev Log: Update FAQ semi-manually from wiki. (copy of S2_4 r25629) Modified: trunk/doc/FAQ Modified: trunk/doc/FAQ URL: http://svn.gna.org/viewcvs/freeciv/trunk/doc/FAQ?rev=25631r1=25630r2=25631view=diff == --- trunk/doc/FAQ (original) +++ trunk/doc/FAQ Sat Jul 19 14:35:50 2014 @@ -25,8 +25,8 @@ 1.14 How compatible is Freeciv with the commercial Civilization games? 1.15 My opponents seem to be able to play two moves at once! - 1.16 I am far superior to my opponent but his last city is on - a 1x1 island so I cannot conquer it, and he won't give up. + 1.16 I am far superior to my opponent but their last city is on + a 1x1 island so I cannot conquer it, and they won't give up. What can I do? 1.17 Why are the AI players so hard on 'novice' or 'easy'? 1.18 Why are the AI players so easy on 'hard'? @@ -83,7 +83,7 @@ 3.29.3 Graphic display 3.29.4 Network 4 Windows - 4.1 How do I use Freeciv under MS Windows ? + 4.1 How do I use Freeciv under MS Windows? 4.2 Retrieving the Native Windows Freeciv 4.3 OK, I've downloaded and installed it, how do I run it? 4.4 I've started the Freeciv client, but don't know what to do @@ -125,7 +125,7 @@ Once the game is started you can find information in its Help menu. If you've never played a Civilization-style game before you may want to - look at the help on Strategy and tactics. + look at the help on Strategy and Tactics. You can continue to change the game settings through the Remote Server menu item in the Options submenu of the Game menu. Type /help in the @@ -155,9 +155,9 @@ under Local Area Network. To host your own game, we recommend starting a separate server by hand. - (It has been possible to host a network game from the client, but we - don't recommend it, as if the client crashes or quits, the server and - hence the game will be lost.) + (As of 2.4.0, it's no longer possible to host a network game from the + client; in any case, we didn't recommend it, as if the client crashed + or quit, the server and hence the game would be lost.) To start the server, enter freeciv-server in a terminal or by double-clicking on the executable. This will start up a text-based @@ -190,7 +190,7 @@ In SDL Freeciv you have to press Tab to access the chatline. - The chatline can be used for normal chatting or for issuing server + The chatline can be used for normal chatting, or for issuing server commands by typing a forward-slash '/' followed by the server command. --- @@ -261,7 +261,7 @@ through the chatline by: /set spacerace 0 - . From 2.4, you can allow space races without them ending the game by + From 2.4, you can allow space races without them ending the game by instead changing the endspaceship setting. A single player who defeats all enemies will always win the game -- @@ -382,9 +382,9 @@ 100% compatible with Civilization⢠I and II, but only as an option. This is why Freeciv comes with three game configurations (rulesets): - the civ1 and civ2 modpacks implement game rules, elements and features + the civ1 and civ2 rulesets implement game rules, elements and features that bring it as close as possible to Civilization I and Civilization - II respectively, while the default modpack tries to reflect the most + II respectively, while the default ruleset tries to reflect the most popular settings among Freeciv players. Unimplemented Civilization I and II features are mainly those that would have little or no benefit in multiplayer mode, and nobody is working on closing this gap. @@ -393,8 +393,8 @@ similar games, such as SMAC, CTP or Civilization III. So the goal of compatibility is mainly used as a limiting factor in - development: When a new feature is added to Freeciv that makes gameplay - different, it is always implemented in such a way that the + development: when a new feature is added to Freeciv that makes gameplay + different, it is generally implemented in such a way that the traditional behaviour remains available as an option. See also Projects. @@ -409,21 +409,20 @@ players to surprise their opponents by clever use of goto or quick fingers. - In Freeciv 2.2 an alternating movement server option (phasemode) is - available, in which only one player can move their units at a time. - - Other server settings to mitigate this problem include: + Server settings to mitigate this problem include: + * phasemode, which has an alternating
[Freeciv-commits] r25632 - /branches/S2_4/NEWS
Author: jtn Date: Sat Jul 19 14:37:54 2014 New Revision: 25632 URL: http://svn.gna.org/viewcvs/freeciv?rev=25632view=rev Log: ...and another NEWS tweak from wiki NEWS-2.3.0. Modified: branches/S2_4/NEWS Modified: branches/S2_4/NEWS URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/NEWS?rev=25632r1=25631r2=25632view=diff == --- branches/S2_4/NEWS (original) +++ branches/S2_4/NEWS Sat Jul 19 14:37:54 2014 @@ -582,7 +582,7 @@ engine, without strict regard for game balance and playability. It enables some of the new features mentioned below, such as variable city radii. - * More than doubled the number of playable nations (from 187 to 387). + * More than doubled the number of playable nations (from 185 to 385). Many improvements to existing nations, such as using native spellings for cities and leaders. * The interaction of promotions and diplomat-vs-diplomat contests has ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25633 - /branches/S2_5/NEWS
Author: jtn Date: Sat Jul 19 14:49:04 2014 New Revision: 25633 URL: http://svn.gna.org/viewcvs/freeciv?rev=25633view=rev Log: Update NEWS for 2.5 from wiki NEWS-2.5.0. Also a couple of minor corrections to NEWS for previous major versions. Modified: branches/S2_5/NEWS [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/NEWS URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/NEWS?rev=25633r1=25632r2=25633view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25634 - /trunk/NEWS
Author: jtn Date: Sat Jul 19 14:57:15 2014 New Revision: 25634 URL: http://svn.gna.org/viewcvs/freeciv?rev=25634view=rev Log: Update NEWS for 2.5 from wiki NEWS-2.5.0. Also a couple of minor corrections to NEWS for previous major versions. (copied from S2_5 r25633) Modified: trunk/NEWS [This mail would be too long, it was shortened to contain the URLs only.] Modified: trunk/NEWS URL: http://svn.gna.org/viewcvs/freeciv/trunk/NEWS?rev=25634r1=25633r2=25634view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25635 - in /branches/S2_5/translations: freeciv/ nations/
Author: jtn Date: Sat Jul 19 15:10:57 2014 New Revision: 25635 URL: http://svn.gna.org/viewcvs/freeciv?rev=25635view=rev Log: Results of running make update-po in translations/freeciv/ and translations/nations/ Modified: branches/S2_5/translations/freeciv/ar.po branches/S2_5/translations/freeciv/bg.po branches/S2_5/translations/freeciv/ca.po branches/S2_5/translations/freeciv/cs.po branches/S2_5/translations/freeciv/da.po branches/S2_5/translations/freeciv/de.po branches/S2_5/translations/freeciv/el.po branches/S2_5/translations/freeciv/en_GB.po branches/S2_5/translations/freeciv/eo.po branches/S2_5/translations/freeciv/es.po branches/S2_5/translations/freeciv/et.po branches/S2_5/translations/freeciv/fa.po branches/S2_5/translations/freeciv/fi.po branches/S2_5/translations/freeciv/fr.po branches/S2_5/translations/freeciv/ga.po branches/S2_5/translations/freeciv/gd.po branches/S2_5/translations/freeciv/he.po branches/S2_5/translations/freeciv/hu.po branches/S2_5/translations/freeciv/id.po branches/S2_5/translations/freeciv/it.po branches/S2_5/translations/freeciv/ja.po branches/S2_5/translations/freeciv/ko.po branches/S2_5/translations/freeciv/lt.po branches/S2_5/translations/freeciv/nb.po branches/S2_5/translations/freeciv/nl.po branches/S2_5/translations/freeciv/pl.po branches/S2_5/translations/freeciv/pt.po branches/S2_5/translations/freeciv/pt_BR.po branches/S2_5/translations/freeciv/ro.po branches/S2_5/translations/freeciv/ru.po branches/S2_5/translations/freeciv/sr.po branches/S2_5/translations/freeciv/sv.po branches/S2_5/translations/freeciv/tr.po branches/S2_5/translations/freeciv/uk.po branches/S2_5/translations/freeciv/zh_CN.po branches/S2_5/translations/freeciv/zh_TW.po branches/S2_5/translations/nations/ar.po branches/S2_5/translations/nations/bg.po branches/S2_5/translations/nations/ca.po branches/S2_5/translations/nations/cs.po branches/S2_5/translations/nations/da.po branches/S2_5/translations/nations/de.po branches/S2_5/translations/nations/el.po branches/S2_5/translations/nations/eo.po branches/S2_5/translations/nations/es.po branches/S2_5/translations/nations/et.po branches/S2_5/translations/nations/fa.po branches/S2_5/translations/nations/fi.po branches/S2_5/translations/nations/fr.po branches/S2_5/translations/nations/ga.po branches/S2_5/translations/nations/gd.po branches/S2_5/translations/nations/he.po branches/S2_5/translations/nations/hu.po branches/S2_5/translations/nations/id.po branches/S2_5/translations/nations/it.po branches/S2_5/translations/nations/ja.po branches/S2_5/translations/nations/ko.po branches/S2_5/translations/nations/lt.po branches/S2_5/translations/nations/nb.po branches/S2_5/translations/nations/nl.po branches/S2_5/translations/nations/pl.po branches/S2_5/translations/nations/pt.po branches/S2_5/translations/nations/pt_BR.po branches/S2_5/translations/nations/ro.po branches/S2_5/translations/nations/ru.po branches/S2_5/translations/nations/sr.po branches/S2_5/translations/nations/sv.po branches/S2_5/translations/nations/tr.po branches/S2_5/translations/nations/uk.po branches/S2_5/translations/nations/zh_CN.po branches/S2_5/translations/nations/zh_TW.po [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/translations/freeciv/ar.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ar.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/bg.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/bg.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/ca.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/ca.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/cs.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/cs.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/da.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/da.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/de.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/de.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/el.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/el.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/en_GB.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/translations/freeciv/en_GB.po?rev=25635r1=25634r2=25635view=diff Modified: branches/S2_5/translations/freeciv/eo.po URL:
[Freeciv-commits] r25637 - /branches/S2_5/ChangeLog
Author: jtn Date: Sat Jul 19 15:23:25 2014 New Revision: 25637 URL: http://svn.gna.org/viewcvs/freeciv?rev=25637view=rev Log: Update ChangeLog as of S2_5 r25636. Modified: branches/S2_5/ChangeLog [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/S2_5/ChangeLog URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ChangeLog?rev=25637r1=25636r2=25637view=diff ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25638 - /tags/R2_5_0_beta1/
Author: jtn Date: Sat Jul 19 15:28:46 2014 New Revision: 25638 URL: http://svn.gna.org/viewcvs/freeciv?rev=25638view=rev Log: Tag 2.5.0-beta1 release. Added: tags/R2_5_0_beta1/ - copied from r25637, branches/S2_5/ ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25639 - /tags/R2_5_0_beta1/fc_version
Author: jtn Date: Sat Jul 19 15:37:11 2014 New Revision: 25639 URL: http://svn.gna.org/viewcvs/freeciv?rev=25639view=rev Log: Strip '+' from version string for release. Modified: tags/R2_5_0_beta1/fc_version Modified: tags/R2_5_0_beta1/fc_version URL: http://svn.gna.org/viewcvs/freeciv/tags/R2_5_0_beta1/fc_version?rev=25639r1=25638r2=25639view=diff == --- tags/R2_5_0_beta1/fc_version(original) +++ tags/R2_5_0_beta1/fc_versionSat Jul 19 15:37:11 2014 @@ -7,7 +7,7 @@ MAJOR_VERSION=2 MINOR_VERSION=5 PATCH_VERSION=0 -VERSION_LABEL=-beta1+ +VERSION_LABEL=-beta1 # 1) Development until MAJOR and MINOR version numbers are #set to new release series: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25641 - in /branches/S2_5/client: gui-gtk-2.0/mapview.c gui-gtk-3.0/mapview.c
Author: cazfi
Date: Sat Jul 19 15:50:10 2014
New Revision: 25641
URL: http://svn.gna.org/viewcvs/freeciv?rev=25641view=rev
Log:
Added tooltip to gtk-clients' turn timeout counter
Requested by Jacob Nevins jtn
See bug #21550
Modified:
branches/S2_5/client/gui-gtk-2.0/mapview.c
branches/S2_5/client/gui-gtk-3.0/mapview.c
Modified: branches/S2_5/client/gui-gtk-2.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-2.0/mapview.c?rev=25641r1=25640r2=25641view=diff
==
--- branches/S2_5/client/gui-gtk-2.0/mapview.c (original)
+++ branches/S2_5/client/gui-gtk-2.0/mapview.c Sat Jul 19 15:50:10 2014
@@ -32,6 +32,7 @@
#include timing.h
/* common */
+#include game.h
#include government.h/* government_graphic() */
#include map.h
#include player.h
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout 0) {
+gtk_widget_set_tooltip_text(timeout_label, _(Time to forced turn
change));
+ } else {
+gtk_widget_set_tooltip_text(timeout_label, _(Turn timeout disabled));
+ }
}
/**
Modified: branches/S2_5/client/gui-gtk-3.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-gtk-3.0/mapview.c?rev=25641r1=25640r2=25641view=diff
==
--- branches/S2_5/client/gui-gtk-3.0/mapview.c (original)
+++ branches/S2_5/client/gui-gtk-3.0/mapview.c Sat Jul 19 15:50:10 2014
@@ -32,6 +32,7 @@
#include timing.h
/* common */
+#include game.h
#include government.h/* government_graphic() */
#include map.h
#include player.h
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout 0) {
+gtk_widget_set_tooltip_text(timeout_label, _(Time to forced turn
change));
+ } else {
+gtk_widget_set_tooltip_text(timeout_label, _(Turn timeout disabled));
+ }
}
/**
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25640 - in /trunk/client: gui-gtk-2.0/mapview.c gui-gtk-3.0/mapview.c
Author: cazfi
Date: Sat Jul 19 15:50:04 2014
New Revision: 25640
URL: http://svn.gna.org/viewcvs/freeciv?rev=25640view=rev
Log:
Added tooltip to gtk-clients' turn timeout counter
Requested by Jacob Nevins jtn
See bug #21550
Modified:
trunk/client/gui-gtk-2.0/mapview.c
trunk/client/gui-gtk-3.0/mapview.c
Modified: trunk/client/gui-gtk-2.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/mapview.c?rev=25640r1=25639r2=25640view=diff
==
--- trunk/client/gui-gtk-2.0/mapview.c (original)
+++ trunk/client/gui-gtk-2.0/mapview.c Sat Jul 19 15:50:04 2014
@@ -32,6 +32,7 @@
#include timing.h
/* common */
+#include game.h
#include government.h/* government_graphic() */
#include map.h
#include player.h
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout 0) {
+gtk_widget_set_tooltip_text(timeout_label, _(Time to forced turn
change));
+ } else {
+gtk_widget_set_tooltip_text(timeout_label, _(Turn timeout disabled));
+ }
}
/**
Modified: trunk/client/gui-gtk-3.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/mapview.c?rev=25640r1=25639r2=25640view=diff
==
--- trunk/client/gui-gtk-3.0/mapview.c (original)
+++ trunk/client/gui-gtk-3.0/mapview.c Sat Jul 19 15:50:04 2014
@@ -32,6 +32,7 @@
#include timing.h
/* common */
+#include game.h
#include government.h/* government_graphic() */
#include map.h
#include player.h
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout 0) {
+gtk_widget_set_tooltip_text(timeout_label, _(Time to forced turn
change));
+ } else {
+gtk_widget_set_tooltip_text(timeout_label, _(Turn timeout disabled));
+ }
}
/**
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25642 - in /branches/S2_4/client: gui-gtk-2.0/mapview.c gui-gtk-3.0/mapview.c
Author: cazfi
Date: Sat Jul 19 15:50:16 2014
New Revision: 25642
URL: http://svn.gna.org/viewcvs/freeciv?rev=25642view=rev
Log:
Added tooltip to gtk-clients' turn timeout counter
Requested by Jacob Nevins jtn
See bug #21550
Modified:
branches/S2_4/client/gui-gtk-2.0/mapview.c
branches/S2_4/client/gui-gtk-3.0/mapview.c
Modified: branches/S2_4/client/gui-gtk-2.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-2.0/mapview.c?rev=25642r1=25641r2=25642view=diff
==
--- branches/S2_4/client/gui-gtk-2.0/mapview.c (original)
+++ branches/S2_4/client/gui-gtk-2.0/mapview.c Sat Jul 19 15:50:16 2014
@@ -32,6 +32,7 @@
#include timing.h
/* common */
+#include game.h
#include government.h/* government_graphic() */
#include map.h
#include player.h
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout 0) {
+gtk_widget_set_tooltip_text(timeout_label, _(Time to forced turn
change));
+ } else {
+gtk_widget_set_tooltip_text(timeout_label, _(Turn timeout disabled));
+ }
}
/**
Modified: branches/S2_4/client/gui-gtk-3.0/mapview.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_4/client/gui-gtk-3.0/mapview.c?rev=25642r1=25641r2=25642view=diff
==
--- branches/S2_4/client/gui-gtk-3.0/mapview.c (original)
+++ branches/S2_4/client/gui-gtk-3.0/mapview.c Sat Jul 19 15:50:16 2014
@@ -32,6 +32,7 @@
#include timing.h
/* common */
+#include game.h
#include government.h/* government_graphic() */
#include map.h
#include player.h
@@ -97,6 +98,12 @@
void update_timeout_label(void)
{
gtk_label_set_text(GTK_LABEL(timeout_label), get_timeout_label_text());
+
+ if (game.info.timeout 0) {
+gtk_widget_set_tooltip_text(timeout_label, _(Time to forced turn
change));
+ } else {
+gtk_widget_set_tooltip_text(timeout_label, _(Turn timeout disabled));
+ }
}
/**
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25644 - /branches/S2_5/m4/mapimg-magickwand.m4
Author: cazfi Date: Sat Jul 19 15:59:22 2014 New Revision: 25644 URL: http://svn.gna.org/viewcvs/freeciv?rev=25644view=rev Log: Filter out -fopenmp from MAPIMG_WAND_CFLAGS to avoid clang warning about argument unused during compilation. See bug #21493 Modified: branches/S2_5/m4/mapimg-magickwand.m4 Modified: branches/S2_5/m4/mapimg-magickwand.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/mapimg-magickwand.m4?rev=25644r1=25643r2=25644view=diff == --- branches/S2_5/m4/mapimg-magickwand.m4 (original) +++ branches/S2_5/m4/mapimg-magickwand.m4 Sat Jul 19 15:59:22 2014 @@ -10,6 +10,8 @@ [ MAPIMG_WAND_CFLAGS=$WAND_CFLAGS MAPIMG_WAND_LIBS=$WAND_LIBS + + MAPIMG_WAND_CFLAGS=$(echo $MAPIMG_WAND_CFLAGS | $SED -e 's/\-fopenmp//g') AC_SUBST(MAPIMG_WAND_CFLAGS) AC_SUBST(MAPIMG_WAND_LIBS) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25645 - /trunk/ai/threaded/taicity.c
Author: cazfi
Date: Sat Jul 19 16:22:25 2014
New Revision: 25645
URL: http://svn.gna.org/viewcvs/freeciv?rev=25645view=rev
Log:
When main thread receives worker task for a city from player thread, make
sure that the player in question still owns the city before adding task there.
See bug #22344
Modified:
trunk/ai/threaded/taicity.c
Modified: trunk/ai/threaded/taicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/ai/threaded/taicity.c?rev=25645r1=25644r2=25645view=diff
==
--- trunk/ai/threaded/taicity.c (original)
+++ trunk/ai/threaded/taicity.c Sat Jul 19 16:22:25 2014
@@ -266,8 +266,8 @@
pcity = game_city_by_number(data-city_id);
- if (pcity != NULL) {
-/* City has not disappeared meanwhile */
+ if (pcity != NULL city_owner(pcity) == req-plr) {
+/* City has not been lost meanwhile */
log_debug(%s storing req for act %d at (%d,%d),
pcity-name, data-task.act, TILE_XY(data-task.ptile));
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25646 - /branches/S2_5/ai/threaded/taicity.c
Author: cazfi
Date: Sat Jul 19 16:22:31 2014
New Revision: 25646
URL: http://svn.gna.org/viewcvs/freeciv?rev=25646view=rev
Log:
When main thread receives worker task for a city from player thread, make
sure that the player in question still owns the city before adding task there.
See bug #22344
Modified:
branches/S2_5/ai/threaded/taicity.c
Modified: branches/S2_5/ai/threaded/taicity.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/ai/threaded/taicity.c?rev=25646r1=25645r2=25646view=diff
==
--- branches/S2_5/ai/threaded/taicity.c (original)
+++ branches/S2_5/ai/threaded/taicity.c Sat Jul 19 16:22:31 2014
@@ -202,8 +202,8 @@
pcity = game_city_by_number(data-city_id);
- if (pcity != NULL) {
-/* City has not disappeared meanwhile */
+ if (pcity != NULL city_owner(pcity) == req-plr) {
+/* City has not been lost meanwhile */
log_debug(%s storing req for act %d at (%d,%d),
pcity-name, data-task.act, TILE_XY(data-task.ptile));
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25647 - /branches/S2_4/po/fr.po
Author: igx31 Date: Sat Jul 19 16:31:29 2014 New Revision: 25647 URL: http://svn.gna.org/viewcvs/freeciv?rev=25647view=rev Log: - Updated following latest developments Modified: branches/S2_4/po/fr.po Modified: branches/S2_4/po/fr.po URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/po/fr.po?rev=25647r1=25646r2=25647view=diff == --- branches/S2_4/po/fr.po (original) +++ branches/S2_4/po/fr.po Sat Jul 19 16:31:29 2014 @@ -15,8 +15,8 @@ msgstr Project-Id-Version: Freeciv 2.4\n Report-Msgid-Bugs-To: \n -POT-Creation-Date: 2014-07-15 10:57+0200\n -PO-Revision-Date: 2014-07-15 11:13+0200\n +POT-Creation-Date: 2014-07-19 16:25+0200\n +PO-Revision-Date: 2014-07-19 16:29+0200\n Last-Translator: Igx igx31 hotmail.com\n Language-Team: French freeciv-l10n...@yahoogroupes.fr\n Language: fr\n @@ -2150,7 +2150,7 @@ #: client/gui-sdl/diplomat_dialog.c:1402 client/gui-sdl/repodlgs.c:188 #: client/gui-xaw/citydlg.c:1949 client/gui-xaw/diplomat_dialog.c:115 #: client/gui-xaw/diplomat_dialog.c:661 client/gui-xaw/repodlgs.c:1010 -#: client/text.c:1235 common/unit.c:1892 +#: client/text.c:1235 common/unit.c:1879 #, c-format msgid Treasury contains %d gold. msgid_plural Treasury contains %d gold. @@ -3912,12 +3912,20 @@ msgid What should we call our new city? msgstr Comment doit s'appeler la nouvelle ville? -#: client/gui-gtk-2.0/mapview.c:176 client/gui-gtk-3.0/mapview.c:173 +#: client/gui-gtk-2.0/mapview.c:103 client/gui-gtk-3.0/mapview.c:103 +msgid Time to forced turn change +msgstr Délai avant un changement de tour forcé + +#: client/gui-gtk-2.0/mapview.c:105 client/gui-gtk-3.0/mapview.c:105 +msgid Turn timeout disabled +msgstr Limite de temps des tours désactivée + +#: client/gui-gtk-2.0/mapview.c:183 client/gui-gtk-3.0/mapview.c:180 msgid Shows your current luxury/science/tax rates; click to toggle them. msgstr Montre vos taux actuels de luxe/recherche/taxes ; cliquez pour les modifier. -#: client/gui-gtk-2.0/mapview.c:679 +#: client/gui-gtk-2.0/mapview.c:686 msgid Better fog will only work in truecolor. Disabling it msgstr Le brouillard de guerre amélioré ne fonctionne qu'en couleur vraie. Désactivé @@ -12278,12 +12286,12 @@ msgstr Passe une des options qui suivent à l'interface utilisateur. #. TRANS: year label (Anno Domini) -#: common/game.h:580 data/civ1/game.ruleset:166 data/civ2/game.ruleset:160 +#: common/game.h:577 data/civ1/game.ruleset:166 data/civ2/game.ruleset:160 msgid AD msgstr après JC #. TRANS: year label (Before Christ) -#: common/game.h:582 data/civ1/game.ruleset:168 data/civ2/game.ruleset:162 +#: common/game.h:579 data/civ1/game.ruleset:168 data/civ2/game.ruleset:162 msgid BC msgstr avant JC @@ -12948,16 +12956,16 @@ msgid Base msgstr Base -#: common/unit.c:1329 common/unit.c:1335 +#: common/unit.c:1316 common/unit.c:1322 msgid Moves msgstr Mouvements -#: common/unit.c:1402 +#: common/unit.c:1389 msgid Food/Shield/Gold: msgstr Nourriture/Production/Or : #. TRANS: Last %s is pre-pluralised Treasury contains %d gold. -#: common/unit.c:1902 +#: common/unit.c:1889 #, c-format msgid Upgrade %s to %s for %d gold?\n @@ -12972,13 +12980,13 @@ Mettre à jour %s en %s pour %d lingots ?\n %s -#: common/unit.c:1911 +#: common/unit.c:1898 #, c-format msgid Sorry, cannot upgrade %s (yet). msgstr Désolé, impossible de déjà mettre %s à jour. #. TRANS: Last %s is pre-pluralised Treasury contains %d gold. -#: common/unit.c:1917 +#: common/unit.c:1904 #, c-format msgid Upgrading %s to %s costs %d gold.\n @@ -12993,16 +13001,16 @@ Mettre à jour %s en %s coûte %d lingots.\n %s -#: common/unit.c:1927 +#: common/unit.c:1914 msgid You can only upgrade units in your cities. msgstr Vous ne pouvez mettre à jour les unités que dans vos villes. -#: common/unit.c:1931 +#: common/unit.c:1918 #, c-format msgid Upgrading this %s would strand units it transports. msgstr Mettre à jour %s laisserait en plan les unités transportées. -#: common/unit.c:1936 +#: common/unit.c:1923 #, c-format msgid Upgrading this %s would result in a %s which can not survive at this place. @@ -43425,7 +43433,7 @@ msgstr aifill réduit parce qu'il n'y a pas assez de nations jouables. #. TRANS: Minor error message. -#: server/savegame2.c:301 server/savegame.c:190 +#: server/savegame2.c:301 server/savegame.c:192 msgid Saved game contains incomplete map data. This can happen with old saved games, or it may indicate an invalid saved game file. Proceed at your own @@ -43435,37 +43443,37 @@ peut arriver avec de vieilles parties sauvegardées, ou bien peut indiquer un fichier de sauvegarde invalide. Continuez à vos risques et périls. -#: server/savegame2.c:3113 server/savegame.c:5349 server/srv_main.c:1906 +#: server/savegame2.c:3113 server/savegame.c:5361 server/srv_main.c:1906 #: server/srv_main.c:1911 #, c-format msgid %s has been added
[Freeciv-commits] r25649 - /trunk/m4/c11.m4
Author: cazfi
Date: Sat Jul 19 18:01:15 2014
New Revision: 25649
URL: http://svn.gna.org/viewcvs/freeciv?rev=25649view=rev
Log:
Fixed C11 _Static_assert configure check not to always end up with positive
result.
See bug #22362
Modified:
trunk/m4/c11.m4
Modified: trunk/m4/c11.m4
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/m4/c11.m4?rev=25649r1=25648r2=25649view=diff
==
--- trunk/m4/c11.m4 (original)
+++ trunk/m4/c11.m4 Sat Jul 19 18:01:15 2014
@@ -5,7 +5,7 @@
AC_DEFUN([FC_C11_STATIC_ASSERT],
[
AC_CACHE_CHECK([for C11 static assert], [ac_cv_c11_static_assert],
-[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include assert.h
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include assert.h
]], [[ _Static_assert(1, 1 is not true); ]])],
[ac_cv_c11_static_assert=yes], [ac_cv_c11_static_assert=no])])
if test x${ac_cv_c11_static_assert} = xyes ; then
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25650 - /trunk/tools/ruledit/
Author: cazfi
Date: Sat Jul 19 19:36:02 2014
New Revision: 25650
URL: http://svn.gna.org/viewcvs/freeciv?rev=25650view=rev
Log:
Added functionality to set nationlist in freeciv-ruledit
See patch #4955
Added:
trunk/tools/ruledit/tab_nation.cpp
trunk/tools/ruledit/tab_nation.h
Modified:
trunk/tools/ruledit/Makefile.am
trunk/tools/ruledit/ruledit_qt.cpp
trunk/tools/ruledit/ruledit_qt.h
trunk/tools/ruledit/rulesave.c
trunk/tools/ruledit/rulesave.h
trunk/tools/ruledit/tab_misc.cpp
trunk/tools/ruledit/tab_misc.h
Modified: trunk/tools/ruledit/Makefile.am
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/Makefile.am?rev=25650r1=25649r2=25650view=diff
==
--- trunk/tools/ruledit/Makefile.am (original)
+++ trunk/tools/ruledit/Makefile.am Sat Jul 19 19:36:02 2014
@@ -16,11 +16,14 @@
MOC_FILES = meta_ruledit_qt.cpp \
meta_tab_misc.cpp \
+meta_tab_nation.cpp\
meta_tab_tech.cpp
freeciv_ruledit_SOURCES = \
tab_misc.cpp\
tab_misc.h \
+ tab_nation.cpp \
+ tab_nation.h\
tab_tech.cpp \
tab_tech.h \
ruledit.cpp \
Modified: trunk/tools/ruledit/ruledit_qt.cpp
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit_qt.cpp?rev=25650r1=25649r2=25650view=diff
==
--- trunk/tools/ruledit/ruledit_qt.cpp (original)
+++ trunk/tools/ruledit/ruledit_qt.cpp Sat Jul 19 19:36:02 2014
@@ -37,6 +37,7 @@
// ruledit
#include tab_misc.h
+#include tab_nation.h
#include tab_tech.h
#include ruledit.h
@@ -109,6 +110,9 @@
QWidget *edit_widget = new QWidget();
QPushButton *ruleset_accept;
QLabel *rs_label;
+
+ data.nationlist = NULL;
+ data.nationlist_saved = NULL;
app = qapp;
central = central_in;
@@ -135,6 +139,8 @@
stack-addTab(misc, R__(Misc));
tech = new tab_tech(this);
stack-addTab(tech, R__(Tech));
+ nation = new tab_nation(this);
+ stack-addTab(nation, R__(Nations));
edit_layout-addWidget(stack);
@@ -179,7 +185,16 @@
log_debug(Roads:%d, game.control.num_road_types);
display_msg(R__(Ruleset loaded));
+
+/* Make freeable copy */
+if (game.server.ruledit.nationlist != NULL) {
+ data.nationlist = fc_strdup(game.server.ruledit.nationlist);
+} else {
+ data.nationlist = NULL;
+}
+
misc-refresh();
+nation-refresh();
tech-refresh();
main_layout-setCurrentIndex(1);
} else {
@@ -212,3 +227,11 @@
{
msg_dspl-setText(msg);
}
+
+/**
+ Flush information from widgets to stores where it can be saved from.
+**/
+void ruledit_gui::flush_widgets()
+{
+ nation-flush_widgets();
+}
Modified: trunk/tools/ruledit/ruledit_qt.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/ruledit_qt.h?rev=25650r1=25649r2=25650view=diff
==
--- trunk/tools/ruledit/ruledit_qt.h(original)
+++ trunk/tools/ruledit/ruledit_qt.hSat Jul 19 19:36:02 2014
@@ -20,21 +20,28 @@
#include QLabel
#include QTabWidget
+// ruledit
+#include rulesave.h
+
class QLineEdit;
class QStackedLayout;
class tab_misc;
class tab_tech;
+class tab_nation;
class ruledit_gui : public QObject
{
Q_OBJECT
public:
- void setup(QApplication *qapp, QWidget *central_in);
+void setup(QApplication *qapp, QWidget *central_in);
void display_msg(const char *msg);
int run();
void close();
+void flush_widgets();
+
+struct rule_data data;
private:
QApplication *app;
@@ -46,6 +53,7 @@
tab_misc *misc;
tab_tech *tech;
+tab_nation *nation;
private slots:
void launch_now();
Modified: trunk/tools/ruledit/rulesave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/tools/ruledit/rulesave.c?rev=25650r1=25649r2=25650view=diff
==
--- trunk/tools/ruledit/rulesave.c (original)
+++ trunk/tools/ruledit/rulesave.c Sat Jul 19 19:36:02 2014
@@ -1020,7 +1020,8 @@
/**
Save nations.ruleset
**/
-static bool save_nations_ruleset(const char *filename, const char *name)
+static bool save_nations_ruleset(const char *filename, const char *name,
+ struct rule_data *data)
{
struct section_file *sfile = create_ruleset_file(name, nation);
@@ -1028,8 +1029,8 @@
return FALSE;
}
- if (game.server.ruledit.nationlist != NULL) {
-
