Index: src/game/game.h
===================================================================
--- src/game/game.h	(Revision 10006)
+++ src/game/game.h	(Arbeitskopie)
@@ -157,7 +157,7 @@
 	int (IMPORT *TestLine) (vec3_t start, vec3_t stop);
 	float (IMPORT *GrenadeTarget) (vec3_t from, vec3_t at, float speed, qboolean launched, qboolean rolled, vec3_t v0);

-	void (IMPORT *MoveCalc) (struct routing_s * map, pos3_t from, int size, int distance, byte ** fb_list, int fb_length);
+	void (IMPORT *MoveCalc) (struct routing_s * map, pos3_t from, int size, int distance, byte ** fb_list, int fb_length, int size);
 	void (IMPORT *MoveStore) (struct routing_s * map);
 	int (IMPORT *MoveLength) (struct routing_s * map, pos3_t to, qboolean stored);
 	int (IMPORT *MoveNext) (struct routing_s * map, pos3_t from);
Index: src/client/cl_menu.c
===================================================================
--- src/client/cl_menu.c	(Revision 10006)
+++ src/client/cl_menu.c	(Arbeitskopie)
@@ -2079,6 +2079,7 @@
 	const char* oldFont = NULL;
 	char *cur, *tab, *end;
 	int x1, y1; /* variable x and y position */
+	const int scrollbarWidth = 20;

 	Q_strncpyz(textCopy, text, MAX_MENUTEXTLEN);
 	cur = textCopy;
@@ -2135,7 +2136,7 @@
 			/*Com_Printf("tab - first part - node->textLines: %i \n", node->textLines);*/
 			if (node)
 				node->textLines++;
-			re.FontDrawString(font, node->align, x1, y1, x, y, width, height, node->texh[0], cur, node->height, node->textScroll, &node->textLines, qfalse);
+			re.FontDrawString(font, node->align, x1, y1, x, y, width - scrollbarWidth, height, node->texh[0], cur, node->height, node->textScroll, &node->textLines, qfalse);
 			if (node)
 				node->textLines--;
 			/* increase the x value as given via menu definition format string */
@@ -2150,7 +2151,7 @@

 		/*Com_Printf("until newline - node->textLines: %i\n", node->textLines);*/
 		/* the conditional expression at the end is a hack to draw "/n/n" as a blank line */
-		lineHeight = re.FontDrawString(font, node->align, x1, y1, x, y, width, height, node->texh[0], (*cur ? cur : " "), node->height, node->textScroll, &node->textLines, qtrue);
+		lineHeight = re.FontDrawString(font, node->align, x1, y1, x, y, width - scrollbarWidth, height, node->texh[0], (*cur ? cur : " "), node->height, node->textScroll, &node->textLines, qtrue);
 		if (lineHeight > 0)
 			y1 += lineHeight;

Index: src/client/cl_actor.c
===================================================================
--- src/client/cl_actor.c	(Revision 10006)
+++ src/client/cl_actor.c	(Arbeitskopie)
@@ -1969,7 +1969,7 @@
 		if (!(le->state & STATE_DEAD)
 		&& (le->type == ET_ACTOR || le->type == ET_UGV)) {
 			/* draw blocking cursor at le->pos */
-			Grid_PosToVec(&clMap,  le->pos, s);
+			Grid_PosToVec(&clMap, le->pos, s);
 			ptl = CL_ParticleSpawn("cross", 0, s, NULL, NULL);
 			ptl->rounds = 2;
 			ptl->roundsCnt = 2;