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

Fix max music/sound volume #4609

Merged
merged 3 commits into from
Nov 13, 2021
Merged

Fix max music/sound volume #4609

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
e494e69
Fix max music/sound volume
a1exsh Nov 11, 2021
ce410af
enum : int
a1exsh Nov 12, 2021
638eac5
SCROLL_FAST2
a1exsh Nov 12, 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
enum : int
  • Loading branch information
@a1exsh
a1exsh committed Nov 12, 2021
commit ce410af0781e7f1f33d48ead786a6d18e3207f10
2 changes: 1 addition & 1 deletion src/fheroes2/dialog/dialog_system_options.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -351,7 +351,7 @@ namespace
// set scroll speed
bool saveScrollSpeed = false;
if ( le.MouseClickLeft( scrollSpeedRoi ) ) {
conf.SetScrollSpeed( SCROLL_FAST2 > conf.ScrollSpeed() ? conf.ScrollSpeed() + 1 : SCROLL_SLOW );
conf.SetScrollSpeed( conf.ScrollSpeed() % 4 + 1 );
saveScrollSpeed = true;
}
else if ( le.MouseWheelUp( scrollSpeedRoi ) ) {
Expand Down
2 changes: 1 addition & 1 deletion src/fheroes2/system/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ void Settings::setFullScreen( const bool enable )
/* set scroll speed: 1 - 4 */
void Settings::SetScrollSpeed( int speed )
{
scroll_speed = clamp( static_cast<int>( speed ), static_cast<int>( SCROLL_SLOW ), static_cast<int>( SCROLL_FAST2 ) );
scroll_speed = clamp( speed, static_cast<int>( SCROLL_SLOW ), static_cast<int>( SCROLL_FAST2 ) );
}

bool Settings::isPriceOfLoyaltySupported() const
Expand Down
2 changes: 1 addition & 1 deletion src/fheroes2/system/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
#include "maps_fileinfo.h"
#include "players.h"

enum
enum : int
{
SCROLL_SLOW = 1,
SCROLL_NORMAL = 2,
Expand Down