mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r2465) Remove some unreachable code

This commit is contained in:
tron 2005-06-20 20:09:46 +00:00
parent 0be5b38286
commit c887ff331a
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dedicated.c
View File

@ -312,8 +312,6 @@ static int DedicatedVideoMainLoop(void)
} }
CSleep(1); CSleep(1);
} }
return ML_QUIT;
} }

6
depot.h
View File

@ -73,13 +73,13 @@ static inline bool IsTileDepotType(TileIndex tile, TransportType type)
{ {
case TRANSPORT_RAIL: case TRANSPORT_RAIL:
return IsTileType(tile, MP_RAILWAY) && (_map5[tile] & 0xFC) == 0xC0; return IsTileType(tile, MP_RAILWAY) && (_map5[tile] & 0xFC) == 0xC0;
break;
case TRANSPORT_ROAD: case TRANSPORT_ROAD:
return IsTileType(tile, MP_STREET) && (_map5[tile] & 0xF0) == 0x20; return IsTileType(tile, MP_STREET) && (_map5[tile] & 0xF0) == 0x20;
break;
case TRANSPORT_WATER: case TRANSPORT_WATER:
return IsTileType(tile, MP_WATER) && (_map5[tile] & ~3) == 0x80; return IsTileType(tile, MP_WATER) && (_map5[tile] & ~3) == 0x80;
break;
default: default:
assert(0); assert(0);
return false; return false;

1
news_gui.c
View File

@ -194,7 +194,6 @@ static void NewsWindowProc(Window *w, WindowEvent *e)
switch (e->message.msg) { switch (e->message.msg) {
case WE_CREATE: w->message.msg = e->message.wparam; break; case WE_CREATE: w->message.msg = e->message.wparam; break;
case WE_DESTROY: w->message.msg = 0; break; case WE_DESTROY: w->message.msg = 0; break;
break;
} }
break; break;

6
vehicle.c
View File

@ -1750,14 +1750,14 @@ Trackdir GetVehicleTrackdir(const Vehicle* v)
return DiagdirToDiagTrackdir((v->direction >> 1) & 3); return DiagdirToDiagTrackdir((v->direction >> 1) & 3);
return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.rail.track),v->direction); return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.rail.track),v->direction);
break;
case VEH_Ship: case VEH_Ship:
if (v->u.ship.state == 0x80) /* Inside a depot? */ if (v->u.ship.state == 0x80) /* Inside a depot? */
/* We'll assume the ship is facing outwards */ /* We'll assume the ship is facing outwards */
return DiagdirToDiagTrackdir(GetDepotDirection(v->tile, TRANSPORT_WATER)); /* Ship in depot */ return DiagdirToDiagTrackdir(GetDepotDirection(v->tile, TRANSPORT_WATER)); /* Ship in depot */
return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.ship.state),v->direction); return TrackDirectionToTrackdir(FIND_FIRST_BIT(v->u.ship.state),v->direction);
break;
case VEH_Road: case VEH_Road:
if (v->u.road.state == 254) /* We'll assume the road vehicle is facing outwards */ 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 */ return DiagdirToDiagTrackdir(GetDepotDirection(v->tile, TRANSPORT_ROAD)); /* Road vehicle in depot */
@ -1766,7 +1766,7 @@ Trackdir GetVehicleTrackdir(const Vehicle* v)
return DiagdirToDiagTrackdir(GetRoadStationDir(v->tile)); /* Road vehicle in a station */ return DiagdirToDiagTrackdir(GetRoadStationDir(v->tile)); /* Road vehicle in a station */
return DiagdirToDiagTrackdir((v->direction >> 1) & 3); return DiagdirToDiagTrackdir((v->direction >> 1) & 3);
break;
/* case VEH_Aircraft: case VEH_Special: case VEH_Disaster: */ /* case VEH_Aircraft: case VEH_Special: case VEH_Disaster: */
default: return 0xFF; default: return 0xFF;
} }

4
viewport.c
View File

@ -1996,25 +1996,21 @@ static byte Check2x1AutoRail(int mode)
if (fxpy >= 20 && sxpy <= 12) { /*SwapSelection(); DoRailroadTrack(0); */return 3; } if (fxpy >= 20 && sxpy <= 12) { /*SwapSelection(); DoRailroadTrack(0); */return 3; }
if (fxmy < -3 && sxmy > 3) {/* DoRailroadTrack(0); */return 5; } if (fxmy < -3 && sxmy > 3) {/* DoRailroadTrack(0); */return 5; }
return 1; return 1;
break;
case 1: case 1:
if (fxmy > 3 && sxmy < -3) { /*SwapSelection(); DoRailroadTrack(0); */return 4; } if (fxmy > 3 && sxmy < -3) { /*SwapSelection(); DoRailroadTrack(0); */return 4; }
if (fxpy <= 12 && sxpy >= 20) { /*DoRailroadTrack(0); */return 2; } if (fxpy <= 12 && sxpy >= 20) { /*DoRailroadTrack(0); */return 2; }
return 1; return 1;
break;
case 2: case 2:
if (fxmy > 3 && sxmy < -3) { /*DoRailroadTrack(3);*/ return 4; } if (fxmy > 3 && sxmy < -3) { /*DoRailroadTrack(3);*/ return 4; }
if (fxpy >= 20 && sxpy <= 12) { /*SwapSelection(); DoRailroadTrack(0); */return 3; } if (fxpy >= 20 && sxpy <= 12) { /*SwapSelection(); DoRailroadTrack(0); */return 3; }
return 0; return 0;
break;
case 3: case 3:
if (fxmy < -3 && sxmy > 3) { /*SwapSelection(); DoRailroadTrack(3);*/ return 5; } if (fxmy < -3 && sxmy > 3) { /*SwapSelection(); DoRailroadTrack(3);*/ return 5; }
if (fxpy <= 12 && sxpy >= 20) { /*DoRailroadTrack(0); */return 2; } if (fxpy <= 12 && sxpy >= 20) { /*DoRailroadTrack(0); */return 2; }
return 0; return 0;
break;
} }
return 0; // avoids compiler warnings return 0; // avoids compiler warnings