diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index ec728881..44577f10 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -4,7 +4,7 @@ on: push: branches: - 'master' - - 'cnc-loader' + - 'develop' - 'github-action' paths: - '.github/workflows/build.yml' diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index c2f6cbc0..4f3a874c 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -61,6 +61,7 @@ SpeedMultiInitial=100 ;A DX9 mode is required for any graphics related script extender functions to work (i.e. fullscreen shaders) ;Modes 1, 2 and 3 are no longer supported ;If using the hi-res patch by Mash, this option will always be read from the main ddraw.ini file +;Note: When using an external DirectDraw wrapper (ddraw.dll file in \wrapper\), DX9 mode will not be available Mode=0 ;If using a DX9 mode, this changes the resolution diff --git a/sfall/Modules/Graphics.cpp b/sfall/Modules/Graphics.cpp index 98b0f630..98d46ff5 100644 --- a/sfall/Modules/Graphics.cpp +++ b/sfall/Modules/Graphics.cpp @@ -1254,7 +1254,7 @@ void Graphics::init() { if (extWrapper || Graphics::mode < 0 || Graphics::mode > 6) { Graphics::mode = 0; } - IsWindowedMode = (Graphics::mode == 2 || Graphics::mode == 3 || Graphics::mode >= 5); + Graphics::IsWindowedMode = (Graphics::mode == 2 || Graphics::mode == 3 || Graphics::mode >= 5); if (Graphics::mode >= 4) { dlog("Applying DX9 graphics patch.", DL_INIT);