[simutrans] branch master updated (eabcd3e -> b27b469)
Jörg Frings-Fürst
jff-guest at moszumanska.debian.org
Tue Oct 6 13:14:43 UTC 2015
This is an automated email from the git hooks/post-receive script.
jff-guest pushed a change to branch master
in repository simutrans.
from eabcd3e quilt pop -a
new d5a5359 reimport source
new 054bbc8 some work on buildsystem
new b27b469 build system work
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 | 24 +-
Makeobj.vcproj | 605 ---
Nettool.vcproj | 302 --
OSX/binary_picker.sh | 38 -
OSX/osx.mk | 48 -
OSX/plistgen.sh | 48 -
OSX/simutrans.icns | Bin 172520 -> 0 bytes
OSX/simutrans.sh | 10 -
Simutrans.sln | 20 -
bauer/brueckenbauer.cc | 266 +-
bauer/brueckenbauer.h | 24 +-
bauer/fabrikbauer.cc | 30 +-
bauer/fabrikbauer.h | 8 +-
bauer/hausbauer.cc | 97 +-
bauer/hausbauer.h | 12 +-
bauer/tunnelbauer.cc | 140 +-
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 | 24 +-
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 +-
boden/boden.cc | 11 +-
boden/boden.h | 2 +-
boden/brueckenboden.cc | 51 +-
boden/brueckenboden.h | 2 +-
boden/fundament.cc | 19 +-
boden/fundament.h | 2 +-
boden/grund.cc | 109 +-
boden/grund.h | 103 +-
boden/monorailboden.cc | 17 +-
boden/monorailboden.h | 2 +-
boden/tunnelboden.cc | 38 +-
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 | 56 +-
boden/wege/weg.h | 23 +-
buildOSXbundle.sh | 150 -
common.mk | 4 +-
configure.ac | 114 -
configure.sh | 6156 +++++++++++++++++++++++++
dataobj/crossing_logic.cc | 12 +-
dataobj/crossing_logic.h | 14 +-
dataobj/environment.cc | 17 +-
dataobj/environment.h | 11 +-
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 | 4 +-
dataobj/objlist.cc | 99 +-
dataobj/objlist.h | 12 +-
dataobj/records.cc | 11 +-
dataobj/records.h | 8 +-
dataobj/ribi.cc | 38 +-
dataobj/ribi.h | 49 +-
dataobj/route.cc | 130 +-
dataobj/route.h | 79 +-
dataobj/scenario.cc | 94 +-
dataobj/scenario.h | 39 +-
dataobj/settings.cc | 96 +-
dataobj/settings.h | 31 +-
dataobj/translator.cc | 85 +-
dataobj/translator.h | 1 -
debian/changelog | 8 +-
debian/control | 2 +-
debian/patches/series | 1 +
debian/rules | 3 +
display/scr_coord.h | 14 +-
display/simgraph.h | 68 +-
display/simgraph0.cc | 58 +-
display/simgraph16.cc | 81 +-
display/simimg.h | 4 +-
display/simview.cc | 19 +-
display/viewport.cc | 8 +-
display/viewport.h | 14 +-
distribute.sh | 133 -
findversion.sh | 28 -
get_lang_files.sh | 51 -
get_pak.sh | 158 -
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/citybuilding_edit.cc | 18 +-
gui/citybuilding_edit.h | 8 +-
gui/citylist_frame_t.h | 2 +-
gui/climates.h | 2 +-
gui/components/gui_button.cc | 3 +-
gui/components/gui_button.h | 5 -
gui/components/gui_convoiinfo.cc | 6 +-
gui/components/gui_obj_view_t.cc | 4 +-
gui/components/gui_textinput.cc | 134 +-
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 | 38 +-
gui/convoi_frame.h | 8 +-
gui/convoi_info_t.cc | 31 +-
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.h | 2 +-
gui/curiositylist_stats_t.cc | 2 +-
gui/depot_frame.cc | 81 +-
gui/depot_frame.h | 4 +-
gui/display_settings.cc | 20 +-
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_edit.cc | 24 +-
gui/factory_edit.h | 16 +-
gui/factorylist_frame_t.h | 2 +-
gui/fahrplan_gui.cc | 93 +-
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/halt_detail.cc | 14 +-
gui/halt_detail.h | 6 +-
gui/halt_info.cc | 34 +-
gui/halt_info.h | 2 +-
gui/halt_list_filter_frame.cc | 4 +-
gui/halt_list_filter_frame.h | 6 +-
gui/halt_list_frame.cc | 10 +-
gui/halt_list_frame.h | 8 +-
gui/help_frame.cc | 55 +-
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 | 15 +-
gui/loadsave_frame.h | 4 +-
gui/map_frame.cc | 22 +-
gui/map_frame.h | 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 | 88 +-
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 | 76 +-
gui/player_frame_t.h | 8 +-
gui/privatesign_info.cc | 10 +-
gui/privatesign_info.h | 2 +-
gui/savegame_frame.cc | 19 +-
gui/scenario_frame.h | 2 +-
gui/scenario_info.cc | 6 +-
gui/schedule_list.cc | 78 +-
gui/schedule_list.h | 8 +-
gui/server_frame.cc | 4 +-
gui/server_frame.h | 2 +-
gui/settings_frame.h | 2 +-
gui/settings_stats.cc | 17 +-
gui/signal_spacing.cc | 12 +-
gui/signal_spacing.h | 14 +-
gui/simwin.cc | 124 +-
gui/sound_frame.h | 2 +-
gui/sprachen.cc | 3 +-
gui/sprachen.h | 2 +-
gui/stadt_info.cc | 16 +-
gui/stadt_info.h | 4 +-
gui/station_building_select.cc | 8 +-
gui/station_building_select.h | 4 +-
gui/themeselector.h | 2 +-
gui/trafficlight_info.cc | 12 +-
gui/trafficlight_info.h | 2 +-
gui/welt.cc | 9 +-
gui/welt.h | 2 +-
gui/{tool_selector.cc => werkzeug_waehler.cc} | 60 +-
gui/{tool_selector.h => werkzeug_waehler.h} | 32 +-
ifc/{simtestdriver.h => fahrer.h} | 17 +-
music/music.h | 5 +-
music/no_midi.cc | 2 +-
music/sdl_midi.cc | 2 +-
music/w32_midi.cc | 2 +-
nettools/Makefile | 106 -
network/network.cc | 12 +-
network/network.h | 7 +-
network/network_cmd_ingame.cc | 214 +-
network/network_cmd_ingame.h | 12 +-
network/network_file_transfer.cc | 8 +-
network/network_file_transfer.h | 2 +-
nsis/onlineupgrade.nsi | 8 -
nsis/other-functions.nsh | 6 -
nsis/paksets.nsh | 61 +-
nsis/simutrans.nsi | 9 +-
obj/baum.cc | 101 +-
obj/baum.h | 20 +-
obj/bruecke.cc | 60 +-
obj/bruecke.h | 20 +-
obj/crossing.cc | 18 +-
obj/crossing.h | 35 +-
obj/dummy.h | 2 +-
obj/field.cc | 16 +-
obj/field.h | 10 +-
obj/gebaeude.cc | 194 +-
obj/gebaeude.h | 76 +-
obj/groundobj.cc | 26 +-
obj/groundobj.h | 16 +-
obj/label.cc | 12 +-
obj/label.h | 8 +-
obj/leitung2.cc | 73 +-
obj/leitung2.h | 28 +-
obj/pillar.cc | 12 +-
obj/pillar.h | 10 +-
obj/roadsign.cc | 133 +-
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 | 33 +-
player/ai.h | 4 +-
player/ai_goods.cc | 117 +-
player/ai_goods.h | 4 +-
player/ai_passenger.cc | 83 +-
player/ai_passenger.h | 4 +-
player/finance.cc | 2 +-
player/finance.h | 6 +-
player/simplay.cc | 276 +-
player/simplay.h | 128 +-
revision.jse | 43 -
script/api/Doxyfile_SQAPI | 42 -
script/api/api_base.h | 34 +
script/api/api_city.cc | 10 +-
script/api/api_const.cc | 110 +-
script/api/api_convoy.cc | 4 +-
script/api/api_gui.cc | 1 +
script/api/api_halt.cc | 2 +-
script/api/api_line.cc | 6 +-
script/api/api_map_objects.cc | 61 +-
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 | 25 +-
script/api/api_world.cc | 11 +-
script/api/changelog.h | 11 -
script/api/export.awk | 221 -
script/api/export_besch.cc | 2 +-
script/api/filter_cpp.sh | 4 -
script/api/filter_sq.sh | 4 -
script/api/squirrel_types.awk | 246 -
script/api_class.cc | 7 +-
script/api_function.cc | 4 +-
script/api_function.h | 21 +-
script/api_param.cc | 18 +-
script/api_param.h | 4 +-
script/dynamic_string.cc | 14 +-
script/dynamic_string.h | 4 +-
simcity.cc | 379 +-
simcity.h | 78 +-
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 | 254 +-
simhalt.h | 56 +-
siminteraction.cc | 66 +-
simintr.cc | 4 +-
simline.cc | 24 +-
simline.h | 16 +-
simlinemgmt.cc | 26 +-
simlinemgmt.h | 12 +-
simloadingscreen.cc | 2 +-
simmain.cc | 49 +-
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 | 8 +-
simsys.h | 13 +-
simsys_d.cc | 3 -
simsys_opengl.cc | 4 -
simsys_posix.cc | 61 +-
simsys_s.cc | 4 -
simsys_s2.cc | 82 +-
simsys_w.cc | 236 +-
simticker.cc | 2 +-
simtool-dialogs.h | 518 ---
simtool.h | 1051 -----
utils/simrandom.cc => simtools.cc | 8 +-
utils/simrandom.h => simtools.h | 6 +-
simtypes.h | 14 +-
simutrans/config/simuconf.tab | 15 +-
simutrans/history.txt | 10 +-
simutrans/license_squirrel.txt | 2 +-
simutrans/script/new_scenario_template.nut | 125 -
simutrans/script/scenario_base.nut | 674 ---
simutrans/script/scenario_compat.nut | 36 -
simutrans/text/cz/airtools.txt | 129 +-
simutrans/text/cz/baum_build.txt | 4 +
simutrans/text/cz/bridges.txt | 22 +-
simutrans/text/cz/citybuilding_build.txt | 22 +-
simutrans/text/cz/citylist_filter.txt | 9 +-
simutrans/text/cz/citywindow.txt | 43 +-
simutrans/text/cz/climates.txt | 40 +-
simutrans/text/cz/convoi.txt | 24 +-
simutrans/text/cz/convoi_filter.txt | 7 +-
simutrans/text/cz/convoidetail.txt | 9 +-
simutrans/text/cz/convoiinfo.txt | 49 +-
simutrans/text/cz/curiosity_build.txt | 5 +-
simutrans/text/cz/curiositylist_filter.txt | 5 +-
simutrans/text/cz/depot.txt | 2 +-
simutrans/text/cz/finances.txt | 79 +-
simutrans/text/cz/settings.txt | 417 +-
simutrans/text/de/airtools.txt | 2 +-
simutrans/text/de/convoi.txt | 2 +-
simutrans/text/de/convoiinfo.txt | 8 +-
simutrans/text/de/display.txt | 14 +-
simutrans/text/de/load.txt | 12 +-
simutrans/text/de/monorailtools.txt | 2 +-
simutrans/text/de/save.txt | 4 +-
simutrans/text/de/sound.txt | 6 +-
simutrans/text/de/underground.txt | 2 +-
simutrans/text/de/window.txt | 2 +-
simutrans/text/en/citywindow.txt | 6 +-
simutrans/text/en/climates.txt | 2 +-
simutrans/text/en/convoiinfo.txt | 2 +-
simutrans/text/en/curiosity_build.txt | 24 +-
simutrans/text/en/finances.txt | 2 +-
simutrans/text/en/language.txt | 2 +-
simutrans/text/en/new_world.txt | 2 +-
simutrans/text/en/removal_tool.txt | 2 +-
simutrans/text/en/signal_spacing.txt | 2 +-
simutrans/text/en/simutrans.txt | 2 +-
simutrans/text/fr/airtools.txt | 2 +-
simutrans/text/fr/finances.txt | 2 +-
simutrans/text/fr/options.txt | 2 +-
simutrans/text/fr/railtools.txt | 14 +-
simutrans/text/hr/citybuilding_build.txt | 26 +-
simutrans/text/hr/citywindow.txt | 6 +-
simutrans/text/hr/climates.txt | 2 +-
simutrans/text/hr/language.txt | 2 +-
simutrans/text/hr/simutrans.txt | 2 +-
simutrans/text/hr/underground.txt | 2 +-
simutrans/text/it/baum_build.txt | 16 +-
simutrans/text/it/citywindow.txt | 4 +-
simutrans/text/it/climates.txt | 2 +-
simutrans/text/it/display.txt | 12 +-
simutrans/text/it/haltlist.txt | 24 +-
simutrans/text/ja/map.txt | 2 +-
simutrans/text/ja/slopetools.txt | 9 +-
simutrans/text/ja/sound.txt | 6 +-
simutrans/text/ja/station.txt | 2 +-
simutrans/text/ko/map.txt | 2 +-
simutrans/text/pt/curiosity_build.txt | 24 +-
simutrans/text/pt/scenario.txt | 12 +-
simutrans/text/pt/trafficlight_info.txt | 10 +-
simutrans/text/ru/color.txt | 26 +-
simutrans/text/sk/finances.txt | 3 +-
simutrans/text/sv/citywindow.txt | 4 +-
simutrans/text/sv/signal_spacing.txt | 2 +-
simutrans/text/tr/airtools.txt | 44 +-
simversion.h | 6 +-
simware.cc | 2 +-
simware.h | 4 +-
simwerkz-dialogs.h | 519 +++
simtool.cc => simwerkz.cc | 1899 +++-----
simwerkz.h | 1042 +++++
simworld.cc | 554 +--
simworld.h | 74 +-
sound/sdl_sound.cc | 1 -
sound/win32_sound.cc | 2 +-
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 | 17 +-
squirrel/squirrel/sqvm.h | 1 -
themes.src/aero/skins_aero.dat | 122 -
themes.src/standard/standard.dat | 218 -
tpl/weighted_vector_tpl.h | 26 +-
uncommon.mk | 56 -
unicode.cc | 15 +-
unicode.h | 6 +-
utils/simstring.cc | 2 +-
vehicle/movingobj.cc | 118 +-
vehicle/movingobj.h | 25 +-
vehicle/overtaker.h | 4 +-
vehicle/simpeople.cc | 78 +-
vehicle/simpeople.h | 22 +-
vehicle/{simvehicle.cc => simvehikel.cc} | 1122 +++--
vehicle/{simvehicle.h => simvehikel.h} | 381 +-
vehicle/{simroadtraffic.cc => simverkehr.cc} | 248 +-
vehicle/{simroadtraffic.h => simverkehr.h} | 42 +-
477 files changed, 15789 insertions(+), 15344 deletions(-)
delete mode 100644 Makeobj.vcproj
delete mode 100644 Nettool.vcproj
delete mode 100644 OSX/binary_picker.sh
delete mode 100644 OSX/osx.mk
delete mode 100644 OSX/plistgen.sh
delete mode 100644 OSX/simutrans.icns
delete mode 100644 OSX/simutrans.sh
delete mode 100644 Simutrans.sln
delete mode 100644 buildOSXbundle.sh
delete mode 100644 configure.ac
create mode 100644 configure.sh
delete mode 100755 distribute.sh
delete mode 100644 findversion.sh
delete mode 100755 get_lang_files.sh
delete mode 100755 get_pak.sh
rename gui/{tool_selector.cc => werkzeug_waehler.cc} (78%)
rename gui/{tool_selector.h => werkzeug_waehler.h} (70%)
rename ifc/{simtestdriver.h => fahrer.h} (63%)
delete mode 100644 nettools/Makefile
delete mode 100644 revision.jse
delete mode 100644 script/api/Doxyfile_SQAPI
delete mode 100644 script/api/export.awk
delete mode 100755 script/api/filter_cpp.sh
delete mode 100755 script/api/filter_sq.sh
delete mode 100644 script/api/squirrel_types.awk
delete mode 100644 simtool-dialogs.h
delete mode 100644 simtool.h
rename utils/simrandom.cc => simtools.cc (98%)
rename utils/simrandom.h => simtools.h (97%)
delete mode 100644 simutrans/script/new_scenario_template.nut
delete mode 100644 simutrans/script/scenario_base.nut
delete mode 100644 simutrans/script/scenario_compat.nut
create mode 100644 simwerkz-dialogs.h
rename simtool.cc => simwerkz.cc (72%)
create mode 100644 simwerkz.h
delete mode 100644 themes.src/aero/skins_aero.dat
delete mode 100644 themes.src/standard/standard.dat
delete mode 100644 uncommon.mk
rename vehicle/{simvehicle.cc => simvehikel.cc} (77%)
rename vehicle/{simvehicle.h => simvehikel.h} (56%)
rename vehicle/{simroadtraffic.cc => simverkehr.cc} (79%)
rename vehicle/{simroadtraffic.h => simverkehr.h} (78%)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/simutrans.git
More information about the Pkg-games-commits
mailing list