This is an automated email from the git hooks/post-receive script.
jff-guest pushed a change to branch master
in repository simutrans.
from 0bb05a1 merge d/watch
new 00d990d Imported Upstream version 120.0.1
new a956b1b Imported Upstream version 120.1.1
new 0038450 merge new upstream release 120.1.1
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.
Summary of changes:
Makefile | 33 +-
bauer/brueckenbauer.cc | 382 ++--
bauer/brueckenbauer.h | 24 +-
bauer/fabrikbauer.cc | 30 +-
bauer/fabrikbauer.h | 8 +-
bauer/hausbauer.cc | 97 +-
bauer/hausbauer.h | 12 +-
bauer/tunnelbauer.cc | 145 +-
bauer/tunnelbauer.h | 16 +-
bauer/vehikelbauer.cc | 34 +-
bauer/vehikelbauer.h | 6 +-
bauer/warenbauer.cc | 5 +
bauer/warenbauer.h | 2 +-
bauer/wegbauer.cc | 238 +--
bauer/wegbauer.h | 28 +-
besch/baum_besch.h | 4 +-
besch/bruecke_besch.h | 9 +-
besch/fabrik_besch.h | 34 +-
besch/fussgaenger_besch.h | 10 +-
besch/groundobj_besch.h | 3 +-
besch/grund_besch.cc | 2 +-
besch/grund_besch.h | 4 +-
besch/haus_besch.cc | 20 +-
besch/haus_besch.h | 56 +-
besch/kreuzung_besch.h | 6 +-
besch/obj_besch_std_name.h | 10 +-
besch/reader/building_reader.cc | 17 +-
besch/reader/citycar_reader.cc | 8 +-
besch/reader/factory_reader.cc | 3 +-
besch/reader/good_reader.cc | 6 +-
besch/reader/obj_reader.cc | 10 +-
besch/reader/pedestrian_reader.cc | 4 +-
besch/reader/roadsign_reader.cc | 21 +-
besch/roadsign_besch.h | 10 +-
besch/skin_besch.h | 6 +-
besch/stadtauto_besch.h | 6 +-
besch/tunnel_besch.h | 4 +-
besch/vehikel_besch.cc | 2 +-
besch/vehikel_besch.h | 16 +-
besch/ware_besch.h | 2 -
besch/way_obj_besch.h | 6 +-
besch/weg_besch.h | 14 +-
besch/writer/building_writer.cc | 10 +-
besch/writer/factory_writer.cc | 3 +-
besch/writer/roadsign_writer.cc | 14 +-
besch/writer/vehicle_writer.cc | 5 +-
boden/boden.cc | 40 +-
boden/boden.h | 2 +-
boden/brueckenboden.cc | 42 +-
boden/brueckenboden.h | 2 +-
boden/fundament.cc | 13 +-
boden/fundament.h | 2 +-
boden/grund.cc | 118 +-
boden/grund.h | 116 +-
boden/monorailboden.cc | 14 +-
boden/monorailboden.h | 2 +-
boden/tunnelboden.cc | 51 +-
boden/tunnelboden.h | 2 +-
boden/wasser.cc | 45 +-
boden/wasser.h | 3 +-
boden/wege/schiene.cc | 10 +-
boden/wege/schiene.h | 16 +-
boden/wege/weg.cc | 58 +-
boden/wege/weg.h | 23 +-
clipboard_w32.cc | 65 +-
common.mk | 4 +-
dataobj/crossing_logic.cc | 12 +-
dataobj/crossing_logic.h | 14 +-
dataobj/environment.cc | 18 +-
dataobj/environment.h | 14 +-
dataobj/fahrplan.cc | 14 +-
dataobj/fahrplan.h | 8 +-
dataobj/gameinfo.cc | 14 +-
dataobj/gameinfo.h | 4 +-
dataobj/koord.cc | 2 +-
dataobj/koord.h | 1 -
dataobj/koord3d.cc | 4 +-
dataobj/loadsave.cc | 13 +-
dataobj/loadsave.h | 3 +-
dataobj/objlist.cc | 108 +-
dataobj/objlist.h | 12 +-
dataobj/records.cc | 11 +-
dataobj/records.h | 8 +-
dataobj/ribi.cc | 38 +-
dataobj/ribi.h | 49 +-
dataobj/route.cc | 147 +-
dataobj/route.h | 79 +-
dataobj/scenario.cc | 94 +-
dataobj/scenario.h | 45 +-
dataobj/settings.cc | 97 +-
dataobj/settings.h | 31 +-
dataobj/translator.cc | 85 +-
dataobj/translator.h | 2 +-
debian/translations/be.tab | 4 +
debian/translations/bg.tab | 4 +
debian/translations/ca.tab | 4 +
debian/translations/cn.tab | 4 +
debian/translations/cz.tab | 4 +
debian/translations/de.tab | 16 +-
debian/translations/dk.tab | 4 +
debian/translations/en.tab | 8 +
debian/translations/es.tab | 4 +
debian/translations/et.tab | 4 +
debian/translations/fi.tab | 4 +
debian/translations/fr.tab | 6 +
debian/translations/gr.tab | 4 +
debian/translations/hr.tab | 4 +
debian/translations/hu.tab | 4 +
debian/translations/id.tab | 4 +
debian/translations/it.tab | 4 +
debian/translations/ja.tab | 40 +-
debian/translations/ko.tab | 4 +
debian/translations/lt.tab | 4 +
debian/translations/nl.tab | 4 +
debian/translations/no.tab | 4 +
debian/translations/pl.tab | 4 +
debian/translations/pt.tab | 4 +
debian/translations/ro.tab | 4 +
debian/translations/ru.tab | 4 +
debian/translations/sk.tab | 4 +
debian/translations/sq.tab | 4 +
debian/translations/sv.tab | 4 +
debian/translations/th.tab | 4 +
debian/translations/tr.tab | 4 +
debian/translations/uk.tab | 4 +
debian/translations/zh.tab | 4 +
display/font.cc | 2 +-
display/scr_coord.h | 14 +-
display/simgraph.h | 75 +-
display/simgraph0.cc | 63 +-
display/simgraph16.cc | 209 +--
display/simimg.h | 4 +-
display/simview.cc | 19 +-
display/viewport.cc | 8 +-
display/viewport.h | 14 +-
gui/ai_option_t.cc | 6 +-
gui/ai_option_t.h | 6 +-
gui/banner.cc | 2 +-
gui/banner.h | 4 +-
gui/base_info.cc | 4 +-
gui/base_info.h | 2 +-
gui/baum_edit.cc | 18 +-
gui/baum_edit.h | 8 +-
gui/{stadt_info.cc => city_info.cc} | 227 ++-
gui/{stadt_info.h => city_info.h} | 40 +-
gui/citybuilding_edit.cc | 18 +-
gui/citybuilding_edit.h | 8 +-
gui/citylist_frame_t.cc | 17 +-
gui/citylist_frame_t.h | 2 +-
gui/citylist_stats_t.cc | 2 +-
gui/climates.h | 2 +-
gui/components/gui_button.cc | 3 +-
gui/components/gui_button.h | 5 +
gui/components/gui_chart.cc | 78 +-
gui/components/gui_chart.h | 3 +-
gui/components/gui_combobox.cc | 7 +-
gui/components/gui_convoiinfo.cc | 6 +-
gui/components/gui_fixedwidth_textarea.cc | 3 +-
gui/components/gui_flowtext.cc | 12 +-
gui/components/gui_komponente.h | 2 +-
gui/components/gui_obj_view_t.cc | 4 +-
gui/components/gui_scrollbar.cc | 2 +-
gui/components/gui_scrolled_list.cc | 58 +-
gui/components/gui_scrolled_list.h | 4 +-
gui/components/gui_textinput.cc | 148 +-
gui/components/gui_textinput.h | 12 +-
gui/components/gui_world_view_t.cc | 6 +-
gui/convoi_detail_t.cc | 28 +-
gui/convoi_detail_t.h | 2 +-
gui/convoi_filter_frame.cc | 4 +-
gui/convoi_filter_frame.h | 6 +-
gui/convoi_frame.cc | 40 +-
gui/convoi_frame.h | 8 +-
gui/convoi_info_t.cc | 43 +-
gui/convoi_info_t.h | 2 +-
gui/convoy_item.cc | 8 +-
gui/curiosity_edit.cc | 18 +-
gui/curiosity_edit.h | 8 +-
gui/curiositylist_frame_t.cc | 2 +-
gui/curiositylist_frame_t.h | 2 +-
gui/curiositylist_stats_t.cc | 2 +-
gui/depot_frame.cc | 93 +-
gui/depot_frame.h | 4 +-
gui/display_settings.cc | 26 +-
gui/display_settings.h | 4 +-
gui/enlarge_map_frame_t.cc | 11 +-
gui/enlarge_map_frame_t.h | 2 +-
gui/extend_edit.cc | 8 +-
gui/extend_edit.h | 6 +-
gui/fabrik_info.cc | 12 +-
gui/fabrik_info.h | 2 +-
gui/factory_chart.cc | 17 +-
gui/factory_edit.cc | 24 +-
gui/factory_edit.h | 16 +-
gui/factorylist_frame_t.cc | 2 +-
gui/factorylist_frame_t.h | 2 +-
gui/fahrplan_gui.cc | 105 +-
gui/fahrplan_gui.h | 16 +-
gui/goods_frame_t.h | 2 +-
gui/goods_stats_t.cc | 4 +-
gui/ground_info.cc | 4 +-
gui/gui_frame.cc | 15 +-
gui/gui_frame.h | 28 +-
gui/gui_theme.cc | 6 +-
gui/gui_theme.h | 1 +
gui/halt_detail.cc | 14 +-
gui/halt_detail.h | 6 +-
gui/halt_info.cc | 43 +-
gui/halt_info.h | 2 +-
gui/halt_list_filter_frame.cc | 4 +-
gui/halt_list_filter_frame.h | 6 +-
gui/halt_list_frame.cc | 12 +-
gui/halt_list_frame.h | 8 +-
gui/help_frame.cc | 58 +-
gui/jump_frame.h | 2 +-
gui/karte.cc | 66 +-
gui/karte.h | 10 +-
gui/kennfarbe.cc | 22 +-
gui/kennfarbe.h | 6 +-
gui/label_info.cc | 16 +-
gui/label_info.h | 2 +-
gui/labellist_frame_t.h | 2 +-
gui/labellist_stats_t.cc | 10 +-
gui/line_item.cc | 11 +-
gui/line_management_gui.cc | 26 +-
gui/line_management_gui.h | 4 +-
gui/load_relief_frame.h | 2 +-
gui/loadsave_frame.cc | 18 +-
gui/loadsave_frame.h | 4 +-
gui/map_frame.cc | 24 +-
gui/map_frame.h | 2 +-
gui/message_frame_t.cc | 2 +-
gui/message_frame_t.h | 2 +-
gui/message_option_t.h | 2 +-
gui/messagebox.cc | 4 +-
gui/messagebox.h | 6 +-
gui/money_frame.cc | 103 +-
gui/money_frame.h | 6 +-
gui/obj_info.cc | 2 +-
gui/optionen.h | 2 +-
gui/pakselector.h | 2 +-
gui/password_frame.cc | 40 +-
gui/password_frame.h | 6 +-
gui/player_frame_t.cc | 92 +-
gui/player_frame_t.h | 8 +-
gui/privatesign_info.cc | 10 +-
gui/privatesign_info.h | 2 +-
gui/savegame_frame.cc | 21 +-
gui/scenario_frame.h | 2 +-
gui/scenario_info.cc | 6 +-
gui/schedule_list.cc | 384 ++--
gui/schedule_list.h | 55 +-
gui/server_frame.cc | 22 +-
gui/server_frame.h | 2 +-
gui/settings_frame.h | 2 +-
gui/settings_stats.cc | 19 +-
gui/signal_spacing.cc | 12 +-
gui/signal_spacing.h | 14 +-
gui/simwin.cc | 128 +-
gui/sound_frame.h | 2 +-
gui/sprachen.cc | 5 +-
gui/sprachen.h | 2 +-
gui/station_building_select.cc | 8 +-
gui/station_building_select.h | 4 +-
gui/themeselector.cc | 5 +-
gui/themeselector.h | 2 +-
gui/{werkzeug_waehler.cc => tool_selector.cc} | 60 +-
gui/{werkzeug_waehler.h => tool_selector.h} | 32 +-
gui/trafficlight_info.cc | 12 +-
gui/trafficlight_info.h | 2 +-
gui/welt.cc | 9 +-
gui/welt.h | 2 +-
ifc/{fahrer.h => simtestdriver.h} | 17 +-
music/music.h | 5 +-
music/no_midi.cc | 2 +-
music/sdl_midi.cc | 2 +-
music/w32_midi.cc | 2 +-
network/network.cc | 12 +-
network/network.h | 7 +-
network/network_cmd_ingame.cc | 219 +--
network/network_cmd_ingame.h | 12 +-
network/network_file_transfer.cc | 26 +-
network/network_file_transfer.h | 2 +-
nsis/onlineupgrade.nsi | 8 +
nsis/other-functions.nsh | 6 +
nsis/paksets.nsh | 74 +-
nsis/simutrans-offline.nsi | 67 +-
nsis/simutrans.nsi | 21 +-
obj/baum.cc | 101 +-
obj/baum.h | 20 +-
obj/bruecke.cc | 60 +-
obj/bruecke.h | 20 +-
obj/crossing.cc | 22 +-
obj/crossing.h | 43 +-
obj/dummy.h | 2 +-
obj/field.cc | 16 +-
obj/field.h | 10 +-
obj/gebaeude.cc | 199 +-
obj/gebaeude.h | 76 +-
obj/groundobj.cc | 26 +-
obj/groundobj.h | 16 +-
obj/label.cc | 12 +-
obj/label.h | 8 +-
obj/leitung2.cc | 77 +-
obj/leitung2.h | 28 +-
obj/pillar.cc | 12 +-
obj/pillar.h | 10 +-
obj/roadsign.cc | 137 +-
obj/roadsign.h | 24 +-
obj/signal.cc | 33 +-
obj/signal.h | 4 +-
obj/tunnel.cc | 40 +-
obj/tunnel.h | 21 +-
obj/wayobj.cc | 90 +-
obj/wayobj.h | 24 +-
obj/wolke.cc | 8 +-
obj/wolke.h | 6 +-
obj/zeiger.cc | 13 +-
obj/zeiger.h | 11 +-
old_blockmanager.cc | 20 +-
old_blockmanager.h | 8 +-
player/ai.cc | 38 +-
player/ai.h | 12 +-
player/ai_goods.cc | 119 +-
player/ai_goods.h | 6 +-
player/ai_passenger.cc | 85 +-
player/ai_passenger.h | 6 +-
player/finance.cc | 2 +-
player/finance.h | 6 +-
player/simplay.cc | 281 ++-
player/simplay.h | 137 +-
script/api/api_base.h | 34 -
script/api/api_city.cc | 10 +-
script/api/api_const.cc | 112 +-
script/api/api_convoy.cc | 16 +-
script/api/api_factory.cc | 47 +-
script/api/api_gui.cc | 1 -
script/api/api_halt.cc | 20 +-
script/api/api_include.cc | 12 +-
script/api/api_line.cc | 33 +-
script/api/api_map_objects.cc | 122 +-
script/api/api_obj_desc.cc | 6 +-
script/api/api_player.cc | 28 +-
script/api/api_scenario.cc | 41 +-
script/api/api_schedule.cc | 6 +-
script/api/api_settings.cc | 27 +-
script/api/api_simple.cc | 75 +-
script/api/api_skeleton.cc | 10 +
script/api/api_tiles.cc | 33 +-
script/api/api_world.cc | 11 +-
script/api/changelog.h | 14 +
script/api/export_besch.cc | 2 +-
script/api_class.cc | 16 +-
script/api_class.h | 38 +
script/api_function.cc | 4 +-
script/api_function.h | 69 +-
script/api_param.cc | 90 +-
script/api_param.h | 20 +-
script/dynamic_string.cc | 14 +-
script/dynamic_string.h | 4 +-
simcity.cc | 731 +++++---
simcity.h | 120 +-
simcolor.h | 2 +-
simconst.h | 2 +-
simconvoi.cc | 707 +++----
simconvoi.h | 157 +-
simdepot.cc | 108 +-
simdepot.h | 42 +-
simevent.cc | 11 +-
simevent.h | 31 +-
simfab.cc | 1190 ++++++++++--
simfab.h | 111 +-
simhalt.cc | 273 +--
simhalt.h | 56 +-
siminteraction.cc | 66 +-
simintr.cc | 4 +-
simline.cc | 28 +-
simline.h | 23 +-
simlinemgmt.cc | 26 +-
simlinemgmt.h | 12 +-
simloadingscreen.cc | 2 +-
simmain.cc | 65 +-
simmenu.cc | 488 ++---
simmenu.h | 310 +--
simmesg.cc | 4 +-
simobj.cc | 86 +-
simobj.h | 56 +-
simplan.cc | 63 +-
simplan.h | 10 +-
simskin.cc | 20 +-
simskin.h | 10 +-
simsound.cc | 2 +-
simsys.cc | 107 +-
simsys.h | 22 +-
simsys_d.cc | 3 +
simsys_opengl.cc | 4 +
simsys_posix.cc | 17 +-
simsys_s.cc | 6 +-
simsys_s2.cc | 82 +-
simsys_w.cc | 250 ++-
simticker.cc | 2 +-
simtool-dialogs.h | 518 +++++
simwerkz.cc => simtool.cc | 1970 ++++++++++++--------
simtool.h | 1051 +++++++++++
simtypes.h | 16 +-
simutrans/config/simuconf.tab | 18 +-
simutrans/font/cyr.bdf | 2 +-
simutrans/history.txt | 15 +-
simutrans/license_squirrel.txt | 2 +-
simutrans/text/de/convoidetail.txt | 15 +-
simutrans/text/de/convoiinfo.txt | 3 +
simutrans/text/de/linemanagement.txt | 7 +-
.../translations/sq.tab => simutrans/text/xx.tab | 22 +-
simversion.h | 8 +-
simware.cc | 2 +-
simware.h | 4 +-
simwerkz-dialogs.h | 519 ------
simwerkz.h | 1042 -----------
simworld.cc | 604 +++---
simworld.h | 94 +-
sound/sdl_sound.cc | 1 +
sound/win32_sound.cc | 2 +-
squirrel/sq_extensions.cc | 3 +-
squirrel/sq_extensions.h | 3 +-
squirrel/sqstdlib/sqstdrex.cc | 2 +-
squirrel/squirrel.h | 10 +-
squirrel/squirrel/sqbaselib.cc | 15 +-
squirrel/squirrel/sqcompiler.cc | 6 +-
squirrel/squirrel/sqdebug.cc | 3 +-
squirrel/squirrel/sqvm.cc | 19 +-
squirrel/squirrel/sqvm.h | 1 +
tpl/weighted_vector_tpl.h | 34 +-
unicode.cc | 15 +-
unicode.h | 6 +-
utils/searchfolder.cc | 17 +-
simtools.cc => utils/simrandom.cc | 8 +-
simtools.h => utils/simrandom.h | 6 +-
utils/simstring.cc | 41 +-
utils/simstring.h | 4 +
utils/simthread.h | 5 +
vehicle/movingobj.cc | 118 +-
vehicle/movingobj.h | 25 +-
vehicle/overtaker.h | 4 +-
vehicle/simpeople.cc | 78 +-
vehicle/simpeople.h | 22 +-
vehicle/{simverkehr.cc => simroadtraffic.cc} | 248 +--
vehicle/{simverkehr.h => simroadtraffic.h} | 42 +-
vehicle/{simvehikel.cc => simvehicle.cc} | 1133 +++++------
vehicle/{simvehikel.h => simvehicle.h} | 386 ++--
449 files changed, 13314 insertions(+), 9767 deletions(-)
rename gui/{stadt_info.cc => city_info.cc} (58%)
rename gui/{stadt_info.h => city_info.h} (58%)
rename gui/{werkzeug_waehler.cc => tool_selector.cc} (78%)
rename gui/{werkzeug_waehler.h => tool_selector.h} (70%)
rename ifc/{fahrer.h => simtestdriver.h} (63%)
create mode 100644 simtool-dialogs.h
rename simwerkz.cc => simtool.cc (72%)
create mode 100644 simtool.h
copy debian/translations/sq.tab => simutrans/text/xx.tab (68%)
delete mode 100644 simwerkz-dialogs.h
delete mode 100644 simwerkz.h
rename simtools.cc => utils/simrandom.cc (98%)
rename simtools.h => utils/simrandom.h (97%)
rename vehicle/{simverkehr.cc => simroadtraffic.cc} (79%)
rename vehicle/{simverkehr.h => simroadtraffic.h} (78%)
rename vehicle/{simvehikel.cc => simvehicle.cc} (77%)
rename vehicle/{simvehikel.h => simvehicle.h} (56%)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git