(svn r2465) Remove some unreachable code
authortron
Mon, 20 Jun 2005 20:09:46 +0000
changeset 1959 c2c3a9850c2e
parent 1958 0266bb01a1e6
child 1960 799f0ccb334c
(svn r2465) Remove some unreachable code
dedicated.c
depot.h
news_gui.c
vehicle.c
viewport.c
--- a/dedicated.c	Mon Jun 20 20:08:10 2005 +0000
+++ b/dedicated.c	Mon Jun 20 20:09:46 2005 +0000
@@ -312,8 +312,6 @@
 		}
 		CSleep(1);
 	}
-
-	return ML_QUIT;
 }
 
 
--- a/depot.h	Mon Jun 20 20:08:10 2005 +0000
+++ b/depot.h	Mon Jun 20 20:09:46 2005 +0000
@@ -73,13 +73,13 @@
 	{
 		case TRANSPORT_RAIL:
 			return IsTileType(tile, MP_RAILWAY) && (_map5[tile] & 0xFC) == 0xC0;
-			break;
+
 		case TRANSPORT_ROAD:
 			return IsTileType(tile, MP_STREET) && (_map5[tile] & 0xF0) == 0x20;
-			break;
+
 		case TRANSPORT_WATER:
 			return IsTileType(tile, MP_WATER) && (_map5[tile] & ~3) == 0x80;
-			break;
+
 		default:
 			assert(0);
 			return false;
--- a/news_gui.c	Mon Jun 20 20:08:10 2005 +0000
+++ b/news_gui.c	Mon Jun 20 20:09:46 2005 +0000
@@ -194,7 +194,6 @@
 		switch (e->message.msg) {
 			case WE_CREATE: w->message.msg = e->message.wparam; break;
 			case WE_DESTROY: w->message.msg = 0; break;
-			break;
 		}
 		break;
 
--- a/vehicle.c	Mon Jun 20 20:08:10 2005 +0000
+++ b/vehicle.c	Mon Jun 20 20:09:46 2005 +0000
@@ -1750,14 +1750,14 @@
 				return DiagdirToDiagTrackdir((v->direction >> 1) & 3);
 
 			return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.rail.track),v->direction);
-			break;
+
 		case VEH_Ship:
 			if (v->u.ship.state == 0x80)  /* Inside a depot? */
 				/* We'll assume the ship is facing outwards */
 				return DiagdirToDiagTrackdir(GetDepotDirection(v->tile, TRANSPORT_WATER)); /* Ship in depot */
 
 			return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.ship.state),v->direction);
-			break;
+
 		case VEH_Road:
 			if (v->u.road.state == 254) /* We'll assume the road vehicle is facing outwards */
 				return DiagdirToDiagTrackdir(GetDepotDirection(v->tile, TRANSPORT_ROAD)); /* Road vehicle in depot */
@@ -1766,7 +1766,7 @@
 				return DiagdirToDiagTrackdir(GetRoadStationDir(v->tile)); /* Road vehicle in a station */
 
 			return DiagdirToDiagTrackdir((v->direction >> 1) & 3);
-			break;
+
 		/* case VEH_Aircraft: case VEH_Special: case VEH_Disaster: */
 		default: return 0xFF;
 	}
--- a/viewport.c	Mon Jun 20 20:08:10 2005 +0000
+++ b/viewport.c	Mon Jun 20 20:09:46 2005 +0000
@@ -1996,25 +1996,21 @@
 		if (fxpy >= 20 && sxpy <= 12) { /*SwapSelection(); DoRailroadTrack(0); */return 3; }
 		if (fxmy < -3 && sxmy > 3) {/* DoRailroadTrack(0); */return 5; }
 		return 1;
-		break;
 
 	case 1:
 		if (fxmy > 3 && sxmy < -3) { /*SwapSelection(); DoRailroadTrack(0); */return 4; }
 		if (fxpy <= 12 && sxpy >= 20) { /*DoRailroadTrack(0); */return 2; }
 		return 1;
-		break;
 
 	case 2:
 		if (fxmy > 3 && sxmy < -3) { /*DoRailroadTrack(3);*/ return 4; }
 		if (fxpy >= 20 && sxpy <= 12) { /*SwapSelection(); DoRailroadTrack(0); */return 3; }
 		return 0;
-		break;
 
 	case 3:
 		if (fxmy < -3 && sxmy > 3) { /*SwapSelection(); DoRailroadTrack(3);*/ return 5; }
 		if (fxpy <= 12 && sxpy >= 20) { /*DoRailroadTrack(0); */return 2; }
 		return 0;
-		break;
 	}
 
 	return 0; // avoids compiler warnings