Update to OpenTTD 1.9.0-beta2

--HG--
branch : openttd
This commit is contained in:
Pavel Stupnikov
2019-02-13 15:17:23 +03:00
parent 42ec3bd611
commit 2bda8d4f34
1362 changed files with 22145 additions and 10644 deletions

View File

@@ -95,22 +95,19 @@ tilearea.cpp
townname.cpp
#if WIN32
#else
#if WINCE
#if OS2
os/os2/os2.cpp
3rdparty/os2/getaddrinfo.c
3rdparty/os2/getaddrinfo.h
3rdparty/os2/getnameinfo.c
3rdparty/os2/getnameinfo.h
#else
#if OS2
os/os2/os2.cpp
3rdparty/os2/getaddrinfo.c
3rdparty/os2/getaddrinfo.h
3rdparty/os2/getnameinfo.c
3rdparty/os2/getnameinfo.h
#if OSX
os/macosx/crashlog_osx.cpp
#else
#if OSX
os/macosx/crashlog_osx.cpp
#else
os/unix/crashlog_unix.cpp
#end
os/unix/unix.cpp
os/unix/crashlog_unix.cpp
#end
os/unix/unix.cpp
#end
#end
vehicle.cpp
@@ -196,6 +193,7 @@ fileio_type.h
fios.h
fontcache.h
fontdetection.h
framerate_type.h
base_consist.h
gamelog.h
gamelog_internal.h
@@ -212,6 +210,7 @@ group.h
group_gui.h
group_type.h
gui.h
guitimer_func.h
heightmap.h
highscore.h
hotkeys.h
@@ -284,6 +283,8 @@ newgrf_townname.h
news_func.h
news_gui.h
news_type.h
music/midi.h
music/midifile.hpp
music/null_m.h
sound/null_s.h
video/null_v.h
@@ -344,6 +345,7 @@ strgen/strgen.h
string_base.h
string_func.h
string_type.h
os/windows/string_uniscribe.h
stringfilter_type.h
strings_func.h
strings_type.h
@@ -397,6 +399,7 @@ video/win32_v.h
window_func.h
window_gui.h
window_type.h
sound/xaudio2_s.h
zoom_func.h
zoom_type.h
#if WIN32
@@ -405,11 +408,13 @@ music/bemidi.h
music/cocoa_m.h
music/extmidi.h
music/libtimidity.h
music/fluidsynth.h
music/os2_m.h
music/qtmidi.h
os/macosx/macos.h
os/macosx/osx_stdafx.h
os/macosx/splash.h
os/macosx/string_osx.h
sound/cocoa_s.h
video/cocoa/cocoa_keys.h
video/cocoa/cocoa_v.h
@@ -461,6 +466,7 @@ dock_gui.cpp
engine_gui.cpp
error_gui.cpp
fios_gui.cpp
framerate_gui.cpp
genworld_gui.cpp
goal_gui.cpp
graph_gui.cpp
@@ -524,6 +530,7 @@ widgets/dropdown_widget.h
widgets/engine_widget.h
widgets/error_widget.h
widgets/fios_widget.h
widgets/framerate_widget.h
widgets/genworld_widget.h
widgets/goal_widget.h
widgets/graph_widget.h
@@ -782,6 +789,8 @@ script/api/script_bridgelist.hpp
script/api/script_cargo.hpp
script/api/script_cargolist.hpp
script/api/script_cargomonitor.hpp
script/api/script_client.hpp
script/api/script_clientlist.hpp
script/api/script_company.hpp
script/api/script_companymode.hpp
script/api/script_controller.hpp
@@ -849,6 +858,8 @@ script/api/script_bridgelist.cpp
script/api/script_cargo.cpp
script/api/script_cargolist.cpp
script/api/script_cargomonitor.cpp
script/api/script_client.cpp
script/api/script_clientlist.cpp
script/api/script_company.cpp
script/api/script_companymode.cpp
script/api/script_controller.cpp
@@ -909,6 +920,8 @@ script/api/script_window.cpp
blitter/32bpp_anim.cpp
blitter/32bpp_anim.hpp
#if SSE
blitter/32bpp_anim_sse2.cpp
blitter/32bpp_anim_sse2.hpp
blitter/32bpp_anim_sse4.cpp
blitter/32bpp_anim_sse4.hpp
#end
@@ -935,8 +948,8 @@ blitter/8bpp_optimized.hpp
blitter/8bpp_simple.cpp
blitter/8bpp_simple.hpp
#end
blitter/base.cpp
blitter/base.hpp
blitter/common.hpp
blitter/factory.hpp
blitter/null.cpp
blitter/null.hpp
@@ -1084,9 +1097,6 @@ video/null_v.cpp
#if WIN32
video/win32_v.cpp
#end
#if WINCE
video/win32_v.cpp
#end
#end
# Music
@@ -1100,22 +1110,17 @@ video/null_v.cpp
#end
#end
music/null_m.cpp
music/midifile.cpp
#if DEDICATED
#else
#if WIN32
music/win32_m.cpp
#else
#if WINCE
#if DOS
#else
#if PSP
#if MORPHOS
#else
#if DOS
#else
#if MORPHOS
#else
music/extmidi.cpp
#end
#end
music/extmidi.cpp
#end
#end
#end
@@ -1125,6 +1130,9 @@ music/null_m.cpp
#if LIBTIMIDITY
music/libtimidity.cpp
#end
#if FLUIDSYNTH
music/fluidsynth.cpp
#end
#end
# Sound
@@ -1139,6 +1147,7 @@ sound/null_s.cpp
#end
#if WIN32
sound/win32_s.cpp
sound/xaudio2_s.cpp
#end
#end
@@ -1160,6 +1169,7 @@ sound/null_s.cpp
music/cocoa_m.cpp
sound/cocoa_s.cpp
os/macosx/splash.cpp
os/macosx/string_osx.cpp
#end
#end
@@ -1167,10 +1177,7 @@ sound/null_s.cpp
#if WIN32
os/windows/crashlog_win.cpp
os/windows/ottdres.rc
os/windows/win32.cpp
#end
#if WINCE
os/windows/ottdres.rc
os/windows/string_uniscribe.cpp
os/windows/win32.cpp
#end