games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-02-15 13:33:36 +02:00
Code Issues Releases Activity

Merge pull request #3985 from Laserlicht/fix_graphical

Browse Source 
fixes graphical glitch when there is no savegame (ExtraOptions)
This commit is contained in:
Ivan Savenko 2024-05-16 10:11:46 +03:00 committed by GitHub
commit 698d726cf9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/github.yml vendored
View File

@ -201,8 +201,8 @@ jobs:
- name: Configure
run: |
if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC13=1; fi
cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC13:+-DCMAKE_C_COMPILER=gcc-13 -DCMAKE_CXX_COMPILER=g++-13}
if [[ ${{matrix.preset}} == linux-gcc-test ]]; then GCC12=1; fi
cmake -DENABLE_CCACHE:BOOL=ON --preset ${{ matrix.preset }} ${GCC12:+-DCMAKE_C_COMPILER=gcc-12 -DCMAKE_CXX_COMPILER=g++-12}
- name: Build
run: |

4
client/lobby/ExtraOptionsTab.cpp
View File

@ -10,9 +10,11 @@
#include "StdInc.h"
#include "ExtraOptionsTab.h"
#include "../widgets/Images.h"
ExtraOptionsTab::ExtraOptionsTab()
: OptionsTabBase(JsonPath::builtin("config/widgets/extraOptionsTab.json"))
{
if(auto textureCampaignOverdraw = widget<CFilledTexture>("textureCampaignOverdraw"))
textureCampaignOverdraw->disable();
}

5
client/lobby/OptionsTabBase.cpp
View File

@ -428,8 +428,5 @@ void OptionsTabBase::recreate(bool campaign)
}
if(auto textureCampaignOverdraw = widget<CFilledTexture>("textureCampaignOverdraw"))
{
if(!campaign)
textureCampaignOverdraw->disable();
}
textureCampaignOverdraw->setEnabled(campaign);
}