dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into jgrpp

Browse Source 
# Conflicts:
#	src/crashlog.cpp
#	src/gfx.cpp
#	src/network/network_client.cpp
#	src/openttd.cpp
#	src/openttd.h
#	src/saveload/saveload.cpp
#	src/survey.cpp
This commit is contained in:
Jonathan G Rennison
2024-03-16 18:06:09 +00:00
parent 8066309074 3e625b5b1a
commit 041e71ec05
32 changed files with 857 additions and 749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/video/cocoa/cocoa_wnd.mm
View File

@@ -792,7 +792,12 @@ void CocoaDialog(const char *title, const char *message, const char *buttonLabel
case QZ_LEFT: SB(_dirkeys, 0, 1, down); break;
case QZ_RIGHT: SB(_dirkeys, 2, 1, down); break;
case QZ_TAB: _tab_is_down = down; break;
case QZ_TAB:
_tab_is_down = down;
if (down && EditBoxInGlobalFocus()) {
HandleKeypress(WKC_TAB, unicode);
}
break;
case QZ_RETURN:
case QZ_f:

2
src/video/dedicated_v.cpp
View File

@@ -126,6 +126,8 @@ const char *VideoDriver_Dedicated::Start(const StringList &)
#ifdef _MSC_VER
/* Disable the MSVC assertion message box. */
_set_error_mode(_OUT_TO_STDERR);
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
#endif
DEBUG(driver, 1, "Loading dedicated server");

2
src/video/null_v.cpp
View File

@@ -29,6 +29,8 @@ const char *VideoDriver_Null::Start(const StringList &parm)
#ifdef _MSC_VER
/* Disable the MSVC assertion message box. */
_set_error_mode(_OUT_TO_STDERR);
_CrtSetReportMode(_CRT_ASSERT, _CRTDBG_MODE_FILE);
_CrtSetReportFile(_CRT_ASSERT, _CRTDBG_FILE_STDERR);
#endif
this->UpdateAutoResolution();