<URL: http://bugs.freeciv.org/Ticket/Display.html?id=39926 >
Hi peeps,
Didn't know you guys were paying that much attention (before I knew what
went on there there was already a fix for the first problem). ;)
Sending the diff file now I used to get the source of the 2.2 branch (yeah
I know .. have these urges! ;) ) to compile in BeOS. Have used svn diff in
ubuntu (after checking all compiles) to create the diff file. Maybe you
could have a look at it.
In regards to the compiler ... there is a 3.4 one but that isn't complete
and not all links to the correct places ... will take quit some work
(although it has been done) to get it setup right. The 2.95.3 one is at
this point still the safest way to go in BeOS.
Greetings and thnx for putting the previous fixes in.
Luc Schrijvers aka Begasus
[EMAIL PROTECTED]:~/freeciv2.2$ svn diff
Index: server/cityturn.c
===================================================================
--- server/cityturn.c (revision 14099)
+++ server/cityturn.c (working copy)
@@ -638,7 +638,7 @@
if (valid_improvement(choice.value.building)) {
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = choice.value.building
+ .value = {.building = choice.value.building}
};
change_build_target(pplayer, pcity, target, E_IMP_AUTO);
@@ -651,7 +651,7 @@
&& !building_has_effect(pimprove, EFT_CAPITAL_CITY)) {
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
change_build_target(pplayer, pcity, target, E_IMP_AUTO);
Index: server/savegame.c
===================================================================
--- server/savegame.c (revision 14099)
+++ server/savegame.c (working copy)
@@ -3001,6 +3001,7 @@
i = -1;
unit_list_iterate(plr->units, punit) {
i++;
+{
int activity;
secfile_insert_int(file, punit->id, "player%d.u%d.id", plrno, i);
@@ -3456,6 +3457,7 @@
#undef PART_ADJUST
#undef PART_SIZE
}
+}
/***************************************************************
Index: common/effects.c
===================================================================
--- common/effects.c (revision 14099)
+++ common/effects.c (working copy)
@@ -539,7 +539,7 @@
struct universal source = {
.kind = VUT_IMPROVEMENT,
/* just to bamboozle the annoying compiler warning */
- .value.building = improvement_by_number(improvement_number(pimprove))
+ .value = {.building = improvement_by_number(improvement_number(pimprove))}
};
struct effect_list *plist = get_req_source_effects(&source);
@@ -694,7 +694,7 @@
struct effect_list *plist;
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
/* A capitalization production is never redundant. */
@@ -1011,7 +1011,7 @@
struct impr_type *building = pcity->production.value.building;
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = building
+ .value = {.building = building}
};
struct effect_list *plist = get_req_source_effects(&source);
int power = 0;
Index: ai/aicity.c
===================================================================
--- ai/aicity.c (revision 14099)
+++ ai/aicity.c (working copy)
@@ -793,7 +793,7 @@
struct government *gov = government_of_player(pplayer);
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
const bool is_coinage = improvement_has_flag(pimprove, IF_GOLD);
Index: ai/aidata.c
===================================================================
--- ai/aidata.c (revision 14099)
+++ ai/aidata.c (working copy)
@@ -66,7 +66,7 @@
improvement_iterate(pimprove) {
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
ai->impr_calc[improvement_index(pimprove)] = AI_IMPR_ESTIMATE;
Index: client/helpdata.c
===================================================================
--- client/helpdata.c (revision 14099)
+++ client/helpdata.c (working copy)
@@ -657,7 +657,7 @@
{
struct universal source = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
assert(buf);
@@ -1084,7 +1084,7 @@
struct advance *vap = valid_advance_by_number(i);
struct universal source = {
.kind = VUT_ADVANCE,
- .value.advance = vap
+ .value = {.advance = vap}
};
assert(buf&&user_text);
@@ -1173,7 +1173,7 @@
{
struct universal source = {
.kind = VUT_TERRAIN,
- .value.terrain = pterrain
+ .value = {.terrain = pterrain}
};
buf[0] = '\0';
@@ -1229,7 +1229,7 @@
{
struct universal source = {
.kind = VUT_GOVERNMENT,
- .value.govern = gov
+ .value = {.govern = gov}
};
buf[0] = '\0';
Index: client/tilespec.c
===================================================================
--- client/tilespec.c (revision 14099)
+++ client/tilespec.c (working copy)
@@ -4226,6 +4226,7 @@
/* Unit drawing is disabled if the view options is turned off, but only
* if we're drawing on the mapview. */
+{
bool do_draw_unit = (punit && (draw_units || !ptile
|| (draw_focus_unit
&& unit_is_in_focus(punit))));
@@ -4495,6 +4496,7 @@
return sprs - save_sprs;
}
+}
/**********************************************************************
Set city tiles sprite values; should only happen after
Index: client/mapctrl_common.c
===================================================================
--- client/mapctrl_common.c (revision 14099)
+++ client/mapctrl_common.c (working copy)
@@ -60,7 +60,7 @@
/* The mapcanvas clipboard */
struct universal clipboard =
{ .kind = VUT_NONE,
- .value.building = NULL
+ .value = {.building = NULL}
};
/* Goto with drag and drop. */
Index: client/climisc.c
===================================================================
--- client/climisc.c (revision 14099)
+++ client/climisc.c (working copy)
@@ -460,7 +460,7 @@
{
struct universal target = {
.kind = VUT_UTYPE,
- .value.utype = punittype};
+ .value = {.utype = punittype}};
return cid_encode(target);
}
@@ -472,7 +472,7 @@
{
struct universal target = {
.kind = VUT_IMPROVEMENT,
- .value.building = pimprove
+ .value = {.building = pimprove}
};
return cid_encode(target);
[EMAIL PROTECTED]:~/freeciv2.2$
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev
