games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

fix asset failures

Browse Source
This commit is contained in:
Laserlicht
2023-10-31 22:05:22 +01:00
committed by GitHub
parent c1707bcc71
commit 8a9f10ec3a
3 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/mainmenu/CHighScoreScreen.cpp
View File

@@ -325,7 +325,6 @@ void CHighScoreInputScreen::deactivate()
{ {
CCS->videoh->close(); CCS->videoh->close();
CCS->soundh->stopSound(videoSoundHandle); CCS->soundh->stopSound(videoSoundHandle);
CIntObject::deactivate();
} }
void CHighScoreInputScreen::clickPressed(const Point & cursorPosition) void CHighScoreInputScreen::clickPressed(const Point & cursorPosition)
@@ -361,7 +360,7 @@ void CHighScoreInputScreen::keyPressed(EShortcut key)
} }
CHighScoreInput::CHighScoreInput(std::string playerName, std::function<void(std::string text)> readyCB) CHighScoreInput::CHighScoreInput(std::string playerName, std::function<void(std::string text)> readyCB)
: CWindowObject(0, ImagePath::builtin("HIGHNAME")), ready(readyCB) : CWindowObject(NEEDS_ANIMATED_BACKGROUND, ImagePath::builtin("HIGHNAME")), ready(readyCB)
{ {
OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE; OBJ_CONSTRUCTION_CAPTURING_ALL_NO_DISPOSE;

2
client/windows/CWindowObject.cpp
View File

@@ -39,6 +39,7 @@ CWindowObject::CWindowObject(int options_, const ImagePath & imageName, Point ce
options(options_), options(options_),
background(createBg(imageName, options & PLAYER_COLORED)) background(createBg(imageName, options & PLAYER_COLORED))
{ {
if(!(options & NEEDS_ANIMATED_BACKGROUND)) //currently workaround for highscores (currently uses window as normal control, because otherwise videos are not played in background yet)
assert(parent == nullptr); //Safe to remove, but windows should not have parent assert(parent == nullptr); //Safe to remove, but windows should not have parent
defActions = 255-DISPOSE; defActions = 255-DISPOSE;
@@ -60,6 +61,7 @@ CWindowObject::CWindowObject(int options_, const ImagePath & imageName):
options(options_), options(options_),
background(createBg(imageName, options_ & PLAYER_COLORED)) background(createBg(imageName, options_ & PLAYER_COLORED))
{ {
if(!(options & NEEDS_ANIMATED_BACKGROUND)) //currently workaround for highscores (currently uses window as normal control, because otherwise videos are not played in background yet)
assert(parent == nullptr); //Safe to remove, but windows should not have parent assert(parent == nullptr); //Safe to remove, but windows should not have parent
defActions = 255-DISPOSE; defActions = 255-DISPOSE;

3
client/windows/CWindowObject.h
View File

@@ -38,7 +38,8 @@ public:
PLAYER_COLORED=1, //background will be player-colored PLAYER_COLORED=1, //background will be player-colored
RCLICK_POPUP=2, // window will behave as right-click popup RCLICK_POPUP=2, // window will behave as right-click popup
BORDERED=4, // window will have border if current resolution is bigger than size of window BORDERED=4, // window will have border if current resolution is bigger than size of window
SHADOW_DISABLED=8 //this window won't display any shadow SHADOW_DISABLED=8, //this window won't display any shadow
NEEDS_ANIMATED_BACKGROUND=16 //there are videos in the background that have to be played
}; };
/* /*