(svn r2626) static, const, misc.

main_gui.c

@@ -379,14 +379,14 @@ void ShowNetworkNeedCompanyPassword(void)
 
 #endif /* ENABLE_NETWORK */
 
-void ShowRenameSignWindow(SignStruct *ss)
+void ShowRenameSignWindow(const SignStruct *ss)
 {
 	_rename_id = ss->index;
 	_rename_what = 0;
 	ShowQueryString(ss->str, STR_280B_EDIT_SIGN_TEXT, 30, 180, 1, 0);
 }
 
-void ShowRenameWaypointWindow(Waypoint *wp)
+void ShowRenameWaypointWindow(const Waypoint *wp)
 {
 	int id = wp->index;
 

signs.h

@@ -58,6 +58,6 @@ void UpdateAllSignVirtCoords(void);
 void PlaceProc_Sign(TileIndex tile);
 
 /* misc.c */
-void ShowRenameSignWindow(SignStruct *ss);
+void ShowRenameSignWindow(const SignStruct *ss);
 
 #endif /* SIGNS_H */

vehicle.c

@@ -1214,7 +1214,7 @@ static void EffectVehicle_Tick(Vehicle *v)
 	_effect_tick_procs[v->subtype](v);
 }
 
-Vehicle *CheckClickOnVehicle(ViewPort *vp, int x, int y)
+Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y)
 {
 	Vehicle *found = NULL, *v;
 	uint dist, best_dist = (uint)-1;

vehicle.h

@@ -302,7 +302,7 @@ TileIndex GetVehicleOutOfTunnelTile(const Vehicle *v);
 bool UpdateSignalsOnSegment(TileIndex tile, byte direction);
 void SetSignalsOnBothDir(TileIndex tile, byte track);
 
-Vehicle *CheckClickOnVehicle(ViewPort *vp, int x, int y);
+Vehicle *CheckClickOnVehicle(const ViewPort *vp, int x, int y);
 //uint GetVehicleWeight(Vehicle *v);
 
 void DecreaseVehicleValue(Vehicle *v);

viewport.h

@@ -14,11 +14,10 @@ struct ViewPort {
 void SetSelectionRed(bool);
 
 /* viewport.c */
-Point MapXYZToViewport(ViewPort *vp, uint x, uint y, uint z);
 void AssignWindowViewport(Window *w, int x, int y,
 	int width, int height, uint32 follow_flags, byte zoom);
 void SetViewportPosition(Window *w, int x, int y);
-ViewPort *IsPtInWindowViewport(Window *w, int x, int y);
+ViewPort *IsPtInWindowViewport(const Window *w, int x, int y);
 Point GetTileBelowCursor(void);
 void ZoomInOrOutToCursorWindow(bool in, Window * w);
 Point GetTileZoomCenterWindow(bool in, Window * w);
@@ -36,7 +35,7 @@ void AddChildSpriteScreen(uint32 image, int x, int y);
 void StartSpriteCombine(void);
 void EndSpriteCombine(void);
 
-void HandleViewportClicked(ViewPort *vp, int x, int y);
+void HandleViewportClicked(const ViewPort *vp, int x, int y);
 void PlaceObject(void);
 void SetRedErrorSquare(TileIndex tile);
 void SetTileSelectSize(int w, int h);

waypoint.h

@@ -56,7 +56,7 @@ static inline bool IsRailWaypoint(byte m5)
 int32 RemoveTrainWaypoint(TileIndex tile, uint32 flags, bool justremove);
 Station *ComposeWaypointStation(TileIndex tile);
 Waypoint *GetWaypointByTile(TileIndex tile);
-void ShowRenameWaypointWindow(Waypoint *cp);
+void ShowRenameWaypointWindow(const Waypoint *cp);
 void DrawWaypointSprite(int x, int y, int image, int railtype);
 void UpdateWaypointSign(Waypoint *cp);
 void FixOldWaypoints(void);

window.h

@@ -399,7 +399,7 @@ typedef struct {
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(refit_d));
 
 typedef struct {
-	uint16 follow_vehicle;
+	VehicleID follow_vehicle;
 	int32 scrollpos_x;
 	int32 scrollpos_y;
 } vp_d;