1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-09 14:46:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Detect cnc-ddraw and disable windowed mode

Browse Source
This commit is contained in:
FunkyFr3sh
2022-10-14 13:24:47 +02:00
committed by GitHub
parent 9cc567644f
commit 5441cd3326
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Standard Gaming Platform/sgp.cpp
+7 -4
View File
@@ -1384,6 +1384,9 @@ void SGPExit(void)
void GetRuntimeSettings( ) void GetRuntimeSettings( )
{ {
int iMaximize; int iMaximize;
/* Detect cnc-ddraw and disable windowed mode */
BOOL bCncDdraw = GetProcAddress(GetModuleHandleW(L"ddraw.dll"), "GameHandlesClose") != NULL;
#ifndef USE_VFS #ifndef USE_VFS
CHAR8 zMaximize[ 50 ]; CHAR8 zMaximize[ 50 ];
@@ -1415,7 +1418,7 @@ void GetRuntimeSettings( )
} }
if (GetPrivateProfileString( "Ja2 Settings","SCREEN_MODE_WINDOWED", "", zWindowedMode, 50, INIFile )) if (GetPrivateProfileString( "Ja2 Settings","SCREEN_MODE_WINDOWED", "", zWindowedMode, 50, INIFile ))
{ {
iWindowedMode = atoi(zWindowedMode); iWindowedMode = bCncDdraw ? 0 : atoi(zWindowedMode);
} }
#else #else
vfs::String loc = oProps.getStringProperty("Ja2 Settings", L"LOCALE"); vfs::String loc = oProps.getStringProperty("Ja2 Settings", L"LOCALE");
@@ -1430,7 +1433,7 @@ void GetRuntimeSettings( )
//iMaximize = (int)oProps.getIntProperty(L"Ja2 Settings", L"SCREEN_MODE_WINDOWED_MAXIMIZE", -1); //iMaximize = (int)oProps.getIntProperty(L"Ja2 Settings", L"SCREEN_MODE_WINDOWED_MAXIMIZE", -1);
iMaximize = 1; iMaximize = 1;
iWindowedMode = (int)oProps.getIntProperty(L"Ja2 Settings", L"SCREEN_MODE_WINDOWED", -1); iWindowedMode = bCncDdraw ? 0 : (int)oProps.getIntProperty(L"Ja2 Settings", L"SCREEN_MODE_WINDOWED", -1);
vfs::Settings::setUseUnicode( !oProps.getBoolProperty(L"Ja2 Settings", L"VFS_NO_UNICODE", false) ); vfs::Settings::setUseUnicode( !oProps.getBoolProperty(L"Ja2 Settings", L"VFS_NO_UNICODE", false) );
@@ -1658,7 +1661,7 @@ void GetRuntimeSettings( )
/* Sergeant_Kolja. 2007-02-20: runtime Windowed mode instead of compile-time */ /* Sergeant_Kolja. 2007-02-20: runtime Windowed mode instead of compile-time */
/* 1 for Windowed, 0 for Fullscreen */ /* 1 for Windowed, 0 for Fullscreen */
if( !bScreenModeCmdLine ) if( !bScreenModeCmdLine )
iScreenMode = (int) GetPrivateProfileInt( "Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode, INIFile ); iScreenMode = bCncDdraw ? 0 : (int) GetPrivateProfileInt( "Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode, INIFile );
// WANNE: Should we play the intro? // WANNE: Should we play the intro?
iPlayIntro = (int) GetPrivateProfileInt( "Ja2 Settings","PLAY_INTRO", iPlayIntro, INIFile ); iPlayIntro = (int) GetPrivateProfileInt( "Ja2 Settings","PLAY_INTRO", iPlayIntro, INIFile );
@@ -1698,7 +1701,7 @@ void GetRuntimeSettings( )
/* 1 for Windowed, 0 for Fullscreen */ /* 1 for Windowed, 0 for Fullscreen */
if( !bScreenModeCmdLine ) if( !bScreenModeCmdLine )
{ {
iScreenMode = (int)oProps.getIntProperty("Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode); iScreenMode = bCncDdraw ? 0 : (int)oProps.getIntProperty("Ja2 Settings","SCREEN_MODE_WINDOWED", iScreenMode);
} }
// WANNE: Should we play the intro? // WANNE: Should we play the intro?