Added dynamic interface option #9413
+145
−44
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /*************************************************************************** | ||
| * fheroes2: https://github.com/ihhub/fheroes2 * | ||
| * Copyright (C) 2019 - 2025 * | ||
| * * | ||
| * Free Heroes2 Engine: http://sourceforge.net/projects/fheroes2 * | ||
| * Copyright (C) 2009 by Andrey Afletdinov <[email protected]> * | ||
|
|
@@ -784,6 +784,13 @@ fheroes2::GameMode Interface::AdventureMap::StartGame() | |
| // Reset environment sounds and music theme at the beginning of the human turn | ||
| AudioManager::ResetAudio(); | ||
|
|
||
| conf.SetCurrentColor( playerColor ); | ||
| if ( conf.getInterfaceType() == InterfaceType::DYNAMIC ) { | ||
| reset(); | ||
| redraw( Interface::REDRAW_RADAR ); | ||
| redraw( Interface::REDRAW_ALL & ( ~Interface::REDRAW_RADAR ) ); | ||
| } | ||
|
Comment on lines
+788
to
+792
There was a problem hiding this comment. In single-player game the race of the player is never changed so should we do this ( |
||
|
|
||
| if ( isHotSeatGame ) { | ||
| _iconsPanel.hideIcons( ICON_ANY ); | ||
| _statusPanel.Reset(); | ||
|
|
@@ -804,8 +811,6 @@ fheroes2::GameMode Interface::AdventureMap::StartGame() | |
| Game::DialogPlayers( playerColor, "", _( "%{color} player's turn." ) ); | ||
| } | ||
|
|
||
| kingdom.ActionBeforeTurn(); | ||
|
|
||
| _iconsPanel.showIcons( ICON_ANY ); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,6 @@ | ||
| /*************************************************************************** | ||
| * fheroes2: https://github.com/ihhub/fheroes2 * | ||
| * Copyright (C) 2019 - 2025 * | ||
| * * | ||
| * Free Heroes2 Engine: http://sourceforge.net/projects/fheroes2 * | ||
| * Copyright (C) 2009 by Andrey Afletdinov <[email protected]> * | ||
|
|
@@ -36,6 +36,7 @@ | |
| #include "game.h" | ||
| #include "game_io.h" | ||
| #include "logging.h" | ||
| #include "race.h" | ||
| #include "render_processor.h" | ||
| #include "save_format_version.h" | ||
| #include "screen.h" | ||
|
|
@@ -235,8 +236,17 @@ bool Settings::Read( const std::string & filePath ) | |
| setBattleShowTurnOrder( config.StrParams( "battle turn order" ) == "on" ); | ||
| } | ||
|
|
||
| if ( config.Exists( "interface type" ) ) { | ||
| const std::string interfaceType = config.StrParams( "interface type" ); | ||
| if ( interfaceType == "Good" ) { | ||
| setInterfaceType( InterfaceType::GOOD ); | ||
| } | ||
| else if ( interfaceType == "Evil" ) { | ||
| setInterfaceType( InterfaceType::EVIL ); | ||
| } | ||
| else { | ||
| setInterfaceType( InterfaceType::DYNAMIC ); | ||
| } | ||
Districh-ru marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| if ( config.Exists( "hide interface" ) ) { | ||
|
|
@@ -432,8 +442,20 @@ std::string Settings::String() const | |
| os << std::endl << "# show turn order during battle: on/off" << std::endl; | ||
| os << "battle turn order = " << ( _gameOptions.Modes( GAME_BATTLE_SHOW_TURN_ORDER ) ? "on" : "off" ) << std::endl; | ||
|
|
||
| os << std::endl << "# interface type (Good/Evil/Dynamic)" << std::endl; | ||
| switch ( _interfaceType ) { | ||
| case GOOD: | ||
| os << "interface type = Good" << std::endl; | ||
| break; | ||
| case EVIL: | ||
| os << "interface type = Evil" << std::endl; | ||
| break; | ||
| case DYNAMIC: | ||
| os << "interface type = Dynamic" << std::endl; | ||
| break; | ||
| default: | ||
| assert( 0 ); | ||
| } | ||
|
|
||
| os << std::endl << "# hide interface elements on the adventure map: on/off" << std::endl; | ||
| os << "hide interface = " << ( _gameOptions.Modes( GAME_HIDE_INTERFACE ) ? "on" : "off" ) << std::endl; | ||
|
|
@@ -816,16 +838,6 @@ void Settings::setHideInterface( const bool enable ) | |
| } | ||
| } | ||
|
|
||
| void Settings::setScreenScalingTypeNearest( const bool enable ) | ||
| { | ||
| if ( enable ) { | ||
|
|
@@ -883,9 +895,46 @@ bool Settings::isHideInterfaceEnabled() const | |
| return _gameOptions.Modes( GAME_HIDE_INTERFACE ); | ||
| } | ||
|
|
||
| void Settings::setInterfaceType( InterfaceType type ) | ||
| { | ||
| assert( type >= InterfaceType::GOOD && type <= InterfaceType::DYNAMIC ); | ||
| _interfaceType = type; | ||
| } | ||
|
|
||
| InterfaceType Settings::getInterfaceType() const | ||
| { | ||
| return _interfaceType; | ||
| } | ||
|
|
||
| bool Settings::isEvilInterfaceEnabled() const | ||
| { | ||
| switch ( _interfaceType ) { | ||
| case InterfaceType::GOOD: | ||
| return false; | ||
| case InterfaceType::EVIL: | ||
| return true; | ||
| case InterfaceType::DYNAMIC: { | ||
| Player * player = Settings::Get().GetPlayers().GetCurrent(); | ||
| if ( !player ) | ||
| return false; | ||
|
|
||
| if ( player->isControlHuman() ) { | ||
| const int race = player->GetRace(); | ||
| return race == Race::WRLK || race == Race::NECR || race == Race::BARB; | ||
felix642 marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| } | ||
|
|
||
| // Keep the UI of the last player during the AI turn | ||
| for ( auto iter = Settings::Get().GetPlayers().rbegin(); iter < Settings::Get().GetPlayers().rend(); ++iter ) { | ||
| if ( *iter && ( *iter )->isControlHuman() ) { | ||
| const int race = ( *iter )->GetRace(); | ||
| return race == Race::WRLK || race == Race::NECR || race == Race::BARB; | ||
| } | ||
| } | ||
| return false; | ||
| } | ||
| default: | ||
| assert( 0 ); | ||
| } | ||
| } | ||
|
|
||
| bool Settings::isEditorAnimationEnabled() const | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We can make
uint32_t icnIndex;and then set its value by theinterfaceTypeand then use it inconst fheroes2::Sprite & interfaceThemeIcon = fheroes2::AGG::GetICN( ICN::SPANEL, icnIndex );Doing this we will not duplicate the
GetICN()call code and will not make a pointer to Sprite.What do you think?