--- a/bridge_cmd.c	Tue Jan 02 09:54:03 2007 +0000
+++ b/bridge_cmd.c	Tue Jan 02 10:07:27 2007 +0000
@@ -642,7 +642,7 @@
 		image, ti->x, ti->y, 16, 16, ti->tileh == SLOPE_FLAT ? 1 : 8, ti->z
 	);
 
-	if (HasSignals(ti->tile)) DrawSignals(ti->tile, GetTrackBits(ti->tile));
+	if (IsTileType(ti->tile, MP_RAILWAY_BRIDGE) && HasSignals(ti->tile)) DrawSignals(ti->tile, GetTrackBits(ti->tile));
 
 	DrawBridgeMiddle(ti);
 }

--- a/misc_gui.c	Tue Jan 02 09:54:03 2007 +0000
+++ b/misc_gui.c	Tue Jan 02 10:07:27 2007 +0000
@@ -1181,9 +1181,9 @@
 
 
 typedef struct query_d {
+	void (*proc)(Window*, bool); ///< callback function executed on closing of popup. Window* points to parent, bool is true if 'yes' clicked, false otherwise
 	StringID message;            ///< message shown for query window
 	uint32 params[20];           ///< local copy of _decode_parameters
-	void (*proc)(Window*, bool); ///< callback function executed on closing of popup. Window* points to parent, bool is true if 'yes' clicked, false otherwise
 	bool calledback;             ///< has callback been executed already (internal usage for WE_DESTROY event)
 } query_d;
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(query_d));