Mercurial > hg > openttd

changeset 16837:0308286cd42f draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r21571) -Codechange: Having a break after a return is no good.
author alberth <alberth@openttd.org>
date Tue, 21 Dec 2010 15:23:54 +0000
parents 1a69ac226d4a
children 76c0be9d2cb7
files src/ai/api/ai_engine.cpp src/ai/api/ai_event_types.cpp src/ai/api/ai_order.cpp src/network/network_server.cpp src/os/windows/win32.cpp src/rail_gui.cpp
diffstat 6 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- 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();
 	}
--- a/src/ai/api/ai_event_types.cpp
+++ b/src/ai/api/ai_event_types.cpp
@@ -61,7 +61,6 @@
 		case VEH_SHIP:
 		case VEH_AIRCRAFT:
 			return e->GetDisplayDefaultCapacity();
-			break;
 
 		default: NOT_REACHED();
 	}
--- a/src/ai/api/ai_order.cpp
+++ b/src/ai/api/ai_order.cpp
@@ -33,7 +33,7 @@
 			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:
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -1270,7 +1270,6 @@
 		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;
 }
--- a/src/os/windows/win32.cpp
+++ b/src/os/windows/win32.cpp
@@ -718,7 +718,7 @@
 				_tcsncat(pszPath, _T("\\Fonts"), MAX_PATH);
 
 				return (HRESULT)0;
-				break;
+
 			/* XXX - other types to go here when needed... */
 		}
 	}
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -680,7 +680,7 @@
 				/* 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: