mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-02-03 04:05:49 +01:00
Code Issues Releases Wiki Activity

Merge pull request #25915 from Peppersawce/develop

Browse Source 
Re-enable multithreading on Haiku
This commit is contained in:
Michael Steenbeek
2026-02-01 22:23:04 +01:00
committed by GitHub
parent cb27bc9e57 d28d4ae18f
commit 11439f48a5
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/openrct2/config/Config.cpp
View File

@@ -50,11 +50,6 @@ static constexpr bool kEnlargedUiDefault = true;
#else
static constexpr bool kEnlargedUiDefault = false;
#endif
#ifdef __HAIKU__ // Multi-threading is unstable here
static constexpr bool kMultiThreadingDefault = false;
#else
static constexpr bool kMultiThreadingDefault = true;
#endif
namespace OpenRCT2::Config
{
@@ -243,7 +238,7 @@ namespace OpenRCT2::Config
// Always have multi-threading disabled in debug builds, this makes things slower.
model->multiThreading = false;
#else
model->multiThreading = reader->GetBoolean("multithreading", kMultiThreadingDefault);
model->multiThreading = reader->GetBoolean("multithreading", true);
#endif // _DEBUG
model->trapCursor = reader->GetBoolean("trap_cursor", false);
model->autoOpenShops = reader->GetBoolean("auto_open_shops", false);

2
src/openrct2/core/String.cpp
View File

@@ -38,7 +38,7 @@
#include "StringBuilder.h"
#include "UTF8.h"
#if defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
#if defined(__unix__) || defined(__HAIKU__) || (defined(__APPLE__) && defined(__MACH__))
#include <strings.h>
#define _stricmp(x, y) strcasecmp((x), (y))
#endif