← Back to branch summary

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

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

« back to all changes in this revision

Viewing changes to src/vehicle.cpp

Committer: Bazaar Package Importer
Author(s): Matthijs Kooijman, Matthijs Kooijman
Date: 2009-10-01 22:52:59 UTC
mfrom: (1.1.8 upstream) (2.1.6 squeeze)
Revision ID: james.westby@ubuntu.com-20091001225259-5kpkp4sthbszpyif

http://bugs.debian.org/547758

[ Matthijs Kooijman ]
* New upstream release
* Use printf instead of echo -en in openttd-wrapper to make it POSIX
compatible (Closes: #547758).
* Remove three patches that are now included in upstream.

files added:
debian/README.source

debian/lintian-overrides

debian/openttd-wrapper

debian/patches

debian/patches/00list

debian/patches/03-run-openttd-wrapper.dpatch

src/ai/api/ai_changelog.hpp

src/ai/api/ai_info_docs.hpp

src/economy_base.h

src/lang/serbian.txt

files removed:
os/win32/installer/notice.ini

src/lang/unfinished/serbian.txt

files modified:
Makefile.msvc

Makefile.src.in

bin/ai/regression/regression.nut

bin/ai/regression/regression.txt

bin/data/opntitle.dat

bin/data/orig_win.obg

changelog.txt

config.lib

configure

debian/changelog

debian/control

debian/copyright

debian/menu

debian/rules

docs/HOWTO_compile_lang_files.txt

docs/obg_format.txt

known-bugs.txt

media/openttd.desktop.in

os/debian/changelog

os/rpm/openttd.spec

os/win32/installer/install.nsi

projects/determineversion.vbs

projects/generate

projects/generate.vbs

projects/langs_vs80.vcproj

projects/langs_vs90.vcproj

projects/openttd_vs80.vcproj

projects/openttd_vs80.vcproj.in

projects/openttd_vs90.vcproj

projects/openttd_vs90.vcproj.in

readme.txt

source.list

src/3rdparty/squirrel/include/squirrel.h

src/3rdparty/squirrel/squirrel/sqapi.cpp

src/3rdparty/squirrel/squirrel/sqclass.h

src/3rdparty/squirrel/squirrel/sqcompiler.cpp

src/3rdparty/squirrel/squirrel/squtils.h

src/3rdparty/squirrel/squirrel/sqvm.cpp

src/3rdparty/squirrel/squirrel/sqvm.h

src/ai/ai_gui.cpp

src/ai/ai_instance.cpp

src/ai/ai_instance.hpp

src/ai/ai_scanner.cpp

src/ai/api/ai_abstractlist.cpp

src/ai/api/ai_abstractlist.hpp

src/ai/api/ai_abstractlist.hpp.sq

src/ai/api/ai_airport.cpp

src/ai/api/ai_airport.hpp

src/ai/api/ai_airport.hpp.sq

src/ai/api/ai_bridge.cpp

src/ai/api/ai_company.cpp

src/ai/api/ai_company.hpp

src/ai/api/ai_company.hpp.sq

src/ai/api/ai_controller.cpp

src/ai/api/ai_depotlist.cpp

src/ai/api/ai_engine.cpp

src/ai/api/ai_engine.hpp

src/ai/api/ai_engine.hpp.sq

src/ai/api/ai_execmode.cpp

src/ai/api/ai_gamesettings.hpp.sq

src/ai/api/ai_group.hpp.sq

src/ai/api/ai_industry.cpp

src/ai/api/ai_industry.hpp

src/ai/api/ai_industry.hpp.sq

src/ai/api/ai_log.hpp.sq

src/ai/api/ai_map.hpp

src/ai/api/ai_map.hpp.sq

src/ai/api/ai_marine.cpp

src/ai/api/ai_object.cpp

src/ai/api/ai_object.hpp

src/ai/api/ai_order.hpp

src/ai/api/ai_rail.cpp

src/ai/api/ai_road.cpp

src/ai/api/ai_road.hpp

src/ai/api/ai_sign.hpp.sq

src/ai/api/ai_station.cpp

src/ai/api/ai_station.hpp

src/ai/api/ai_station.hpp.sq

src/ai/api/ai_testmode.cpp

src/ai/api/ai_tile.cpp

src/ai/api/ai_tile.hpp

src/ai/api/ai_tilelist.hpp.sq

src/ai/api/ai_town.cpp

src/ai/api/ai_town.hpp

src/ai/api/ai_town.hpp.sq

src/ai/api/ai_vehicle.cpp

src/ai/api/ai_vehicle.hpp

src/ai/api/ai_vehicle.hpp.sq

src/ai/api/ai_waypoint.hpp.sq

src/ai/api/squirrel_export.awk

src/ai/api/squirrel_export.sh

src/aircraft_cmd.cpp

src/autoreplace_cmd.cpp

src/cargopacket.cpp

src/cargopacket.h

src/clear_cmd.cpp

src/command.cpp

src/company_cmd.cpp

src/company_gui.cpp

src/console_cmds.cpp

src/debug.h

src/depot.cpp

src/depot_gui.cpp

src/disaster_cmd.cpp

src/driver.cpp

src/dummy_land.cpp

src/economy.cpp

src/economy_func.h

src/economy_type.h

src/elrail.cpp

src/engine.cpp

src/fileio.cpp

src/fontcache.cpp

src/genworld.cpp

src/genworld.h

src/gfxinit.cpp

src/graph_gui.cpp

src/industry_cmd.cpp

src/industry_gui.cpp

src/landscape.cpp

src/lang/afrikaans.txt

src/lang/arabic_egypt.txt

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/english_US.txt

src/lang/esperanto.txt

src/lang/estonian.txt

src/lang/finnish.txt

src/lang/french.txt

src/lang/galician.txt

src/lang/german.txt

src/lang/hebrew.txt

src/lang/hungarian.txt

src/lang/icelandic.txt

src/lang/indonesian.txt

src/lang/italian.txt

src/lang/japanese.txt

src/lang/korean.txt

src/lang/latvian.txt

src/lang/lithuanian.txt

src/lang/luxembourgish.txt

src/lang/norwegian_bokmal.txt

src/lang/norwegian_nynorsk.txt

src/lang/piglatin.txt

src/lang/polish.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/lang/unfinished/greek.txt

src/lang/unfinished/macedonian.txt

src/lang/unfinished/malay.txt

src/lang/unfinished/persian.txt

src/lang/welsh.txt

src/misc.cpp

src/misc/blob.hpp

src/misc_gui.cpp

src/mixer.cpp

src/music/allegro_m.cpp

src/network/core/tcp_content.cpp

src/network/network.cpp

src/network/network_chat_gui.cpp

src/network/network_content.cpp

src/network/network_content_gui.cpp

src/network/network_func.h

src/network/network_gamelist.cpp

src/network/network_gui.cpp

src/network/network_udp.cpp

src/newgrf.cpp

src/newgrf_config.cpp

src/newgrf_engine.cpp

src/newgrf_gui.cpp

src/newgrf_house.cpp

src/newgrf_industrytiles.cpp

src/openttd.cpp

src/openttd.h

src/order_base.h

src/order_cmd.cpp

src/ottdres.rc.in

src/pathfind.cpp

src/pbs.cpp

src/rail_cmd.cpp

src/rail_gui.cpp

src/rail_map.h

src/rev.cpp.in

src/road_cmd.cpp

src/road_map.cpp

src/road_map.h

src/roadveh_cmd.cpp

src/saveload/afterload.cpp

src/saveload/ai_sl.cpp

src/saveload/cargopacket_sl.cpp

src/saveload/economy_sl.cpp

src/saveload/oldloader_sl.cpp

src/saveload/saveload.cpp

src/saveload/town_sl.cpp

src/saveload/waypoint_sl.cpp

src/script/squirrel.cpp

src/script/squirrel.hpp

src/script/squirrel_helper.hpp

src/settings.cpp

src/settings_gui.cpp

src/ship_cmd.cpp

src/sound/allegro_s.cpp

src/sound/cocoa_s.cpp

src/sound/sdl_s.cpp

src/sound/win32_s.cpp

src/station_cmd.cpp

src/station_gui.cpp

src/strgen/strgen.cpp

src/strings.cpp

src/strings_type.h

src/tile_cmd.h

src/town_cmd.cpp

src/train_cmd.cpp

src/train_gui.cpp

src/tree_cmd.cpp

src/tunnelbridge_cmd.cpp

src/unix.cpp

src/unmovable_cmd.cpp

src/vehicle.cpp

src/vehicle_base.h

src/vehicle_cmd.cpp

src/vehicle_gui.cpp

src/video/allegro_v.cpp

src/video/null_v.h

src/video/sdl_v.cpp

src/water_cmd.cpp

src/yapf/follow_track.hpp

src/yapf/yapf.h

src/yapf/yapf_costrail.hpp

src/yapf/yapf_node_rail.hpp

src/yapf/yapf_road.cpp

Show diffs side-by-side

added added

removed removed

src/vehicle.cpp

1

/* $Id: vehicle.cpp 16539 2009-06-08 22:53:39Z rubidium $ */

1

/* $Id: vehicle.cpp 17598 2009-09-21 15:41:58Z rubidium $ */

2

2

3

3

/** @file vehicle.cpp Base implementations of all vehicles. */

4

4

38

38

#include "settings_type.h"

39

39

#include "network/network.h"

40

40

41

#include "economy_base.h"

41

42

#include "table/sprites.h"

42

43

#include "table/strings.h"

43

44

481

482

_Vehicle_pool.CleanPool();

482

483

_Vehicle_pool.AddBlockToPool();

483

484

485

_CargoPayment_pool.CleanPool();

486

_CargoPayment_pool.AddBlockToPool();

487

488

_cargo_payment_savegame = false;

489

484

490

_vehicles_to_autoreplace.Reset();

485

491

ResetVehiclePosHash();

486

492

}

529

535

GetStation(this->last_station_visited)->loading_vehicles.remove(this);

530

536

531

537

HideFillingPercent(&this->fill_percent_te_id);

538

539

delete this->cargo_payment;

532

540

}

533

541

534

542

if (IsEngineCountable(this)) {

1514

1522

1515

1523

GetStation(this->last_station_visited)->loading_vehicles.push_back(this);

1516

1524

1517

VehiclePayment(this);

1525

PrepareUnload(this);

1518

1526

1519

1527

InvalidateWindow(GetWindowClassForVehicleType(this->type), this->owner);

1520

1528

InvalidateWindowWidget(WC_VEHICLE_VIEW, this->index, VVW_WIDGET_START_STOP_VEH);

1530

1538

{

1531

1539

assert(current_order.IsType(OT_LOADING));

1532

1540

1541

delete this->cargo_payment;

1542

1533

1543

/* Only update the timetable if the vehicle was supposed to stop here. */

1534

1544

if (current_order.GetNonStopType() != ONSF_STOP_EVERYWHERE) UpdateVehicleTimetable(this, false);

1535

1545

1724

1734

v->vehstatus |= VS_STOPPED;

1725

1735

InvalidateWindowWidget(WC_VEHICLE_VIEW, v->index, VVW_WIDGET_START_STOP_VEH);

1726

1736

InvalidateWindow(WC_VEHICLE_DEPOT, v->tile);

1737

v->MarkDirty();

1727

1738

}

1728

1739

}

1729

1740

Older »