~ubuntu-branches/debian/squeeze/openttd/squeeze

« back to all changes in this revision

Viewing changes to src/rail_cmd.cpp

Committer: Bazaar Package Importer
Author(s): Matthijs Kooijman
Date: 2008-08-08 11:07:05 UTC
mfrom: (1.1.4 upstream) (2.1.1 lenny)
Revision ID: james.westby@ubuntu.com-20080808110705-zq0eo95c4pexg70i

http://bugs.debian.org/493714

* New upstream release.
- Fixes remote crash vulnerability CVE-2008-3547. Closes: #493714

files removed:
bin/data/generictrams_v0.4.grf

files modified:
changelog.txt

config.lib

debian/README.Debian

debian/changelog

debian/config

debian/control

debian/rules

docs/openttd.6

known-bugs.txt

os/debian/changelog

os/win32/installer/install.nsi

projects/determineversion.vbs

readme.txt

src/ai/ai.cpp

src/aircraft_cmd.cpp

src/articulated_vehicles.cpp

src/autoreplace_cmd.cpp

src/blitter/factory.hpp

src/bridge.h

src/command_type.h

src/console_cmds.cpp

src/depot_gui.cpp

src/economy.cpp

src/economy_type.h

src/elrail.cpp

src/engine_gui.cpp

src/fileio.cpp

src/fileio.h

src/fios.cpp

src/fios.h

src/fontcache.cpp

src/genworld_gui.cpp

src/gfx.cpp

src/gfx_type.h

src/industry_cmd.cpp

src/landscape.cpp

src/lang/brazilian_portuguese.txt

src/lang/bulgarian.txt

src/lang/catalan.txt

src/lang/croatian.txt

src/lang/czech.txt

src/lang/danish.txt

src/lang/dutch.txt

src/lang/english.txt

src/lang/estonian.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/galician.txt

src/lang/icelandic.txt

src/lang/italian.txt

src/lang/korean.txt

src/lang/piglatin.txt

src/lang/portuguese.txt

src/lang/romanian.txt

src/lang/russian.txt

src/lang/simplified_chinese.txt

src/lang/slovak.txt

src/lang/slovenian.txt

src/lang/spanish.txt

src/lang/swedish.txt

src/lang/traditional_chinese.txt

src/lang/turkish.txt

src/lang/ukrainian.txt

src/misc_cmd.cpp

src/misc_gui.cpp

src/mixer.cpp

src/network/core/config.h

src/network/network.cpp

src/network/network_client.cpp

src/network/network_server.cpp

src/network/network_udp.cpp

src/newgrf.cpp

src/newgrf_cargo.cpp

src/newgrf_config.h

src/newgrf_engine.cpp

src/newgrf_house.cpp

src/newgrf_industries.cpp

src/newgrf_station.cpp

src/oldloader.cpp

src/openttd.cpp

src/order_gui.cpp

src/ottdres.rc.in

src/player_gui.cpp

src/player_type.h

src/players.cpp

src/rail_cmd.cpp

src/rev.cpp.in

src/road_cmd.cpp

src/roadveh_cmd.cpp

src/roadveh_gui.cpp

src/saveload.cpp

src/settings.cpp

src/ship_cmd.cpp

src/signal.cpp

src/slope_func.h

src/spritecache.cpp

src/spriteloader/png.cpp

src/terraform_gui.cpp

src/town_cmd.cpp

src/train.h

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

src/vehicle.cpp

src/vehicle_func.h

src/vehicle_gui.cpp

src/win32.cpp

Show diffs side-by-side

added added

removed removed

src/rail_cmd.cpp

/* $Id: rail_cmd.cpp 12864 2008-04-24 11:48:09Z rubidium $ */

/* $Id: rail_cmd.cpp 13687 2008-07-09 19:15:43Z rubidium $ */

/** @file rail_cmd.cpp */

1107

1108

if (!ValParamTrackOrientation(track) ||

1109

!IsTileType(tile, MP_RAILWAY) ||

1110

!HasTrack(tile, track) ||

1110

1111

!EnsureNoTrainOnTrack(tile, track) ||

1111

1112

!HasSignalOnTrack(tile, track)) {

1112

1113

return CMD_ERROR;

1376

1377

cost.AddCost(ret);

1377

1378

}

1378

1379

if (water_ground) {

1380

/* when bankrupting, don't make water dirty, there could be a ship on lower halftile */

1381

if (water_ground && !(flags & DC_BANKRUPT)) {

1382

if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;

1383

1380

1384

/* The track was removed, and left a coast tile. Now also clear the water. */

1381

1385

if (flags & DC_EXEC) DoClearSquare(tile);

1382

1386

cost.AddCost(_price.clear_water);

2098

2102

2099

2103

static TrackStatus GetTileTrackStatus_Track(TileIndex tile, TransportType mode, uint sub_mode, DiagDirection side)

2100

2104

{

2105

/* Case of half tile slope with water. */

2106

if (mode == TRANSPORT_WATER && IsPlainRailTile(tile) && GetRailGroundType(tile) == RAIL_GROUND_WATER) {

2107

TrackBits tb = GetTrackBits(tile);

2108

switch (tb) {

2109

default: NOT_REACHED();

2110

case TRACK_BIT_UPPER: tb = TRACK_BIT_LOWER; break;

2111

case TRACK_BIT_LOWER: tb = TRACK_BIT_UPPER; break;

2112

case TRACK_BIT_LEFT: tb = TRACK_BIT_RIGHT; break;

2113

case TRACK_BIT_RIGHT: tb = TRACK_BIT_LEFT; break;

2114

}

2115

return CombineTrackStatus(TrackBitsToTrackdirBits(tb), TRACKDIR_BIT_NONE);

2116

}

2117

2101

2118

if (mode != TRANSPORT_RAIL) return 0;

2102

2119

2103

2120

TrackBits trackbits = TRACK_BIT_NONE;

Older »