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

Committer: Bazaar Package Importer
Author(s): Jordi Mallach, Matthijs Kooijman, Jordi Mallach
Date: 2009-04-15 18:22:10 UTC
mfrom: (1.1.6 upstream) (2.1.3 squeeze)
Revision ID: james.westby@ubuntu.com-20090415182210-22ktb8kdbp2tf3bm

[ Matthijs Kooijman ]
* New upstream release.
* Remove Debian specific desktop file, upstream provides one now.
* Add debian/watch file.

[ Jordi Mallach ]
* Bump Standards-Version to 3.8.1, with no changes required.
* Move to debhelper compat 7. Bump Build-Depends accordingly.
* Use dh_prep.
* Add "set -e" to config script.
* Remove a few extra doc files that get installed by upstream Makefile.
* Add more complete copyright information.

files added:
.hgignore

bin/ai

bin/ai/regression

bin/ai/regression/completeness.sh

bin/ai/regression/regression.cfg

bin/ai/regression/regression.nut

bin/ai/regression/regression.sav

bin/ai/regression/regression.txt

bin/ai/regression/regression_info.nut

bin/ai/regression/require.nut

bin/ai/regression/run.sh

bin/data/orig_dos.obg

bin/data/orig_dos_de.obg

bin/data/orig_win.obg

bin/scripts/game_start.scr.example

bin/scripts/on_server_connect.scr.example

debian/NEWS

debian/watch

docs/obg_format.txt

os/dos

os/dos/copying

os/dos/copying.dj

os/dos/copying.lib

os/dos/cwsdpmi.exe

os/dos/cwsdpmi.txt

os/dos/cwsdstub.exe

os/dos/exe2coff.c

os/dos/make_dos_binary_selfcontained.sh

os/win32/installer/build_installers.bat

src/3rdparty

src/3rdparty/squirrel

src/3rdparty/squirrel/COMPILE

src/3rdparty/squirrel/COPYRIGHT

src/3rdparty/squirrel/HISTORY

src/3rdparty/squirrel/Makefile

src/3rdparty/squirrel/README

src/3rdparty/squirrel/README.OpenTTD

src/3rdparty/squirrel/bin

src/3rdparty/squirrel/doc

src/3rdparty/squirrel/doc/sqstdlib2.chm

src/3rdparty/squirrel/doc/squirrel2.chm

src/3rdparty/squirrel/etc

src/3rdparty/squirrel/etc/minimal.c

src/3rdparty/squirrel/etc/test.nut

src/3rdparty/squirrel/include

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

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

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

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

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

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

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

src/3rdparty/squirrel/lib

src/3rdparty/squirrel/samples

src/3rdparty/squirrel/samples/ackermann.nut

src/3rdparty/squirrel/samples/array.nut

src/3rdparty/squirrel/samples/class.nut

src/3rdparty/squirrel/samples/classattributes.nut

src/3rdparty/squirrel/samples/coroutines.nut

src/3rdparty/squirrel/samples/delegation.nut

src/3rdparty/squirrel/samples/fibonacci.nut

src/3rdparty/squirrel/samples/flow.nut

src/3rdparty/squirrel/samples/generators.nut

src/3rdparty/squirrel/samples/hello.nut

src/3rdparty/squirrel/samples/list.nut

src/3rdparty/squirrel/samples/loops.nut

src/3rdparty/squirrel/samples/matrix.nut

src/3rdparty/squirrel/samples/metamethods.nut

src/3rdparty/squirrel/samples/methcall.nut

src/3rdparty/squirrel/samples/tailstate.nut

src/3rdparty/squirrel/sq

src/3rdparty/squirrel/sq/Makefile

src/3rdparty/squirrel/sq/sq.c

src/3rdparty/squirrel/sq/sq.dsp

src/3rdparty/squirrel/sqstdlib

src/3rdparty/squirrel/sqstdlib/Makefile

src/3rdparty/squirrel/sqstdlib/sqstdaux.cpp

src/3rdparty/squirrel/sqstdlib/sqstdblob.cpp

src/3rdparty/squirrel/sqstdlib/sqstdblobimpl.h

src/3rdparty/squirrel/sqstdlib/sqstdio.cpp

src/3rdparty/squirrel/sqstdlib/sqstdlib.dsp

src/3rdparty/squirrel/sqstdlib/sqstdmath.cpp

src/3rdparty/squirrel/sqstdlib/sqstdrex.cpp

src/3rdparty/squirrel/sqstdlib/sqstdstream.cpp

src/3rdparty/squirrel/sqstdlib/sqstdstream.h

src/3rdparty/squirrel/sqstdlib/sqstdstring.cpp

src/3rdparty/squirrel/sqstdlib/sqstdsystem.cpp

src/3rdparty/squirrel/squirrel

src/3rdparty/squirrel/squirrel.dsw

src/3rdparty/squirrel/squirrel/Makefile

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

src/3rdparty/squirrel/squirrel/sqarray.h

src/3rdparty/squirrel/squirrel/sqbaselib.cpp

src/3rdparty/squirrel/squirrel/sqclass.cpp

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

src/3rdparty/squirrel/squirrel/sqclosure.h

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

src/3rdparty/squirrel/squirrel/sqcompiler.h

src/3rdparty/squirrel/squirrel/sqdebug.cpp

src/3rdparty/squirrel/squirrel/sqfuncproto.h

src/3rdparty/squirrel/squirrel/sqfuncstate.cpp

src/3rdparty/squirrel/squirrel/sqfuncstate.h

src/3rdparty/squirrel/squirrel/sqlexer.cpp

src/3rdparty/squirrel/squirrel/sqlexer.h

src/3rdparty/squirrel/squirrel/sqmem.cpp

src/3rdparty/squirrel/squirrel/sqobject.cpp

src/3rdparty/squirrel/squirrel/sqobject.h

src/3rdparty/squirrel/squirrel/sqopcodes.h

src/3rdparty/squirrel/squirrel/sqpcheader.h

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

src/3rdparty/squirrel/squirrel/sqstate.h

src/3rdparty/squirrel/squirrel/sqstring.h

src/3rdparty/squirrel/squirrel/sqtable.cpp

src/3rdparty/squirrel/squirrel/sqtable.h

src/3rdparty/squirrel/squirrel/squirrel.dsp

src/3rdparty/squirrel/squirrel/squserdata.h

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

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

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

src/ai/ai.hpp

src/ai/ai_config.cpp

src/ai/ai_config.hpp

src/ai/ai_core.cpp

src/ai/ai_gui.cpp

src/ai/ai_gui.hpp

src/ai/ai_info.cpp

src/ai/ai_info.hpp

src/ai/ai_info_dummy.cpp

src/ai/ai_instance.cpp

src/ai/ai_instance.hpp

src/ai/ai_scanner.cpp

src/ai/ai_scanner.hpp

src/ai/ai_storage.hpp

src/ai/api

src/ai/api/Doxyfile

src/ai/api/ai_abstractlist.cpp

src/ai/api/ai_abstractlist.hpp

src/ai/api/ai_abstractlist.hpp.sq

src/ai/api/ai_accounting.cpp

src/ai/api/ai_accounting.hpp

src/ai/api/ai_accounting.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_base.cpp

src/ai/api/ai_base.hpp

src/ai/api/ai_base.hpp.sq

src/ai/api/ai_bridge.cpp

src/ai/api/ai_bridge.hpp

src/ai/api/ai_bridge.hpp.sq

src/ai/api/ai_bridgelist.cpp

src/ai/api/ai_bridgelist.hpp

src/ai/api/ai_bridgelist.hpp.sq

src/ai/api/ai_cargo.cpp

src/ai/api/ai_cargo.hpp

src/ai/api/ai_cargo.hpp.sq

src/ai/api/ai_cargolist.cpp

src/ai/api/ai_cargolist.hpp

src/ai/api/ai_cargolist.hpp.sq

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

src/ai/api/ai_controller.hpp.sq

src/ai/api/ai_date.cpp

src/ai/api/ai_date.hpp

src/ai/api/ai_date.hpp.sq

src/ai/api/ai_depotlist.cpp

src/ai/api/ai_depotlist.hpp

src/ai/api/ai_depotlist.hpp.sq

src/ai/api/ai_engine.cpp

src/ai/api/ai_engine.hpp

src/ai/api/ai_engine.hpp.sq

src/ai/api/ai_enginelist.cpp

src/ai/api/ai_enginelist.hpp

src/ai/api/ai_enginelist.hpp.sq

src/ai/api/ai_error.cpp

src/ai/api/ai_error.hpp

src/ai/api/ai_error.hpp.sq

src/ai/api/ai_event.cpp

src/ai/api/ai_event.hpp

src/ai/api/ai_event.hpp.sq

src/ai/api/ai_event_types.cpp

src/ai/api/ai_event_types.hpp

src/ai/api/ai_event_types.hpp.sq

src/ai/api/ai_execmode.cpp

src/ai/api/ai_execmode.hpp

src/ai/api/ai_execmode.hpp.sq

src/ai/api/ai_gamesettings.cpp

src/ai/api/ai_gamesettings.hpp

src/ai/api/ai_gamesettings.hpp.sq

src/ai/api/ai_group.cpp

src/ai/api/ai_group.hpp

src/ai/api/ai_group.hpp.sq

src/ai/api/ai_grouplist.cpp

src/ai/api/ai_grouplist.hpp

src/ai/api/ai_grouplist.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_industrylist.cpp

src/ai/api/ai_industrylist.hpp

src/ai/api/ai_industrylist.hpp.sq

src/ai/api/ai_industrytype.cpp

src/ai/api/ai_industrytype.hpp

src/ai/api/ai_industrytype.hpp.sq

src/ai/api/ai_industrytypelist.cpp

src/ai/api/ai_industrytypelist.hpp

src/ai/api/ai_industrytypelist.hpp.sq

src/ai/api/ai_list.cpp

src/ai/api/ai_list.hpp

src/ai/api/ai_list.hpp.sq

src/ai/api/ai_log.cpp

src/ai/api/ai_log.hpp

src/ai/api/ai_log.hpp.sq

src/ai/api/ai_map.cpp

src/ai/api/ai_map.hpp

src/ai/api/ai_map.hpp.sq

src/ai/api/ai_marine.cpp

src/ai/api/ai_marine.hpp

src/ai/api/ai_marine.hpp.sq

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_rail.hpp.sq

src/ai/api/ai_railtypelist.cpp

src/ai/api/ai_railtypelist.hpp

src/ai/api/ai_railtypelist.hpp.sq

src/ai/api/ai_road.cpp

src/ai/api/ai_road.hpp

src/ai/api/ai_road.hpp.sq

src/ai/api/ai_sign.cpp

src/ai/api/ai_sign.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_stationlist.cpp

src/ai/api/ai_stationlist.hpp

src/ai/api/ai_stationlist.hpp.sq

src/ai/api/ai_subsidy.cpp

src/ai/api/ai_subsidy.hpp

src/ai/api/ai_subsidy.hpp.sq

src/ai/api/ai_subsidylist.cpp

src/ai/api/ai_subsidylist.hpp

src/ai/api/ai_subsidylist.hpp.sq

src/ai/api/ai_testmode.cpp

src/ai/api/ai_testmode.hpp

src/ai/api/ai_testmode.hpp.sq

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_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_townlist.cpp

src/ai/api/ai_townlist.hpp

src/ai/api/ai_townlist.hpp.sq

src/ai/api/ai_tunnel.cpp

src/ai/api/ai_tunnel.hpp

src/ai/api/ai_tunnel.hpp.sq

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

src/ai/api/ai_vehiclelist.hpp

src/ai/api/ai_vehiclelist.hpp.sq

src/ai/api/ai_waypoint.cpp

src/ai/api/ai_waypoint.hpp

src/ai/api/ai_waypoint.hpp.sq

src/ai/api/ai_waypointlist.cpp

src/ai/api/ai_waypointlist.hpp

src/ai/api/ai_waypointlist.hpp.sq

src/ai/api/squirrel_export.awk

src/ai/api/squirrel_export.sh

src/animated_tile.cpp

src/animated_tile_func.h

src/autoreplace.cpp

src/cheat.cpp

src/cheat_func.h

src/cheat_gui.cpp

src/cheat_type.h

src/company_base.h

src/company_cmd.cpp

src/company_func.h

src/company_gui.cpp

src/company_gui.h

src/company_manager_face.h

src/company_type.h

src/console_func.h

src/console_gui.cpp

src/console_gui.h

src/console_internal.h

src/console_type.h

src/core/alloc_type.hpp

src/core/endian_type.hpp

src/core/mem_func.hpp

src/core/smallmap_type.hpp

src/core/smallvec_type.hpp

src/core/sort_func.hpp

src/core/string_compare_type.hpp

src/depot_base.h

src/depot_func.h

src/depot_map.h

src/depot_type.h

src/effectvehicle.cpp

src/effectvehicle_base.h

src/effectvehicle_func.h

src/elrail_func.h

src/engine_base.h

src/engine_func.h

src/engine_gui.h

src/engine_type.h

src/fileio_func.h

src/fileio_type.h

src/gamelog.cpp

src/gamelog.h

src/gamelog_internal.h

src/group_type.h

src/highscore.cpp

src/highscore.h

src/highscore_gui.cpp

src/ini.cpp

src/ini_type.h

src/landscape_type.h

src/lang/arabic_egypt.txt

src/lang/hebrew.txt

src/lang/indonesian.txt

src/lang/latvian.txt

src/lang/luxembourgish.txt

src/lang/unfinished/ido.txt

src/lang/unfinished/macedonian.txt

src/lang/unfinished/malay.txt

src/lang/unfinished/persian.txt

src/lang/unfinished/thai.txt

src/lang/unfinished/urdu.txt

src/lang/welsh.txt

src/music/allegro_m.cpp

src/music/allegro_m.h

src/namegen_func.h

src/network/core/address.cpp

src/network/core/address.h

src/network/core/host.cpp

src/network/core/host.h

src/network/core/tcp_connect.cpp

src/network/core/tcp_content.cpp

src/network/core/tcp_content.h

src/network/core/tcp_game.cpp

src/network/core/tcp_game.h

src/network/network_base.h

src/network/network_chat_gui.cpp

src/network/network_command.cpp

src/network/network_content.cpp

src/network/network_content.h

src/network/network_content_gui.cpp

src/network/network_func.h

src/network/network_type.h

src/news_func.h

src/news_gui.h

src/news_type.h

src/oldpool_func.h

src/order_base.h

src/order_func.h

src/order_type.h

src/osk_gui.cpp

src/pbs.cpp

src/pbs.h

src/querystring_gui.h

src/rev.h

src/saveload

src/saveload/afterload.cpp

src/saveload/ai_sl.cpp

src/saveload/animated_tile_sl.cpp

src/saveload/autoreplace_sl.cpp

src/saveload/cargopacket_sl.cpp

src/saveload/cheat_sl.cpp

src/saveload/company_sl.cpp

src/saveload/depot_sl.cpp

src/saveload/economy_sl.cpp

src/saveload/engine_sl.cpp

src/saveload/gamelog_sl.cpp

src/saveload/group_sl.cpp

src/saveload/industry_sl.cpp

src/saveload/map_sl.cpp

src/saveload/misc_sl.cpp

src/saveload/newgrf_sl.cpp

src/saveload/oldloader.cpp

src/saveload/oldloader.h

src/saveload/oldloader_sl.cpp

src/saveload/order_sl.cpp

src/saveload/saveload.cpp

src/saveload/saveload.h

src/saveload/saveload_internal.h

src/saveload/signs_sl.cpp

src/saveload/station_sl.cpp

src/saveload/strings_sl.cpp

src/saveload/subsidy_sl.cpp

src/saveload/town_sl.cpp

src/saveload/vehicle_sl.cpp

src/saveload/waypoint_sl.cpp

src/script

src/script/squirrel.cpp

src/script/squirrel.hpp

src/script/squirrel_class.hpp

src/script/squirrel_helper.hpp

src/script/squirrel_helper_type.hpp

src/script/squirrel_std.cpp

src/script/squirrel_std.hpp

src/signal_type.h

src/signs_base.h

src/signs_cmd.cpp

src/signs_func.h

src/signs_type.h

src/sortlist_type.h

src/sound/allegro_s.cpp

src/sound/allegro_s.h

src/station_base.h

src/station_func.h

src/station_type.h

src/statusbar_gui.cpp

src/statusbar_gui.h

src/strgen/strgen.h

src/table/palette_convert.h

src/tar_type.h

src/thread_morphos.cpp

src/thread_none.cpp

src/thread_os2.cpp

src/thread_pthread.cpp

src/thread_win32.cpp

src/tilehighlight_func.h

src/tilehighlight_type.h

src/toolbar_gui.cpp

src/toolbar_gui.h

src/transport_type.h

src/tree_gui.cpp

src/vehicle_cmd.cpp

src/vehicle_gui_base.h

src/vehiclelist.cpp

src/vehiclelist.h

src/video/allegro_v.cpp

src/video/allegro_v.h

src/waypoint_cmd.cpp

src/waypoint_gui.cpp

src/waypoint_type.h

src/widget_type.h

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

bin/scenario

bin/scenario/Greenistan.scn

bin/scenario/Polopolis.scn

bin/scenario/README

bin/scenario/Skadi Islands.scn

bin/scenario/Terra Incognita.scn

bin/scenario/Wales and West England.scn

bin/scenario/heightmap

debian/openttd.desktop

debian/openttd.install

media/mainicon.ico

media/palette.act

src/ai/ai.cpp

src/ai/ai.h

src/ai/default

src/ai/default/default.cpp

src/ai/default/default.h

src/ai/trolly

src/ai/trolly/build.cpp

src/ai/trolly/pathfinder.cpp

src/ai/trolly/shared.cpp

src/ai/trolly/trolly.cpp

src/ai/trolly/trolly.h

src/console.h

src/depot.h

src/engine.h

src/fileio.h

src/helpers.cpp

src/lang/origveh.txt

src/lang/unfinished/latvian.txt

src/namegen.h

src/network/network_data.cpp

src/network/network_data.h

src/newgrf_string_type.h

src/news.h

src/oldloader.cpp

src/order.h

src/player_base.h

src/player_face.h

src/player_func.h

src/player_gui.cpp

src/player_gui.h

src/player_type.h

src/players.cpp

src/resource.h

src/saveload.cpp

src/saveload.h

src/signs.h

src/station.h

src/table/ai_rail.h

src/thread.cpp

src/yapf/track_dir.hpp

src/yapf/yapf_settings.h

files modified:
Doxyfile

Makefile.bundle.in

Makefile.in

Makefile.msvc

Makefile.src.in

bin/data/openttdd.grf

bin/data/openttdw.grf

bin/scripts/readme.txt

changelog.txt

config.lib *

configure

debian/README.Debian

debian/changelog

debian/compat

debian/config

debian/control

debian/copyright

debian/rules

docs/HOWTO_compile_lang_files.txt

docs/Readme_Windows_MSVC.txt

docs/landscape.html

docs/landscape_grid.html

docs/openttd.6

findversion.sh

known-bugs.txt

media/openttd.desktop.in

os/debian/changelog

os/debian/rules

os/macosx/plistgen.sh

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

projects/strgen_vs80.vcproj

projects/strgen_vs90.vcproj

projects/version_vs80.vcproj

projects/version_vs90.vcproj

readme.txt

source.list

src/aircraft.h

src/aircraft_cmd.cpp

src/aircraft_gui.cpp

src/airport.cpp

src/airport.h

src/airport_gui.cpp

src/airport_movement.h

src/articulated_vehicles.cpp

src/articulated_vehicles.h

src/autoreplace_base.h

src/autoreplace_cmd.cpp

src/autoreplace_func.h

src/autoreplace_gui.cpp

src/autoreplace_type.h

src/autoslope.h

src/aystar.cpp

src/aystar.h

src/blitter/32bpp_anim.cpp

src/blitter/32bpp_anim.hpp

src/blitter/32bpp_base.cpp

src/blitter/32bpp_base.hpp

src/blitter/32bpp_optimized.cpp

src/blitter/32bpp_optimized.hpp

src/blitter/32bpp_simple.cpp

src/blitter/32bpp_simple.hpp

src/blitter/8bpp_base.cpp

src/blitter/8bpp_base.hpp

src/blitter/8bpp_debug.cpp

src/blitter/8bpp_debug.hpp

src/blitter/8bpp_optimized.cpp

src/blitter/8bpp_optimized.hpp

src/blitter/8bpp_simple.cpp

src/blitter/8bpp_simple.hpp

src/blitter/base.hpp

src/blitter/factory.hpp

src/blitter/null.hpp

src/bmp.cpp

src/bmp.h

src/bridge.h

src/bridge_gui.cpp

src/bridge_map.cpp

src/bridge_map.h

src/build_vehicle_gui.cpp

src/callback_table.cpp

src/callback_table.h

src/cargo_type.h

src/cargopacket.cpp

src/cargopacket.h

src/cargotype.cpp

src/cargotype.h

src/clear_cmd.cpp

src/clear_map.h

src/cmd_helper.h

src/command.cpp

src/command_func.h

src/command_type.h

src/console.cpp

src/console_cmds.cpp

src/core/alloc_func.cpp

src/core/alloc_func.hpp

src/core/bitmath_func.cpp

src/core/bitmath_func.hpp

src/core/endian_func.hpp

src/core/enum_type.hpp

src/core/geometry_type.hpp

src/core/math_func.hpp

src/core/overflowsafe_type.hpp

src/core/random_func.cpp

src/core/random_func.hpp

src/currency.cpp

src/currency.h

src/date.cpp

src/date_func.h

src/date_type.h

src/debug.cpp

src/debug.h

src/dedicated.cpp

src/depot.cpp

src/depot_gui.cpp

src/direction_func.h

src/direction_type.h

src/disaster_cmd.cpp

src/dock_gui.cpp

src/driver.cpp

src/driver.h

src/dummy_land.cpp

src/economy.cpp

src/economy_func.h

src/economy_type.h

src/elrail.cpp

src/endian_check.cpp

src/engine.cpp

src/engine_gui.cpp

src/fileio.cpp

src/fios.cpp

src/fios.h

src/fontcache.cpp

src/fontcache.h

src/functions.h

src/genworld.cpp

src/genworld.h

src/genworld_gui.cpp

src/gfx.cpp

src/gfx_func.h

src/gfx_type.h

src/gfxinit.cpp

src/gfxinit.h

src/graph_gui.cpp

src/group.h

src/group_cmd.cpp

src/group_gui.cpp

src/group_gui.h

src/gui.h

src/heightmap.cpp

src/heightmap.h

src/industry.h

src/industry_cmd.cpp

src/industry_gui.cpp

src/industry_map.h

src/intro_gui.cpp

src/landscape.cpp

src/landscape.h

src/lang/afrikaans.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/hungarian.txt

src/lang/icelandic.txt

src/lang/italian.txt

src/lang/japanese.txt

src/lang/korean.txt

src/lang/lithuanian.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/serbian.txt

src/livery.h

src/main_gui.cpp

src/map.cpp

src/map_func.h

src/masm64.rules

src/md5.cpp

src/md5.h

src/minilzo.cpp

src/minilzo.h

src/misc.cpp

src/misc/array.hpp

src/misc/binaryheap.hpp

src/misc/blob.hpp

src/misc/countedobj.cpp

src/misc/countedptr.hpp

src/misc/crc32.hpp

src/misc/dbg_helpers.cpp

src/misc/dbg_helpers.h

src/misc/fixedsizearray.hpp

src/misc/hashtable.hpp

src/misc/str.hpp

src/misc/strapi.hpp

src/misc_cmd.cpp

src/misc_gui.cpp

src/mixer.cpp

src/mixer.h

src/music.cpp

src/music.h

src/music/bemidi.cpp

src/music/bemidi.h

src/music/dmusic.cpp

src/music/dmusic.h

src/music/extmidi.cpp

src/music/extmidi.h

src/music/libtimidity.cpp

src/music/libtimidity.h

src/music/music_driver.hpp

src/music/null_m.cpp

src/music/null_m.h

src/music/os2_m.cpp

src/music/os2_m.h

src/music/qtmidi.cpp

src/music/qtmidi.h

src/music/win32_m.cpp

src/music/win32_m.h

src/music_gui.cpp

src/namegen.cpp

src/network/core/config.h

src/network/core/core.cpp

src/network/core/core.h

src/network/core/game.h

src/network/core/os_abstraction.h

src/network/core/packet.cpp

src/network/core/packet.h

src/network/core/tcp.cpp

src/network/core/tcp.h

src/network/core/udp.cpp

src/network/network.cpp

src/network/network.h

src/network/network_client.cpp

src/network/network_client.h

src/network/network_gamelist.cpp

src/network/network_gamelist.h

src/network/network_gui.cpp

src/network/network_gui.h

src/network/network_internal.h

src/network/network_server.cpp

src/network/network_server.h

src/network/network_udp.cpp

src/network/network_udp.h

src/newgrf.cpp

src/newgrf.h

src/newgrf_callbacks.h

src/newgrf_canal.cpp

src/newgrf_canal.h

src/newgrf_cargo.cpp

src/newgrf_cargo.h

src/newgrf_commons.cpp

src/newgrf_commons.h

src/newgrf_config.cpp

src/newgrf_config.h

src/newgrf_engine.cpp

src/newgrf_engine.h

src/newgrf_generic.cpp

src/newgrf_generic.h

src/newgrf_gui.cpp

src/newgrf_house.cpp

src/newgrf_house.h

src/newgrf_industries.cpp

src/newgrf_industries.h

src/newgrf_industrytiles.cpp

src/newgrf_industrytiles.h

src/newgrf_sound.cpp

src/newgrf_sound.h

src/newgrf_spritegroup.cpp

src/newgrf_spritegroup.h

src/newgrf_station.cpp

src/newgrf_station.h

src/newgrf_storage.h

src/newgrf_text.cpp

src/newgrf_text.h

src/newgrf_town.cpp

src/newgrf_town.h

src/newgrf_townname.cpp

src/newgrf_townname.h

src/news_gui.cpp

src/npf.cpp

src/npf.h

src/oldpool.cpp

src/oldpool.h

src/openttd.cpp

src/openttd.h

src/order_cmd.cpp

src/order_gui.cpp

src/os/macosx/G5_detector.cpp

src/os/macosx/macos.h

src/os/macosx/macos.mm

src/os/macosx/osx_stdafx.h

src/os/macosx/splash.cpp

src/os/macosx/splash.h

src/os2.cpp

src/os_timer.cpp

src/ottdres.rc.in

src/pathfind.cpp

src/pathfind.h

src/queue.cpp

src/queue.h

src/rail.cpp

src/rail.h

src/rail_cmd.cpp

src/rail_gui.cpp

src/rail_gui.h

src/rail_map.h

src/rail_type.h

src/rev.cpp.in

src/road.cpp

src/road_cmd.cpp

src/road_cmd.h

src/road_func.h

src/road_gui.cpp

src/road_internal.h

src/road_map.cpp

src/road_map.h

src/road_type.h

src/roadveh.h

src/roadveh_cmd.cpp

src/roadveh_gui.cpp

src/screenshot.cpp

src/screenshot.h

src/sdl.cpp

src/sdl.h

src/settings.cpp

src/settings_func.h

src/settings_gui.cpp

src/settings_internal.h

src/settings_type.h

src/ship.h

src/ship_cmd.cpp

src/ship_gui.cpp

src/signal.cpp

src/signal_func.h

src/signs.cpp

src/signs_gui.cpp

src/slope_func.h

src/slope_type.h

src/smallmap_gui.cpp

src/sound.cpp

src/sound/cocoa_s.cpp

src/sound/cocoa_s.h

src/sound/null_s.cpp

src/sound/null_s.h

src/sound/sdl_s.cpp

src/sound/sdl_s.h

src/sound/sound_driver.hpp

src/sound/win32_s.cpp

src/sound/win32_s.h

src/sound_type.h

src/sprite.h

src/spritecache.cpp

src/spritecache.h

src/spriteloader/grf.cpp

src/spriteloader/grf.hpp

src/spriteloader/png.cpp

src/spriteloader/png.hpp

src/spriteloader/spriteloader.hpp

src/station.cpp

src/station_cmd.cpp

src/station_gui.cpp

src/station_gui.h

src/station_map.h

src/stdafx.h

src/strgen/strgen.cpp

src/string.cpp

src/string_func.h

src/strings.cpp

src/strings_func.h

src/strings_type.h

src/subsidy_gui.cpp

src/table/autorail.h

src/table/bridge_land.h

src/table/build_industry.h

src/table/cargo_const.h

src/table/clear_land.h

src/table/control_codes.h

src/table/elrail_data.h

src/table/engines.h

src/table/files.h

src/table/genland.h

src/table/industry_land.h

src/table/landscape_sprite.h

src/table/namegen.h

src/table/palettes.h

src/table/railtypes.h

src/table/road_land.h

src/table/roadveh_movement.h

src/table/sprites.h

src/table/station_land.h

src/table/town_land.h

src/table/track_land.h

src/table/train_cmd.h

src/table/tree_land.h

src/table/unicode.h

src/table/unmovable_land.h

src/table/water_land.h

src/terraform_cmd.cpp

src/terraform_gui.cpp

src/textbuf_gui.h

src/texteff.cpp

src/texteff.hpp

src/tgp.cpp

src/tgp.h

src/thread.h

src/tile_cmd.h

src/tile_map.cpp

src/tile_map.h

src/tile_type.h

src/timetable.h

src/timetable_cmd.cpp

src/timetable_gui.cpp

src/town.h

src/town_cmd.cpp

src/town_gui.cpp

src/town_map.h

src/town_type.h

src/track_func.h

src/train.h

src/train_cmd.cpp

src/train_gui.cpp

src/transparency.h

src/transparency_gui.cpp

src/transparency_gui.h

src/tree_cmd.cpp

src/tree_map.h

src/tunnel_map.cpp

src/tunnel_map.h

src/tunnelbridge.h

src/tunnelbridge_cmd.cpp

src/tunnelbridge_map.h

src/unix.cpp

src/unmovable.h

src/unmovable_cmd.cpp

src/unmovable_map.h

src/variables.h

src/vehicle.cpp

src/vehicle_base.h

src/vehicle_func.h

src/vehicle_gui.cpp

src/vehicle_gui.h

src/vehicle_type.h

src/video/cocoa/cocoa_keys.h

src/video/cocoa/cocoa_v.h

src/video/cocoa/cocoa_v.mm

src/video/cocoa/event.mm

src/video/cocoa/fullscreen.mm

src/video/cocoa/wnd_quartz.mm

src/video/cocoa/wnd_quickdraw.mm

src/video/dedicated_v.cpp

src/video/dedicated_v.h

src/video/null_v.cpp

src/video/null_v.h

src/video/sdl_v.cpp

src/video/sdl_v.h

src/video/video_driver.hpp

src/video/win32_v.cpp

src/video/win32_v.h

src/viewport.cpp

src/viewport_func.h

src/viewport_type.h

src/void_map.h

src/water.h

src/water_cmd.cpp

src/water_map.h

src/waypoint.cpp

src/waypoint.h

src/widget.cpp

src/widgets/dropdown.cpp

src/widgets/dropdown_func.h

src/widgets/dropdown_type.h

src/win32.cpp

src/win64.asm

src/window.cpp

src/window_func.h

src/window_gui.h

src/window_type.h

src/yapf/follow_track.hpp

src/yapf/nodelist.hpp

src/yapf/yapf.h

src/yapf/yapf.hpp

src/yapf/yapf_base.hpp

src/yapf/yapf_common.hpp

src/yapf/yapf_costbase.hpp

src/yapf/yapf_costcache.hpp

src/yapf/yapf_costrail.hpp

src/yapf/yapf_destrail.hpp

src/yapf/yapf_node.hpp

src/yapf/yapf_node_rail.hpp

src/yapf/yapf_node_road.hpp

src/yapf/yapf_rail.cpp

src/yapf/yapf_road.cpp

src/yapf/yapf_ship.cpp

src/zoom_func.h

src/zoom_type.h

svnup.sh

Show diffs side-by-side

added added

removed removed

src/industry.h

/* $Id: industry.h 12041 2008-02-02 03:23:26Z belugas $ */

/* $Id: industry.h 15726 2009-03-15 16:04:39Z smatz $ */

/** @file industry.h */

/** @file industry.h Base of all industries. */

#ifndef INDUSTRY_H

#define INDUSTRY_H

#include "date_type.h"

#include "town_type.h"

#include "industry_type.h"

#include "newgrf_string_type.h"

#include "landscape_type.h"

enum {

INVALID_INDUSTRY = 0xFFFF,

INDUSTRYBEH_PLANT_FIELDS = 1 << 0, ///< periodically plants fileds around itself (temp and artic farms)

INDUSTRYBEH_CUT_TREES = 1 << 1, ///< cuts trees and produce first output cargo from them (lumber mill)

INDUSTRYBEH_BUILT_ONWATER = 1 << 2, ///< is built on water (oil rig)

INDUSTRYBEH_TOWN1200_MORE = 1 << 3, ///< can only be built in towns larger then 1200 inhabitants (temperate bank)

INDUSTRYBEH_TOWN1200_MORE = 1 << 3, ///< can only be built in towns larger than 1200 inhabitants (temperate bank)

INDUSTRYBEH_ONLY_INTOWN = 1 << 4, ///< can only be built in towns (arctic/tropic banks, water tower)

INDUSTRYBEH_ONLY_NEARTOWN = 1 << 5, ///< is always built near towns (toy shop)

INDUSTRYBEH_PLANT_ON_BUILT = 1 << 6, ///< Fields are planted around when built (all farms)

117

118

IndustryType type; ///< type of industry.

119

OwnerByte owner; ///< owner of the industry. Which SHOULD always be (imho) OWNER_NONE

120

byte random_color; ///< randomized colour of the industry, for display purpose

120

byte random_colour; ///< randomized colour of the industry, for display purpose

121

Year last_prod_year; ///< last year of production

122

byte was_cargo_delivered; ///< flag that indicate this has been the closest industry chosen for cargo delivery by a station. see DeliverGoodsToIndustry

123

132

133

PersistentStorage psa; ///< Persistent storage for NewGRF industries.

134

135

Industry(TileIndex tile = 0) : xy(tile) {}

135

Industry(TileIndex tile = INVALID_TILE) : xy(tile) {}

136

~Industry();

137

138

inline bool IsValid() const { return this->xy != 0; }

138

inline bool IsValid() const { return this->xy != INVALID_TILE; }

139

};

140

141

struct IndustryTileTable {

156

* Defines the data structure for constructing industry.

157

158

struct IndustrySpec {

159

const IndustryTileTable *const *table;///< List of the tiles composing the industry

159

const IndustryTileTable * const *table;///< List of the tiles composing the industry

160

byte num_table; ///< Number of elements in the table

161

uint8 cost_multiplier; ///< Base construction cost multiplier.

162

uint32 removal_cost_multiplier; ///< Base removal cost multiplier.

174

byte climate_availability; ///< Bitmask, giving landscape enums as bit position

175

IndustryBehaviour behaviour; ///< How this industry will behave, and how others entities can use it

176

byte map_colour; ///< colour used for the small map

177

GRFMappedStringID name; ///< Displayed name of the industry

178

GRFMappedStringID new_industry_text; ///< Message appearing when the industry is built

179

GRFMappedStringID closure_text; ///< Message appearing when the industry closes

180

GRFMappedStringID production_up_text; ///< Message appearing when the industry's production is increasing

181

GRFMappedStringID production_down_text; ///< Message appearing when the industry's production is decreasing

182

GRFMappedStringID station_name; ///< Default name for nearby station

177

StringID name; ///< Displayed name of the industry

178

StringID new_industry_text; ///< Message appearing when the industry is built

179

StringID closure_text; ///< Message appearing when the industry closes

180

StringID production_up_text; ///< Message appearing when the industry's production is increasing

181

StringID production_down_text; ///< Message appearing when the industry's production is decreasing

182

StringID station_name; ///< Default name for nearby station

183

byte appear_ingame[NUM_LANDSCAPE]; ///< Probability of appearance in game

184

byte appear_creation[NUM_LANDSCAPE]; ///< Probability of appearance during map creation

185

uint8 number_of_sounds; ///< Number of sounds available in the sounds array

238

void ResetIndustries();

239

void PlantRandomFarmField(const Industry *i);

240

241

void ReleaseDisastersTargetingIndustry(IndustryID);

242

241

243

/* writable arrays of specs */

242

244

extern IndustrySpec _industry_specs[NUM_INDUSTRYTYPES];

243

245

extern IndustryTileSpec _industry_tile_specs[NUM_INDUSTRYTILES];

260

262

261

263

/* smallmap_gui.cpp */

262

264

void BuildIndustriesLegend();

265

/* industry_cmd.cpp */

266

void SetIndustryDailyChanges();

263

267

264

268

/**

265

269

* Check if an Industry exists whithin the pool of industries

354

358

#define FOR_ALL_INDUSTRIES_FROM(i, start) for (i = GetIndustry(start); i != NULL; i = (i->index + 1U < GetIndustryPoolSize()) ? GetIndustry(i->index + 1U) : NULL) if (i->IsValid())

355

359

#define FOR_ALL_INDUSTRIES(i) FOR_ALL_INDUSTRIES_FROM(i, 0)

356

360

357

extern const Industry **_industry_sort;

358

extern bool _industry_sort_dirty;

359

360

361

static const uint8 IT_INVALID = 255;

361

362

363

#endif /* INDUSTRY_H */

Older »