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

« back to all changes in this revision

Viewing changes to src/disaster_cmd.cpp

Committer: Bazaar Package Importer
Author(s): Jordi Mallach, Matthijs Kooijman
Date: 2009-06-09 21:46:28 UTC
mfrom: (1.1.7 upstream) (2.1.4 squeeze)
Revision ID: james.westby@ubuntu.com-20090609214628-6z5uodi6178z050l

[ Matthijs Kooijman ]
* New upstream release.
* Link against libicu to enable right-to-left language support.

files added:
src/ai/api/ai_signlist.cpp

src/ai/api/ai_signlist.hpp

src/ai/api/ai_signlist.hpp.sq

files modified:
Makefile.in

Makefile.msvc

Makefile.src.in

bin/ai/regression/regression.nut

bin/ai/regression/regression.txt

changelog.txt

config.lib

configure

debian/changelog

debian/control

debian/copyright

debian/po/ca.po

debian/po/cs.po

debian/po/de.po

debian/po/eu.po

debian/po/fr.po

debian/po/gl.po

debian/po/nl.po

debian/po/pt.po

debian/po/pt_BR.po

debian/po/ru.po

debian/po/sv.po

debian/po/ta.po

debian/po/templates.pot

findversion.sh

known-bugs.txt

os/debian/changelog

os/win32/installer/install.nsi

projects/determineversion.vbs

projects/openttd_vs80.vcproj

projects/openttd_vs90.vcproj

readme.txt

source.list

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

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

src/3rdparty/squirrel/squirrel/sqstate.cpp

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

src/ai/ai_gui.cpp

src/ai/ai_info.cpp

src/ai/ai_info.hpp

src/ai/ai_instance.cpp

src/ai/ai_instance.hpp

src/ai/ai_scanner.cpp

src/ai/api/Doxyfile

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_controller.cpp

src/ai/api/ai_controller.hpp

src/ai/api/ai_controller.hpp.sq

src/ai/api/ai_event_types.hpp

src/ai/api/ai_industry.hpp

src/ai/api/ai_log.cpp

src/ai/api/ai_map.hpp

src/ai/api/ai_object.cpp

src/ai/api/ai_object.hpp

src/ai/api/ai_order.cpp

src/ai/api/ai_order.hpp

src/ai/api/ai_order.hpp.sq

src/ai/api/ai_rail.cpp

src/ai/api/ai_rail.hpp

src/ai/api/ai_sign.hpp

src/ai/api/ai_station.cpp

src/ai/api/ai_station.hpp

src/ai/api/ai_tile.cpp

src/ai/api/ai_tile.hpp

src/ai/api/ai_tile.hpp.sq

src/ai/api/ai_tilelist.cpp

src/ai/api/ai_tilelist.hpp

src/ai/api/ai_tunnel.cpp

src/ai/api/ai_tunnel.hpp

src/ai/api/ai_types.hpp

src/ai/api/ai_vehicle.cpp

src/ai/api/ai_vehicle.hpp

src/ai/api/ai_vehicle.hpp.sq

src/ai/api/ai_vehiclelist.hpp

src/ai/api/ai_waypoint.hpp

src/aircraft_cmd.cpp

src/company_cmd.cpp

src/console.cpp

src/console_cmds.cpp

src/console_func.h

src/core/alloc_func.cpp

src/core/bitmath_func.hpp

src/core/overflowsafe_type.hpp

src/core/random_func.hpp

src/currency.cpp

src/debug.cpp

src/debug.h

src/disaster_cmd.cpp

src/economy.cpp

src/fileio.cpp

src/fios.cpp

src/gamelog.cpp

src/genworld.cpp

src/genworld.h

src/genworld_gui.cpp

src/gfx.cpp

src/gfxinit.cpp

src/graph_gui.cpp

src/industry_cmd.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/frisian.txt

src/lang/unfinished/greek.txt

src/lang/unfinished/macedonian.txt

src/lang/unfinished/malay.txt

src/lang/unfinished/persian.txt

src/lang/unfinished/serbian.txt

src/lang/unfinished/thai.txt

src/lang/welsh.txt

src/misc_cmd.cpp

src/misc_gui.cpp

src/music/win32_m.cpp

src/network/core/config.h

src/network/network.cpp

src/network/network_client.cpp

src/network/network_command.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_server.cpp

src/network/network_udp.cpp

src/network/network_udp.h

src/newgrf.cpp

src/newgrf.h

src/newgrf_config.h

src/newgrf_engine.cpp

src/newgrf_gui.cpp

src/newgrf_house.cpp

src/newgrf_industries.cpp

src/newgrf_station.cpp

src/newgrf_station.h

src/newgrf_text.cpp

src/openttd.cpp

src/order_base.h

src/order_cmd.cpp

src/order_gui.cpp

src/ottdres.rc.in

src/rail_cmd.cpp

src/rail_gui.cpp

src/rail_map.h

src/rev.cpp.in

src/road.cpp

src/road_cmd.cpp

src/road_gui.cpp

src/roadveh_cmd.cpp

src/saveload/afterload.cpp

src/saveload/misc_sl.cpp

src/saveload/oldloader_sl.cpp

src/saveload/order_sl.cpp

src/saveload/saveload.cpp

src/saveload/station_sl.cpp

src/saveload/town_sl.cpp

src/saveload/vehicle_sl.cpp

src/screenshot.cpp

src/script/squirrel.cpp

src/script/squirrel.hpp

src/settings.cpp

src/settings_type.h

src/ship_cmd.cpp

src/slope_type.h

src/sound.cpp

src/sound_type.h

src/spritecache.cpp

src/station_cmd.cpp

src/station_gui.cpp

src/station_map.h

src/station_type.h

src/stdafx.h

src/strgen/strgen.cpp

src/string_func.h

src/strings.cpp

src/strings_type.h

src/terraform_gui.cpp

src/toolbar_gui.cpp

src/town.h

src/town_cmd.cpp

src/train_cmd.cpp

src/tunnelbridge_cmd.cpp

src/variables.h

src/vehicle.cpp

src/vehicle_base.h

src/vehicle_func.h

src/vehicle_gui.cpp

src/video/dedicated_v.cpp

src/viewport.cpp

src/viewport_func.h

src/win32.cpp

src/yapf/yapf_base.hpp

src/yapf/yapf_costrail.hpp

src/yapf/yapf_rail.cpp

Show diffs side-by-side

added added

removed removed

src/disaster_cmd.cpp

/* $Id: disaster_cmd.cpp 15764 2009-03-18 19:47:05Z rubidium $ */

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

/** @file disaster_cmd.cpp

* All disaster/easter egg vehicles are handled here.

323

} else {

324

/* Target a vehicle */

325

u = GetVehicle(v->dest_tile);

326

if (u->type != VEH_ROAD || !IsRoadVehFront(u)) {

327

delete v;

328

return;

329

}

326

assert(u->type == VEH_ROAD && IsRoadVehFront(u));

330

327

331

328

dist = Delta(v->x_pos, u->x_pos) + Delta(v->y_pos, u->y_pos);

332

329

1029

1026

}

1030

1027

}

1031

1028

1029

/** Notify disasters that we are about to delete a vehicle. So make them head elsewhere.

1030

* @param vehicle deleted vehicle

1031

1032

void ReleaseDisastersTargetingVehicle(VehicleID vehicle)

1033

{

1034

Vehicle *v;

1035

FOR_ALL_VEHICLES(v) {

1036

/* primary disaster vehicles that have chosen target */

1037

if (v->type == VEH_DISASTER && v->subtype == ST_SMALL_UFO) {

1038

if (v->current_order.GetDestination() != 0 && v->dest_tile == vehicle) {

1039

/* Revert to target-searching */

1040

v->current_order.SetDestination(0);

1041

v->dest_tile = RandomTile();

1042

v->z_pos = 135;

1043

v->age = 0;

1044

}

1045

}

1046

}

1047

}

1048

1032

1049

void DisasterVehicle::UpdateDeltaXY(Direction direction)

1033

1050

{

1034

1051

this->x_offs = -1;

Older »