Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow loading CSS17.DAT and MP.DAT on all three RCT1 sources #7895

Merged
merged 1 commit into from
Aug 14, 2018

Conversation

Gymnasiast
Copy link
Member

@Gymnasiast Gymnasiast commented Aug 13, 2018

This should equalise the three in terms of supported features.

@Gymnasiast Gymnasiast merged commit f9d60ea into OpenRCT2:develop Aug 14, 2018
@Gymnasiast Gymnasiast deleted the rct1-disc-gog-steam branch August 14, 2018 13:41
@AaronVanGeffen
Copy link
Member

Unfortunately, this PR has caused a regression:

$ gdb ./openrct2
[...]
terminate called after throwing an instance of 'IOException'
  what():  Unable to open ''

Thread 1 "openrct2" received signal SIGABRT, Aborted.
0x00007ffff5a21b5f in raise () from /usr/lib/libc.so.6
(gdb) bt
#0  0x00007ffff5a21b5f in raise () from /usr/lib/libc.so.6
#1  0x00007ffff5a0c452 in abort () from /usr/lib/libc.so.6
#2  0x00007ffff5ddf58e in __gnu_cxx::__verbose_terminate_handler () at /build/gcc/src/gcc/libstdc++-v3/libsupc++/vterminate.cc:95
#3  0x00007ffff5de5dfa in __cxxabiv1::__terminate(void (*)()) () at /build/gcc/src/gcc/libstdc++-v3/libsupc++/eh_terminate.cc:47
#4  0x00007ffff5de5e57 in std::terminate () at /build/gcc/src/gcc/libstdc++-v3/libsupc++/eh_terminate.cc:57
#5  0x00007ffff5de60ac in __cxxabiv1::__cxa_throw (obj=<optimized out>, tinfo=0x5555561f9a90 <typeinfo for IOException>, 
    dest=0x55555581bd20 <IOException::~IOException()>) at /build/gcc/src/gcc/libstdc++-v3/libsupc++/eh_throw.cc:95
#6  0x000055555581c1b7 in FileStream::FileStream(char const*, int) ()
#7  0x000055555581bcb6 in FileStream::FileStream(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, int) ()
#8  0x00005555559402ea in File::WriteAllBytes(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, void const*, unsigned long) ()
#9  0x0000555555eae564 in ScenarioRepository::ConvertMegaPark(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&) ()
#10 0x0000555555ead8ea in ScenarioRepository::ImportMegaPark() ()
#11 0x0000555555eaaf6b in ScenarioRepository::Scan(int) ()
#12 0x00005555558f5e4d in OpenRCT2::Context::Initialise() ()
#13 0x00005555558f5523 in OpenRCT2::Context::RunOpenRCT2(int, char const**) ()
#14 0x00005555557edd27 in main ()

Broxzier added a commit to Broxzier/OpenRCT2 that referenced this pull request Aug 14, 2018
Broxzier added a commit that referenced this pull request Aug 14, 2018
janisozaur added a commit that referenced this pull request Aug 26, 2018
- Feature: [#5993] Ride window prices can now be set via text input.
- Feature: [#6998] Guests now wait for passing vehicles before crossing railway tracks.
- Feature: [#7658] Add option to always use system file browsing window.
- Feature: [#7694] Debug option to visualize paths that the game detects as wide.
- Feature: [#7713] The virtual floor now takes land ownership rights into account.
- Feature: [#7771] Danish translation.
- Feature: [#7797, #7802, #7821, #7830] Add sprite font glyphs for Danish, Norwegian, Russian, Turkish, Catalan and Romanian.
- Feature: [#7848] Add a master volume slider to audio options screen.
- Feature: [#7868] Placing scenery while holding shift now scales appropriately with zoom levels.
- Feature: [#7882] Auto-detect Steam and GOG installations of RCT1.
- Feature: [#7885] Turkish translation.
- Fix: [#3177] Wrong keys displayed in shortcut menu.
- Fix: [#4039] No sprite font glyph for German opening quotation mark.
- Fix: [#5548] platform_get_locale_date_format is not implemented for Linux.
- Fix: [#7204] Object source filters do not work for RCT1, AA and LL.
- Fix: [#7440] Memory leak. All system memory used.
- Fix: [#7462] Guest window goes beyond the map edge on a spiral slide.
- Fix: [#7533] Screenshot is incorrectly named/file is not generated in CJK language.
- Fix: [#7628] Always-researched items can be modified in the inventory list.
- Fix: [#7643] No Money scenarios with funding set to zero.
- Fix: [#7653] Finances money spinner is too narrow for big loans.
- Fix: [#7673] Vehicle names are cut off in invention list.
- Fix: [#7674] Rides show up as random numbers in guest's ride list.
- Fix: [#7678] Crash when loading or starting a new game while having object selection window open.
- Fix: [#7683] 'Arbitrary ride type' dropdown state is shared between windows.
- Fix: [#7697] Some scenery groups in RCT1 saves are never invented.
- Fix: [#7711] Inverted Hairpin Coaster allows building invisible banked pieces.
- Fix: [#7734] Title sequence not included in macOS builds as of 0.2.0 release.
- Fix: [#7756] Steam RCT2 path not correctly checked on macOS and Linux.
- Fix: [#7765] Crash when opening ride list window on Windows Vista.
- Fix: [#7773] Once research has been completed, player is still charged for research.
- Fix: [#7786] Crash when importing a track design.
- Fix: [#7793] Duplicate private keys generated.
- Fix: [#7817] No sprite font glyph for interpunct.
- Fix: [#7823] You can build mazes in pause mode.
- Fix: [#7804] Russian ride descriptions are cut off.
- Fix: [#7872] CJK tooltips are often cut off.
- Fix: [#7895] Import of Mega Park and the RCT1 title music do not work on some RCT1 sources.
- Improved: [#7899] Timestamps in the load/save screen are now displayed using local timezone instead of GMT.
- Improved: [#7918] Better RCT2 detection if both disc and GOG/Steam versions are installed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants