Author: cazfi
Date: Sat Jun 7 14:25:34 2014
New Revision: 25081
URL: http://svn.gna.org/viewcvs/freeciv?rev=25081&view=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=25081&r1=25080&r2=25081&view=diff
==============================================================================
--- trunk/server/savegame2.c (original)
+++ trunk/server/savegame2.c Sat 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
