--- a/ai/default/default.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/ai/default/default.c	Tue Nov 15 09:00:02 2005 +0000
@@ -1852,7 +1852,7 @@
 	return false;
 }
 
-static bool AiDoFollowTrack(Player *p)
+static bool AiDoFollowTrack(const Player* p)
 {
 	AiRailPathFindData arpfd;
 
@@ -3194,7 +3194,7 @@
 	loco_id = _new_roadveh_id;
 
 	for (i = 0; p->ai.order_list_blocks[i] != 0xFF; i++) {
-		AiBuildRec* aib = &p->ai.src + p->ai.order_list_blocks[i];
+		const AiBuildRec* aib = &p->ai.src + p->ai.order_list_blocks[i];
 		bool is_pass = (
 			p->ai.cargo_type == CT_PASSENGERS ||
 			p->ai.cargo_type == CT_MAIL ||

--- a/main_gui.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/main_gui.c	Tue Nov 15 09:00:02 2005 +0000
@@ -2413,7 +2413,7 @@
 		const byte* b = GetNonSprite(0x307 + i);
 
 		assert(b);
-		_color_list[i] = *(ColorList*)(b + 0xC6);
+		_color_list[i] = *(const ColorList*)(b + 0xC6);
 	}
 
 	width = _screen.width;

--- a/openttd.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/openttd.c	Tue Nov 15 09:00:02 2005 +0000
@@ -1020,11 +1020,11 @@
 
 void BeforeSaveGame(void)
 {
-	Window *w = FindWindowById(WC_MAIN_WINDOW, 0);
+	const Window* w = FindWindowById(WC_MAIN_WINDOW, 0);
 
 	if (w != NULL) {
-		_saved_scrollpos_x = WP(w,vp_d).scrollpos_x;
-		_saved_scrollpos_y = WP(w,vp_d).scrollpos_y;
+		_saved_scrollpos_x = WP(w, const vp_d).scrollpos_x;
+		_saved_scrollpos_y = WP(w, const vp_d).scrollpos_y;
 		_saved_scrollpos_zoom = w->viewport->zoom;
 	}
 }

--- a/order_gui.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/order_gui.c	Tue Nov 15 09:00:02 2005 +0000
@@ -472,7 +472,7 @@
 	}
 
 	case WE_RCLICK: {
-		Vehicle* v = GetVehicle(w->window_number);
+		const Vehicle* v = GetVehicle(w->window_number);
 		int s = OrderGetSel(w);
 
 		if (e->click.widget != 8) break;

--- a/settings_gui.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/settings_gui.c	Tue Nov 15 09:00:02 2005 +0000
@@ -1277,7 +1277,7 @@
 
 	{ // little helper function to calculate _grffile_count
 	  // should be REMOVED once _grffile_count is calculated at loading
-		GRFFile *c = _first_grffile;
+		const GRFFile* c = _first_grffile;
 
 		_grffile_count = 0;
 		while (c != NULL) {

--- a/station_cmd.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/station_cmd.c	Tue Nov 15 09:00:02 2005 +0000
@@ -151,9 +151,9 @@
 
 /* Calculate the radius of the station. Basicly it is the biggest
     radius that is available within the station */
-static byte FindCatchmentRadius(Station *st)
+static uint FindCatchmentRadius(const Station* st)
 {
-	byte ret = 0;
+	uint ret = 0;
 
 	if (st->bus_stops != NULL)   ret = max(ret, CA_BUS);
 	if (st->truck_stops != NULL) ret = max(ret, CA_TRUCK);

--- a/strings.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/strings.c	Tue Nov 15 09:00:02 2005 +0000
@@ -613,7 +613,7 @@
 			}
 
 			case 13: { // {G 0 Der Die Das}
-				byte *s = (byte*)GetStringPtr(argv_orig[(byte)*str++]); // contains the string that determines gender.
+				const byte* s = (const byte*)GetStringPtr(argv_orig[(byte)*str++]); // contains the string that determines gender.
 				int len;
 				int gender = 0;
 				if (s != NULL && s[0] == 0x87) gender = s[1];

--- a/window.c	Tue Nov 15 08:49:46 2005 +0000
+++ b/window.c	Tue Nov 15 09:00:02 2005 +0000
@@ -1548,7 +1548,7 @@
 
 void InvalidateWindow(byte cls, WindowNumber number)
 {
-	Window *w;
+	const Window* w;
 
 	for (w = _windows; w != _last_window; w++) {
 		if (w->window_class == cls && w->window_number == number) SetWindowDirty(w);