[Freeciv-commits] r25073 - /trunk/data/experimental/units.ruleset
Author: jtn Date: Sat Jun 7 11:43:08 2014 New Revision: 25073 URL: http://svn.gna.org/viewcvs/freeciv?rev=25073view=rev Log: Correct experimental Partisan description to reflect partisan appearance based on nationality. See gna bug #22141. Modified: trunk/data/experimental/units.ruleset Modified: trunk/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/experimental/units.ruleset?rev=25073r1=25072r2=25073view=diff == --- trunk/data/experimental/units.ruleset (original) +++ trunk/data/experimental/units.ruleset Sat Jun 7 11:43:08 2014 @@ -733,7 +733,7 @@ city -- they automatically assume defensive positions in the\ surrounding countryside -- but only under these conditions:\n\ - Guerilla Warfare must be known by at least one player.\n\ - - You must be the player who originally built the city.\n\ + - At least three quarters of the citizens must have your nationality.\n\ - You must know about Communism and Gunpowder.\n\ - You must run either a Democracy or a Communist government.\ ) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25074 - /trunk/server/unithand.c
Author: jtn Date: Sat Jun 7 11:43:10 2014 New Revision: 25074 URL: http://svn.gna.org/viewcvs/freeciv?rev=25074view=rev Log: Fix MR_CANNOT_DISEMBARK message to mention unloading in cities. See gna bug #22142. Modified: trunk/server/unithand.c Modified: trunk/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=25074r1=25073r2=25074view=diff == --- trunk/server/unithand.c (original) +++ trunk/server/unithand.c Sat Jun 7 11:43:10 2014 @@ -1458,11 +1458,11 @@ case MR_CANNOT_DISEMBARK: notify_player(unit_owner(punit), src_tile, E_BAD_COMMAND, ftc_server, - _(%s cannot disembark without a native base for -%s on the tile.), -unit_link(punit), -utype_name_translation( -unit_type(unit_transport_get(punit; + _(%s cannot disembark outside of a city or a native base +for %s.), + unit_link(punit), + utype_name_translation( + unit_type(unit_transport_get(punit; break; case MR_NON_NATIVE_MOVE: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25075 - in /trunk/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Jun 7 11:43:13 2014 New Revision: 25075 URL: http://svn.gna.org/viewcvs/freeciv?rev=25075view=rev Log: Improve ruleset comments for Unreachable/embarks/disembarks. See gna patch #4773. Modified: trunk/data/alien/units.ruleset trunk/data/civ1/units.ruleset trunk/data/civ2/units.ruleset trunk/data/civ2civ3/units.ruleset trunk/data/classic/units.ruleset trunk/data/experimental/units.ruleset trunk/data/multiplayer/units.ruleset Modified: trunk/data/alien/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/alien/units.ruleset?rev=25075r1=25074r2=25075view=diff == --- trunk/data/alien/units.ruleset (original) +++ trunk/data/alien/units.ruleset Sat Jun 7 11:43:13 2014 @@ -75,8 +75,11 @@ ; CanOccupyCity = Military units of this class can occupy enemy cities ; Missile= Unit is destroyed when it attacks ; BuildAnywhere = Unit can be built even in the middle of non-native terrain -; Unreachable= Unit can be attacked only by units with AttackAny flag or on -;city or airbase +; Unreachable= Unit can be attacked only by units explicitly listing this +;class in its 'targets', unless on a city or native base. +;For class members which are transports, cargo cannot load/ +;unload except in a city or native base, unless that unit +;explicitly lists this class in its 'embarks'/'disembarks'. ; CollectRansom = Unit can collect ransom when killing lone barbarian leader ; ZOC= Unit is subject to ZOC rules. Unit type flag IgZOC can ;override this @@ -187,10 +190,12 @@ ; city_size = Initial size of the cities Settlers type unit builds ; targets = list of unit classes this unit can attack against even ; if they have Unreachable unit class flag -; embarks = list of unit classes this unit may embark upon even if they -; have Unreachable unit class flag and are not in native base -; disembarks= list of unit classes this unit may disembark from even if they -; have Unreachable unit class flag and are not in native base +; embarks = list of unit classes this unit may load into while not in +; native base or city even if transporter has Unreachable unit +; class flag +; disembarks= list of unit classes this unit may unload from while not in +; native base or city even if transporter has Unreachable unit +; class flag ; bonuses = definitions of combat bonuses against specific other units ; bonuses.flag = flag of the unit that bonus applies against ; bonuses.type = type of the bonus. See below Modified: trunk/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/trunk/data/civ1/units.ruleset?rev=25075r1=25074r2=25075view=diff == --- trunk/data/civ1/units.ruleset (original) +++ trunk/data/civ1/units.ruleset Sat Jun 7 11:43:13 2014 @@ -84,8 +84,11 @@ ; CanOccupyCity = Military units of this class can occupy enemy cities ; Missile = Unit is destroyed when it attacks ; BuildAnywhere = Unit can be built even in the middle of non-native terrain -; Unreachable = Unit can be attacked only by units explicitly listing this class as target -; or on city or airbase +; Unreachable = Unit can be attacked only by units explicitly listing this +; class in its 'targets', unless on a city or native base. +; For class members which are transports, cargo cannot load/ +; unload except in a city or native base, unless that unit +; explicitly lists this class in its 'embarks'/'disembarks'. ; CollectRansom = Unit can collect ransom when killing lone barbarian leader ; ZOC = Unit is subject to ZOC rules. Unit type flag IgZOC can ; override this @@ -178,10 +181,12 @@ ; city_size = Initial size of the cities Settlers type unit builds ; targets = list of unit classes this unit can attack against even ; if they have Unreachable unit class flag -; embarks = list of unit classes this unit may embark upon even if they -; have Unreachable unit class flag and are not in native base -; disembarks= list of unit classes this unit may disembark from even if they -; have Unreachable unit class flag and are not in native base +; embarks = list of unit classes this unit may load into while not in +; native base or city even if transporter has Unreachable unit +; class flag +; disembarks= list of unit classes this unit may unload from while not in +; native
[Freeciv-commits] r25076 - in /branches/S2_5/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Jun 7 11:47:48 2014 New Revision: 25076 URL: http://svn.gna.org/viewcvs/freeciv?rev=25076view=rev Log: *Correctly* document limits on tech and terrain user flags. See gna bug #22118. Modified: branches/S2_5/data/alien/techs.ruleset branches/S2_5/data/alien/terrain.ruleset branches/S2_5/data/civ1/techs.ruleset branches/S2_5/data/civ1/terrain.ruleset branches/S2_5/data/civ2/techs.ruleset branches/S2_5/data/civ2/terrain.ruleset branches/S2_5/data/civ2civ3/techs.ruleset branches/S2_5/data/civ2civ3/terrain.ruleset branches/S2_5/data/classic/techs.ruleset branches/S2_5/data/classic/terrain.ruleset branches/S2_5/data/experimental/techs.ruleset branches/S2_5/data/experimental/terrain.ruleset branches/S2_5/data/multiplayer/techs.ruleset branches/S2_5/data/multiplayer/terrain.ruleset Modified: branches/S2_5/data/alien/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/techs.ruleset?rev=25076r1=25075r2=25076view=diff == --- branches/S2_5/data/alien/techs.ruleset (original) +++ branches/S2_5/data/alien/techs.ruleset Sat Jun 7 11:47:48 2014 @@ -5,7 +5,7 @@ options=+Freeciv-2.5-ruleset [control] -; Names for custom tech flags. There can be up to 7 of these. +; Names for custom tech flags. There can be up to 8 of these. ; name = rule name; not translateable, but may be displayed in ; some circumstances ; helptxt = displayed in the help for advances with this flag Modified: branches/S2_5/data/alien/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/terrain.ruleset?rev=25076r1=25075r2=25076view=diff == --- branches/S2_5/data/alien/terrain.ruleset(original) +++ branches/S2_5/data/alien/terrain.rulesetSat Jun 7 11:47:48 2014 @@ -5,7 +5,7 @@ options=+Freeciv-2.5-ruleset [control] -; Names for custom terrain flags. There can be up to 7 of these. +; Names for custom terrain flags. There can be up to 8 of these. ; name = rule name; not translateable, but may be displayed in ; some circumstances ; helptxt = displayed in the help for terrains with this flag Modified: branches/S2_5/data/civ1/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/techs.ruleset?rev=25076r1=25075r2=25076view=diff == --- branches/S2_5/data/civ1/techs.ruleset (original) +++ branches/S2_5/data/civ1/techs.ruleset Sat Jun 7 11:47:48 2014 @@ -12,7 +12,7 @@ options=+Freeciv-2.5-ruleset [control] -; Names for custom tech flags. There can be up to 7 of these. +; Names for custom tech flags. There can be up to 8 of these. ; name = rule name; not translateable, but may be displayed in ; some circumstances ; helptxt = displayed in the help for advances with this flag Modified: branches/S2_5/data/civ1/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/terrain.ruleset?rev=25076r1=25075r2=25076view=diff == --- branches/S2_5/data/civ1/terrain.ruleset (original) +++ branches/S2_5/data/civ1/terrain.ruleset Sat Jun 7 11:47:48 2014 @@ -15,7 +15,7 @@ options=+Freeciv-2.5-ruleset [control] -; Names for custom terrain flags. There can be up to 7 of these. +; Names for custom terrain flags. There can be up to 8 of these. ; name = rule name; not translateable, but may be displayed in ; some circumstances ; helptxt = displayed in the help for terrains with this flag Modified: branches/S2_5/data/civ2/techs.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/techs.ruleset?rev=25076r1=25075r2=25076view=diff == --- branches/S2_5/data/civ2/techs.ruleset (original) +++ branches/S2_5/data/civ2/techs.ruleset Sat Jun 7 11:47:48 2014 @@ -12,7 +12,7 @@ options=+Freeciv-2.5-ruleset [control] -; Names for custom tech flags. There can be up to 7 of these. +; Names for custom tech flags. There can be up to 8 of these. ; name = rule name; not translateable, but may be displayed in ; some circumstances ; helptxt = displayed in the help for advances with this flag Modified: branches/S2_5/data/civ2/terrain.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ2/terrain.ruleset?rev=25076r1=25075r2=25076view=diff == --- branches/S2_5/data/civ2/terrain.ruleset (original) +++ branches/S2_5/data/civ2/terrain.ruleset Sat Jun 7 11:47:48 2014 @@ -15,7 +15,7 @@
[Freeciv-commits] r25077 - /branches/S2_5/server/unittools.c
Author: jtn
Date: Sat Jun 7 11:47:52 2014
New Revision: 25077
URL: http://svn.gna.org/viewcvs/freeciv?rev=25077view=rev
Log:
Remove redundant check for existing mine while executing orders.
No functional effect.
See gna bug #22137.
Modified:
branches/S2_5/server/unittools.c
Modified: branches/S2_5/server/unittools.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/unittools.c?rev=25077r1=25076r2=25077view=diff
==
--- branches/S2_5/server/unittools.c(original)
+++ branches/S2_5/server/unittools.cSat Jun 7 11:47:52 2014
@@ -3818,9 +3818,7 @@
|| (ACTIVITY_IRRIGATE == activity
(tile_has_special(unit_tile(punit), S_FARMLAND)
|| tile_has_special(unit_tile(punit),
- S_IRRIGATION)))
- || (ACTIVITY_MINE == activity
-tile_has_special(unit_tile(punit), S_MINE))) {
+ S_IRRIGATION {
break; /* Already built, let's continue. */
}
}
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25078 - /branches/S2_5/data/experimental/units.ruleset
Author: jtn Date: Sat Jun 7 11:47:54 2014 New Revision: 25078 URL: http://svn.gna.org/viewcvs/freeciv?rev=25078view=rev Log: Correct experimental Partisan description to reflect partisan appearance based on nationality. See gna bug #22141. Modified: branches/S2_5/data/experimental/units.ruleset Modified: branches/S2_5/data/experimental/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/experimental/units.ruleset?rev=25078r1=25077r2=25078view=diff == --- branches/S2_5/data/experimental/units.ruleset (original) +++ branches/S2_5/data/experimental/units.ruleset Sat Jun 7 11:47:54 2014 @@ -730,7 +730,7 @@ city -- they automatically assume defensive positions in the\ surrounding countryside -- but only under these conditions:\n\ - Guerilla Warfare must be known by at least one player.\n\ - - You must be the player who originally built the city.\n\ + - At least three quarters of the citizens must have your nationality.\n\ - You must know about Communism and Gunpowder.\n\ - You must run either a Democracy or a Communist government.\ ) ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25080 - in /branches/S2_5/data: alien/ civ1/ civ2/ civ2civ3/ classic/ experimental/ multiplayer/
Author: jtn Date: Sat Jun 7 11:48:00 2014 New Revision: 25080 URL: http://svn.gna.org/viewcvs/freeciv?rev=25080view=rev Log: Improve ruleset comments for Unreachable/embarks/disembarks. See gna patch #4773. Modified: branches/S2_5/data/alien/units.ruleset branches/S2_5/data/civ1/units.ruleset branches/S2_5/data/civ2/units.ruleset branches/S2_5/data/civ2civ3/units.ruleset branches/S2_5/data/classic/units.ruleset branches/S2_5/data/experimental/units.ruleset branches/S2_5/data/multiplayer/units.ruleset Modified: branches/S2_5/data/alien/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/alien/units.ruleset?rev=25080r1=25079r2=25080view=diff == --- branches/S2_5/data/alien/units.ruleset (original) +++ branches/S2_5/data/alien/units.ruleset Sat Jun 7 11:48:00 2014 @@ -75,8 +75,11 @@ ; CanOccupyCity = Military units of this class can occupy enemy cities ; Missile= Unit is destroyed when it attacks ; BuildAnywhere = Unit can be built even in the middle of non-native terrain -; Unreachable= Unit can be attacked only by units with AttackAny flag or on -;city or airbase +; Unreachable= Unit can be attacked only by units explicitly listing this +;class in its 'targets', unless on a city or native base. +;For class members which are transports, cargo cannot load/ +;unload except in a city or native base, unless that unit +;explicitly lists this class in its 'embarks'/'disembarks'. ; CollectRansom = Unit can collect ransom when killing lone barbarian leader ; ZOC= Unit is subject to ZOC rules. Unit type flag IgZOC can ;override this @@ -186,10 +189,12 @@ ; city_size = Initial size of the cities Settlers type unit builds ; targets = list of unit classes this unit can attack against even ; if they have Unreachable unit class flag -; embarks = list of unit classes this unit may embark upon even if they -; have Unreachable unit class flag and are not in native base -; disembarks= list of unit classes this unit may disembark from even if they -; have Unreachable unit class flag and are not in native base +; embarks = list of unit classes this unit may load into while not in +; native base or city even if transporter has Unreachable unit +; class flag +; disembarks= list of unit classes this unit may unload from while not in +; native base or city even if transporter has Unreachable unit +; class flag ; bonuses = definitions of combat bonuses against specific other units ; bonuses.flag = flag of the unit that bonus applies against ; bonuses.type = type of the bonus. See below Modified: branches/S2_5/data/civ1/units.ruleset URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/data/civ1/units.ruleset?rev=25080r1=25079r2=25080view=diff == --- branches/S2_5/data/civ1/units.ruleset (original) +++ branches/S2_5/data/civ1/units.ruleset Sat Jun 7 11:48:00 2014 @@ -84,8 +84,11 @@ ; CanOccupyCity = Military units of this class can occupy enemy cities ; Missile = Unit is destroyed when it attacks ; BuildAnywhere = Unit can be built even in the middle of non-native terrain -; Unreachable = Unit can be attacked only by units explicitly listing this class as target -; or on city or airbase +; Unreachable = Unit can be attacked only by units explicitly listing this +; class in its 'targets', unless on a city or native base. +; For class members which are transports, cargo cannot load/ +; unload except in a city or native base, unless that unit +; explicitly lists this class in its 'embarks'/'disembarks'. ; CollectRansom = Unit can collect ransom when killing lone barbarian leader ; ZOC = Unit is subject to ZOC rules. Unit type flag IgZOC can ; override this @@ -177,10 +180,12 @@ ; city_size = Initial size of the cities Settlers type unit builds ; targets = list of unit classes this unit can attack against even ; if they have Unreachable unit class flag -; embarks = list of unit classes this unit may embark upon even if they -; have Unreachable unit class flag and are not in native base -; disembarks= list of unit classes this unit may disembark from even if they -; have Unreachable unit class flag and are not in native base +; embarks = list of unit classes this unit may load into while not in +; native base or city even if transporter has Unreachable unit +;
[Freeciv-commits] r25079 - /branches/S2_5/server/unithand.c
Author: jtn Date: Sat Jun 7 11:47:57 2014 New Revision: 25079 URL: http://svn.gna.org/viewcvs/freeciv?rev=25079view=rev Log: Fix MR_CANNOT_DISEMBARK message to mention unloading in cities. See gna bug #22142. Modified: branches/S2_5/server/unithand.c Modified: branches/S2_5/server/unithand.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/unithand.c?rev=25079r1=25078r2=25079view=diff == --- branches/S2_5/server/unithand.c (original) +++ branches/S2_5/server/unithand.c Sat Jun 7 11:47:57 2014 @@ -1347,11 +1347,11 @@ case MR_CANNOT_DISEMBARK: notify_player(unit_owner(punit), src_tile, E_BAD_COMMAND, ftc_server, - _(%s cannot disembark without a native base for -%s on the tile.), -unit_link(punit), -utype_name_translation( -unit_type(unit_transport_get(punit; + _(%s cannot disembark outside of a city or a native base +for %s.), + unit_link(punit), + utype_name_translation( + unit_type(unit_transport_get(punit; break; default: ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25081 - /trunk/server/savegame2.c
Author: cazfi
Date: Sat Jun 7 14:25:34 2014
New Revision: 25081
URL: http://svn.gna.org/viewcvs/freeciv?rev=25081view=rev
Log:
Cleaned out ACTIVITY_FORTRESS/ACTIVITY_AIRBASE handling from savegame2.c.
See patch #4763
Modified:
trunk/server/savegame2.c
Modified: trunk/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=25081r1=25080r2=25081view=diff
==
--- trunk/server/savegame2.c(original)
+++ trunk/server/savegame2.cSat Jun 7 14:25:34 2014
@@ -864,8 +864,6 @@
return 'i';
case ACTIVITY_FORTIFIED:
return 'f';
- case ACTIVITY_FORTRESS:
-return 't';
case ACTIVITY_SENTRY:
return 's';
case ACTIVITY_OLD_RAILROAD:
@@ -878,8 +876,6 @@
return 'x';
case ACTIVITY_TRANSFORM:
return 'o';
- case ACTIVITY_AIRBASE:
-return 'a';
case ACTIVITY_FORTIFYING:
return 'y';
case ACTIVITY_FALLOUT:
@@ -894,6 +890,8 @@
case ACTIVITY_PATROL_UNUSED:
return '?';
case ACTIVITY_LAST:
+ case ACTIVITY_FORTRESS:
+ case ACTIVITY_AIRBASE:
break;
}
@@ -4940,14 +4938,6 @@
proad = road_by_compat_special(ROCO_RAILROAD);
}
-if (activity == ACTIVITY_FORTRESS) {
- activity = ACTIVITY_BASE;
- pbase = get_base_by_gui_type(BASE_GUI_FORTRESS, punit, unit_tile(punit));
-} else if (activity == ACTIVITY_AIRBASE) {
- activity = ACTIVITY_BASE;
- pbase = get_base_by_gui_type(BASE_GUI_AIRBASE, punit, unit_tile(punit));
-}
-
if (activity == ACTIVITY_OLD_ROAD) {
activity = ACTIVITY_GEN_ROAD;
proad = road_by_compat_special(ROCO_ROAD);
___
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25084 - /branches/S2_4/utility/md5.c
Author: cazfi Date: Sat Jun 7 23:10:13 2014 New Revision: 25084 URL: http://svn.gna.org/viewcvs/freeciv?rev=25084view=rev Log: Dropped the special optimized version of md5 code for some platforms where alignment would cause no problems. This fixes clang warning about how that optimized version would be unportable to other platforms. Reported by David Lowe doctorjlowe See bug #18872 Modified: branches/S2_4/utility/md5.c Modified: branches/S2_4/utility/md5.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_4/utility/md5.c?rev=25084r1=25083r2=25084view=diff == --- branches/S2_4/utility/md5.c (original) +++ branches/S2_4/utility/md5.c Sat Jun 7 23:10:13 2014 @@ -100,17 +100,7 @@ /* * SET reads 4 input bytes in little-endian byte order and stores them * in a properly aligned word in host byte order. - * - * The check for little-endian architectures that tolerate unaligned - * memory accesses is just an optimization. Nothing will break if it - * doesn't work. - */ -#if defined(__i386__) || defined(__x86_64__) || defined(__vax__) -#define SET(n) \ -(*(MD5_u32plus *)ptr[(n) * 4]) -#define GET(n) \ -SET(n) -#else + */ #define SET(n) \ (ctx-block[(n)] = \ (MD5_u32plus)ptr[(n) * 4] | \ @@ -119,7 +109,6 @@ ((MD5_u32plus)ptr[(n) * 4 + 3] 24)) #define GET(n) \ (ctx-block[(n)]) -#endif /* * This processes one or more 64-byte data blocks, but does NOT update ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25082 - /trunk/utility/md5.c
Author: cazfi Date: Sat Jun 7 23:09:59 2014 New Revision: 25082 URL: http://svn.gna.org/viewcvs/freeciv?rev=25082view=rev Log: Dropped the special optimized version of md5 code for some platforms where alignment would cause no problems. This fixes clang warning about how that optimized version would be unportable to other platforms. Reported by David Lowe doctorjlowe See bug #18872 Modified: trunk/utility/md5.c Modified: trunk/utility/md5.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/md5.c?rev=25082r1=25081r2=25082view=diff == --- trunk/utility/md5.c (original) +++ trunk/utility/md5.c Sat Jun 7 23:09:59 2014 @@ -103,17 +103,7 @@ /* * SET reads 4 input bytes in little-endian byte order and stores them * in a properly aligned word in host byte order. - * - * The check for little-endian architectures that tolerate unaligned - * memory accesses is just an optimization. Nothing will break if it - * doesn't work. - */ -#if defined(__i386__) || defined(__x86_64__) || defined(__vax__) -#define SET(n) \ -(*(MD5_u32plus *)ptr[(n) * 4]) -#define GET(n) \ -SET(n) -#else + */ #define SET(n) \ (ctx-block[(n)] = \ (MD5_u32plus)ptr[(n) * 4] | \ @@ -122,7 +112,6 @@ ((MD5_u32plus)ptr[(n) * 4 + 3] 24)) #define GET(n) \ (ctx-block[(n)]) -#endif /* * This processes one or more 64-byte data blocks, but does NOT update ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
[Freeciv-commits] r25085 - /trunk/server/savegame2.c
Author: cazfi Date: Sun Jun 8 03:23:46 2014 New Revision: 25085 URL: http://svn.gna.org/viewcvs/freeciv?rev=25085view=rev Log: Reverted part of patch #4763 causing assert failures. Reported by Jacob Nevins jtn See patch #4763 Modified: trunk/server/savegame2.c Modified: trunk/server/savegame2.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=25085r1=25084r2=25085view=diff == --- trunk/server/savegame2.c(original) +++ trunk/server/savegame2.cSun Jun 8 03:23:46 2014 @@ -864,6 +864,8 @@ return 'i'; case ACTIVITY_FORTIFIED: return 'f'; + case ACTIVITY_FORTRESS: +return 't'; case ACTIVITY_SENTRY: return 's'; case ACTIVITY_OLD_RAILROAD: @@ -876,6 +878,8 @@ return 'x'; case ACTIVITY_TRANSFORM: return 'o'; + case ACTIVITY_AIRBASE: +return 'a'; case ACTIVITY_FORTIFYING: return 'y'; case ACTIVITY_FALLOUT: @@ -890,8 +894,6 @@ case ACTIVITY_PATROL_UNUSED: return '?'; case ACTIVITY_LAST: - case ACTIVITY_FORTRESS: - case ACTIVITY_AIRBASE: break; } ___ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits
