Fixed dxGetStatus().SettingWindowed sometimes being incorrect. Added …

…dxGetStatus().SettingFullScreenStyle
multitheftauto · Jan 1, 2018 · baf8f25 · baf8f25
1 parent c89bad1
commit baf8f25
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 3 deletions.
diff --git a/Client/core/Graphics/CRenderItemManager.cpp b/Client/core/Graphics/CRenderItemManager.cpp
@@ -770,7 +770,8 @@ void CRenderItemManager::GetDxStatus ( SDxStatus& outStatus )
 
     // Option settings
     CGameSettings* gameSettings = CCore::GetSingleton ().GetGame ()->GetSettings ();
-    outStatus.settings.bWindowed = false;
+    outStatus.settings.bWindowed = GetVideoModeManager()->IsDisplayModeWindowed();
+    outStatus.settings.iFullScreenStyle = GetVideoModeManager()->GetFullScreenStyle();
     outStatus.settings.iFXQuality = gameSettings->GetFXQuality(); ;
     outStatus.settings.iDrawDistance = ( gameSettings->GetDrawDistance () - 0.925f ) / 0.8749f * 100;
     outStatus.settings.iAntiAliasing = gameSettings->GetAntiAliasing() - 1;
@@ -786,7 +787,6 @@ void CRenderItemManager::GetDxStatus ( SDxStatus& outStatus )
     outStatus.settings.bHighDetailVehicles = false;
 
     CVARS_GET ( "streaming_memory",     outStatus.settings.iStreamingMemory );
-    CVARS_GET ( "display_windowed",     outStatus.settings.bWindowed );
     CVARS_GET ( "volumetric_shadows",   outStatus.settings.bVolumetricShadows );
     CVARS_GET ( "allow_screen_upload",  outStatus.settings.bAllowScreenUpload );
     CVARS_GET ( "grass",                outStatus.settings.bGrassEffect );

diff --git a/Client/core/Graphics/CVideoModeManager.cpp b/Client/core/Graphics/CVideoModeManager.cpp
@@ -39,8 +39,9 @@ class CVideoModeManager : public CVideoModeManagerInterface
     virtual void        OnLoseFocus                 ( void );
     virtual void        OnPaint                     ( void );
     virtual bool        GetRequiredDisplayResolution( int& iOutWidth, int& iOutHeight, int& iOutColorBits, int& iOutAdapterIndex );
+    virtual int         GetFullScreenStyle          ( void )    { return m_iCurrentFullscreenStyle; }
+    virtual bool        IsDisplayModeWindowed       ( void );
 
-    bool                IsDisplayModeWindowed       ( void );
     bool                IsDisplayModeFullScreen     ( void );
     bool                IsDisplayModeFullScreenWindow   ( void );
     bool                GetCurrentAdapterRect       ( LPRECT pOutRect );

diff --git a/Client/core/Graphics/CVideoModeManager.h b/Client/core/Graphics/CVideoModeManager.h
@@ -37,6 +37,8 @@ class CVideoModeManagerInterface
     virtual void        OnLoseFocus                 ( void ) = 0;
     virtual void        OnPaint                     ( void ) = 0;
     virtual bool        GetRequiredDisplayResolution( int& iOutWidth, int& iOutHeight, int& iOutColorBits, int& iOutAdapterIndex ) = 0;
+    virtual int         GetFullScreenStyle          ( void ) = 0;
+    virtual bool        IsDisplayModeWindowed       ( void ) = 0;
 };
 
 CVideoModeManagerInterface* GetVideoModeManager ( void );

diff --git a/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp b/Client/mods/deathmatch/logic/luadefs/CLuaDrawingDefs.cpp
@@ -1152,6 +1152,10 @@ int CLuaDrawingDefs::DxGetStatus ( lua_State* luaVM )
         lua_pushboolean ( luaVM, dxStatus.settings.bWindowed );
         lua_settable ( luaVM, -3 );
 
+        lua_pushstring ( luaVM, "SettingFullScreenStyle" );
+        lua_pushnumber ( luaVM, dxStatus.settings.iFullScreenStyle );
+        lua_settable ( luaVM, -3 );
+
         lua_pushstring ( luaVM, "SettingFXQuality" );
         lua_pushnumber ( luaVM, dxStatus.settings.iFXQuality );
         lua_settable ( luaVM, -3 );

diff --git a/Client/sdk/core/CRenderItemManagerInterface.h b/Client/sdk/core/CRenderItemManagerInterface.h
@@ -111,6 +111,7 @@ struct SDxStatus
     struct
     {
         bool            bWindowed;
+        int             iFullScreenStyle;
         int             iFXQuality;
         int             iDrawDistance;
         bool            bVolumetricShadows;