Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reduce CPU usage for video playback and puzzle revealing #3388

Merged
merged 3 commits into from
May 10, 2021
Merged

Reduce CPU usage for video playback and puzzle revealing #3388

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
329cbfd
Reduce CPU usage for video playback and puzzle revealing
ihhub May 10, 2021
7ccfb2c
Code styl correction
ihhub May 10, 2021
721665e
Fix compilation warning
ihhub May 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Code styl correction
  • Loading branch information
@ihhub
ihhub committed May 10, 2021
commit 7ccfb2c8052cd705d15499f33bf2ffe258c60089
2 changes: 1 addition & 1 deletion src/fheroes2/campaign/campaign_scenariodata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ namespace Campaign

std::string ScenarioBonusData::ToString() const
{
const std::vector<uint32_t> useAmountTypes = {ScenarioBonusData::ARTIFACT, ScenarioBonusData::RESOURCES, ScenarioBonusData::TROOP};
const std::vector<uint32_t> useAmountTypes = { ScenarioBonusData::ARTIFACT, ScenarioBonusData::RESOURCES, ScenarioBonusData::TROOP };

std::string objectName;

Expand Down
2 changes: 1 addition & 1 deletion src/fheroes2/game/game_delays.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ bool Game::isDelayNeeded( const std::vector<Game::DelayType> & delayTypes )
return true;

for ( const Game::DelayType type : delayTypes ) {
assert ( type != Game::DelayType::CUSTOM_DELAY );
assert( type != Game::DelayType::CUSTOM_DELAY );

if ( delays[type].isPassed() ) {
return false;
Expand Down