← 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/newgrf_engine.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/newgrf_engine.cpp

1

/* $Id: newgrf_engine.cpp 16482 2009-05-31 12:22:53Z rubidium $ */

1

/* $Id: newgrf_engine.cpp 16638 2009-06-23 20:48:48Z rubidium $ */

2

2

3

3

/** @file newgrf_engine.cpp NewGRF handling of engines. */

4

4

129

129

130

130

static int MapOldSubType(const Vehicle *v)

131

131

{

132

if (v->type != VEH_TRAIN) return v->subtype;

133

if (IsTrainEngine(v)) return 0;

134

if (IsFreeWagon(v)) return 4;

135

return 2;

132

switch (v->type) {

133

case VEH_TRAIN:

134

if (IsTrainEngine(v)) return 0;

135

if (IsFreeWagon(v)) return 4;

136

return 2;

137

case VEH_ROAD:

138

case VEH_SHIP: return 0;

139

case VEH_AIRCRAFT:

140

case VEH_DISASTER: return v->subtype;

141

case VEH_EFFECT: return v->subtype << 1;

142

default: NOT_REACHED();

143

}

136

144

}

137

145

138

146

685

693

686

694

/* General vehicle properties */

687

695

switch (variable - 0x80) {

688

case 0x00: return v->type;

696

case 0x00: return v->type + 0x10;

689

697

case 0x01: return MapOldSubType(v);

690

698

case 0x04: return v->index;

691

699

case 0x05: return GB(v->index, 8, 8);

692

case 0x0A: return v->current_order.Pack();

693

case 0x0B: return GB(v->current_order.Pack(), 8, 8);

700

case 0x0A: return v->current_order.MapOldOrder();

701

case 0x0B: return v->current_order.GetDestination();

694

702

case 0x0C: return v->GetNumOrders();

695

703

case 0x0D: return v->cur_order_index;

696

704

case 0x10: return v->load_unload_time_rem;

Older »