summaryrefslogtreecommitdiff
path: root/src/video
diff options
context:
space:
mode:
Diffstat (limited to 'src/video')
-rw-r--r--src/video/dedicated_v.cpp5
-rw-r--r--src/video/null_v.cpp5
2 files changed, 10 insertions, 0 deletions
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp
index d5f63d818..8a3be5bd6 100644
--- a/src/video/dedicated_v.cpp
+++ b/src/video/dedicated_v.cpp
@@ -163,6 +163,11 @@ const char *VideoDriver_Dedicated::Start(const char * const *parm)
SetConsoleTitle(_T("OpenTTD Dedicated Server"));
#endif
+#ifdef _MSC_VER
+ /* Disable the MSVC assertion message box. */
+ _set_error_mode(_OUT_TO_STDERR);
+#endif
+
#ifdef __OS2__
/* For OS/2 we also need to switch to console mode instead of PM mode */
OS2_SwitchToConsoleMode();
diff --git a/src/video/null_v.cpp b/src/video/null_v.cpp
index 6b4aa1c66..6fdb87648 100644
--- a/src/video/null_v.cpp
+++ b/src/video/null_v.cpp
@@ -19,6 +19,11 @@ static FVideoDriver_Null iFVideoDriver_Null;
const char *VideoDriver_Null::Start(const char * const *parm)
{
+#ifdef _MSC_VER
+ /* Disable the MSVC assertion message box. */
+ _set_error_mode(_OUT_TO_STDERR);
+#endif
+
this->ticks = GetDriverParamInt(parm, "ticks", 1000);
_screen.width = _screen.pitch = _cur_resolution.width;
_screen.height = _cur_resolution.height;