- movement-fixes

src/common/attributes/attributes.c

@@ -30,6 +30,7 @@
 #include "racename.h"
 #include "raceprefix.h"
 #include "synonym.h"
+#include "at_movement.h"
 #ifdef USE_UGROUPS
 #  include "ugroup.h"
 #endif
@@ -62,6 +63,7 @@ init_attributes(void)
 	init_otherfaction();
 	init_racename();
 	init_synonym();
+	init_movement();
 
 	init_moved();
 #ifdef AT_OPTION

src/common/kernel/save.c

@@ -727,11 +727,11 @@ void
 read_alliances(FILE * F)
 {
 	char pbuf[32];
-	rns(F, pbuf, sizeof(pbuf));
+	rs(F, pbuf);
 	while (strcmp(pbuf, "end")!=0) {
 		rs(F, buf);
 		makealliance(atoi36(pbuf), buf);
-		rns(F, pbuf, sizeof(pbuf));
+		rs(F, pbuf);
 	}
 }
 #endif
@@ -818,7 +818,7 @@ readgame(boolean backup)
 
 	/* Read factions */
 #ifdef ALLIANCES
-	if (global.data_version>ALLIANCES_VERSION) {
+	if (global.data_version>=ALLIANCES_VERSION) {
 		read_alliances(F);
 	}
 #endif

src/mapper/map_units.c

@@ -34,6 +34,8 @@
 #include <unit.h>
 #include <base36.h>
 
+#include <attributes/at_movement.h>
+
 /* libc includes */
 #include <ctype.h>
 #include <stdlib.h>
@@ -51,7 +53,7 @@ SpecialFunctionUnit(unit *u)
 
 	win = openwin(60, 5, "< Specials Units >");
 	wmove(win, 1, 2);
-	wAddstr("B - give balloon");
+	wAddstr("B - give balloon, M - set noMovement");
 	wmove(win, 2, 2);
 	wrefresh(win);
 	switch(getch()) {
@@ -70,6 +72,10 @@ SpecialFunctionUnit(unit *u)
 			fset(u, FL_OWNER);
 		}
 		break;
+	case 'm':
+	case 'M':
+		set_movement(&u->attribs, MV_CANNOTMOVE);
+		break;
 	}
 	delwin(win);
 }
@@ -871,6 +877,10 @@ mapper_spunit(dbllist ** SP, unit * u, int indent)
 			break;
 	}
 
+	if(get_movement(&u->attribs, MV_CANNOTMOVE)) {
+		sncat(buf, ", cannot move", BUFSIZE);
+	}
+
 	sncat(buf, " (", BUFSIZE); icat(u->hp/u->number); sncat(buf, " HP)", BUFSIZE);
 
 	if (getguard(u))