summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbelugas <belugas@openttd.org>2008-02-14 03:10:22 +0000
committerbelugas <belugas@openttd.org>2008-02-14 03:10:22 +0000
commit539c635efdafa91683839d1439953d6fdf514eb9 (patch)
treea64cb6f66b1fa1206c299ebfcc9b24258738bcc2
parent81b3652f371b59a80828f61c22deb08a6a1baf81 (diff)
downloadopenttd-539c635efdafa91683839d1439953d6fdf514eb9.tar.xz
(svn r12136) -Fix(r12135): Code style compliance and... code style as such
-rw-r--r--src/bridge_gui.cpp2
-rw-r--r--src/gui.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index d1baacdf0..b18582e9b 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -147,7 +147,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
{
DeleteWindowById(WC_BUILD_BRIDGE, 0);
- _bridgedata.type = ((transport_type << 7) | bridge_type) << 8; //prepare the parameter for use only once
+ _bridgedata.type = (transport_type << 15) | (bridge_type << 8); //prepare the parameter for use only once
_bridgedata.start_tile = start;
_bridgedata.end_tile = end;
diff --git a/src/gui.h b/src/gui.h
index b361409f3..ab93aec7a 100644
--- a/src/gui.h
+++ b/src/gui.h
@@ -106,7 +106,7 @@ void SetFiosType(const byte fiostype);
extern const TextColour _fios_colors[];
/* bridge_gui.cpp */
-void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType Transport_type, byte type);
+void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transport_type, byte bridge_type);
void ShowBuildIndustryWindow();
void ShowMusicWindow();