games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

fix; cleanup; optimized times

Browse Source
This commit is contained in:
Laserlicht
2024-01-26 21:58:39 +01:00
committed by GitHub
parent 6e957d4913
commit d53dd83466
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/CMusicHandler.cpp
View File

@@ -186,7 +186,7 @@ void CSoundHandler::ambientStopSound(const AudioPath & soundId)
uint32_t CSoundHandler::getSoundDurationMilliseconds(const AudioPath & sound) uint32_t CSoundHandler::getSoundDurationMilliseconds(const AudioPath & sound)
{ {
if (!initialized || sound.empty()) if (!initialized || sound.empty())
return 0.0; return 0;
auto data = CResourceHandler::get()->load(sound.addPrefix("SOUNDS/"))->readAll(); auto data = CResourceHandler::get()->load(sound.addPrefix("SOUNDS/"))->readAll();

6
client/mainmenu/CPrologEpilogVideo.cpp
View File

@@ -33,7 +33,7 @@ CPrologEpilogVideo::CPrologEpilogVideo(CampaignScenarioPrologEpilog _spe, std::f
videoSoundHandle = CCS->soundh->playSound(audioData); videoSoundHandle = CCS->soundh->playSound(audioData);
CCS->videoh->open(spe.prologVideo); CCS->videoh->open(spe.prologVideo);
CCS->musich->playMusic(spe.prologMusic, true, true); CCS->musich->playMusic(spe.prologMusic, true, true);
voiceDurationMilliseconds = CCS->soundh->getSoundDurationMilliseconds(spe.prologVoice) * 1000.0; voiceDurationMilliseconds = CCS->soundh->getSoundDurationMilliseconds(spe.prologVoice);
voiceSoundHandle = CCS->soundh->playSound(spe.prologVoice); voiceSoundHandle = CCS->soundh->playSound(spe.prologVoice);
auto onVoiceStop = [this]() auto onVoiceStop = [this]()
{ {
@@ -50,7 +50,7 @@ void CPrologEpilogVideo::tick(uint32_t msPassed)
{ {
elapsedTimeMilliseconds += msPassed; elapsedTimeMilliseconds += msPassed;
const uint32_t speed = (voiceDurationMilliseconds == 0) ? 100 : (voiceDurationMilliseconds / (text->textSize.y)); const uint32_t speed = (voiceDurationMilliseconds == 0) ? 150 : (voiceDurationMilliseconds / (text->textSize.y));
if(elapsedTimeMilliseconds > speed && text->textSize.y - 50 > positionCounter) if(elapsedTimeMilliseconds > speed && text->textSize.y - 50 > positionCounter)
{ {
@@ -58,7 +58,7 @@ void CPrologEpilogVideo::tick(uint32_t msPassed)
elapsedTimeMilliseconds -= speed; elapsedTimeMilliseconds -= speed;
++positionCounter; ++positionCounter;
} }
else if(elapsedTimeMilliseconds > (voiceDurationMilliseconds == 0.0 ? 6000 : 3000) && voiceStopped) // pause after completed scrolling (longer for intros missing voice) else if(elapsedTimeMilliseconds > (voiceDurationMilliseconds == 0 ? 8000 : 3000) && voiceStopped) // pause after completed scrolling (longer for intros missing voice)
clickPressed(GH.getCursorPosition()); clickPressed(GH.getCursorPosition());
} }