diff options
| author | alberth <alberth@openttd.org> | 2010-12-21 15:23:54 +0000 |
|---|---|---|
| committer | alberth <alberth@openttd.org> | 2010-12-21 15:23:54 +0000 |
| commit | b633ffaa1d58a8ad0f0e9aa34982877c8cf552a2 (patch) | |
| tree | 134c9a17f2148602117ae73920f7987844082a7b | |
| parent | 884b44990a7effe740e705a0183d28f38bfa2b9d (diff) | |
| download | openttd-b633ffaa1d58a8ad0f0e9aa34982877c8cf552a2.tar.xz | |
(svn r21571) -Codechange: Having a break after a return is no good.
| -rw-r--r-- | src/ai/api/ai_engine.cpp | 1 | ||||
| -rw-r--r-- | src/ai/api/ai_event_types.cpp | 1 | ||||
| -rw-r--r-- | src/ai/api/ai_order.cpp | 2 | ||||
| -rw-r--r-- | src/network/network_server.cpp | 1 | ||||
| -rw-r--r-- | src/os/windows/win32.cpp | 2 | ||||
| -rw-r--r-- | src/rail_gui.cpp | 2 |
6 files changed, 3 insertions, 6 deletions
diff --git a/src/ai/api/ai_engine.cpp b/src/ai/api/ai_engine.cpp index 7710360e8..f024c9331 100644 --- a/src/ai/api/ai_engine.cpp +++ b/src/ai/api/ai_engine.cpp @@ -100,7 +100,6 @@ case VEH_SHIP: case VEH_AIRCRAFT: return e->GetDisplayDefaultCapacity(); - break; default: NOT_REACHED(); } diff --git a/src/ai/api/ai_event_types.cpp b/src/ai/api/ai_event_types.cpp index b61e07605..ee7e9491e 100644 --- a/src/ai/api/ai_event_types.cpp +++ b/src/ai/api/ai_event_types.cpp @@ -61,7 +61,6 @@ int32 AIEventEnginePreview::GetCapacity() case VEH_SHIP: case VEH_AIRCRAFT: return e->GetDisplayDefaultCapacity(); - break; default: NOT_REACHED(); } diff --git a/src/ai/api/ai_order.cpp b/src/ai/api/ai_order.cpp index 02d6a701b..0412334a6 100644 --- a/src/ai/api/ai_order.cpp +++ b/src/ai/api/ai_order.cpp @@ -33,7 +33,7 @@ static OrderType GetOrderTypeByTile(TileIndex t) if (IsBuoy(t) || IsRailWaypoint(t)) return OT_GOTO_WAYPOINT; if (IsHangar(t)) return OT_GOTO_DEPOT; return OT_GOTO_STATION; - break; + case MP_WATER: if (::IsShipDepot(t)) return OT_GOTO_DEPOT; break; case MP_ROAD: if (::GetRoadTileType(t) == ROAD_TILE_DEPOT) return OT_GOTO_DEPOT; break; case MP_RAILWAY: diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 791d766d7..7526d50fc 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1270,7 +1270,6 @@ DEF_GAME_RECEIVE_COMMAND(Server, PACKET_CLIENT_CHAT) default: IConsolePrintF(CC_ERROR, "WARNING: invalid chat action from client %d (IP: %s).", ci->client_id, GetClientIP(ci)); return this->SendError(NETWORK_ERROR_NOT_EXPECTED); - break; } return NETWORK_RECV_STATUS_OKAY; } diff --git a/src/os/windows/win32.cpp b/src/os/windows/win32.cpp index 021ce60a1..f3ea1b0c1 100644 --- a/src/os/windows/win32.cpp +++ b/src/os/windows/win32.cpp @@ -718,7 +718,7 @@ HRESULT OTTDSHGetFolderPath(HWND hwnd, int csidl, HANDLE hToken, DWORD dwFlags, _tcsncat(pszPath, _T("\\Fonts"), MAX_PATH); return (HRESULT)0; - break; + /* XXX - other types to go here when needed... */ } } diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp index 82c2ce84d..3cedda98a 100644 --- a/src/rail_gui.cpp +++ b/src/rail_gui.cpp @@ -680,7 +680,7 @@ struct BuildRailToolbarWindow : Window { /* If it is the removal button that has been clicked, do nothing, * as it is up to the other buttons to drive removal status */ return; - break; + case RTW_BUILD_NS: case RTW_BUILD_X: case RTW_BUILD_EW: |