Added dynamic interface option #9413
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]> * | ||
|
|
@@ -735,6 +735,12 @@ fheroes2::GameMode Interface::AdventureMap::StartGame() | |
|
|
||
| // Fully update fog directions if there will be only one human player. | ||
| Interface::GameArea::updateMapFogDirections(); | ||
|
|
||
| if ( conf.getInterfaceType() == InterfaceType::DYNAMIC ) { | ||
| reset(); | ||
|
There was a problem hiding this comment. This doesn't seem right. At line 702 we call reset and then we are calling it here. The code looks more like a hack. Could you please explain why we cannot do the same at line 702? There was a problem hiding this comment. This is because when the game is first drawn (L. 702 - 710), the current player has not been selected yet (L. 734). |
||
| redraw( Interface::REDRAW_RADAR ); | ||
| redraw( Interface::REDRAW_ALL & ( ~Interface::REDRAW_RADAR ) ); | ||
| } | ||
| } | ||
|
|
||
| while ( res == fheroes2::GameMode::END_TURN ) { | ||
|
|
@@ -784,7 +790,15 @@ fheroes2::GameMode Interface::AdventureMap::StartGame() | |
| // Reset environment sounds and music theme at the beginning of the human turn | ||
| AudioManager::ResetAudio(); | ||
|
|
||
| conf.SetCurrentColor( playerColor ); | ||
|
|
||
| if ( isHotSeatGame ) { | ||
| if ( conf.getInterfaceType() == InterfaceType::DYNAMIC ) { | ||
| reset(); | ||
| redraw( Interface::REDRAW_RADAR ); | ||
| redraw( Interface::REDRAW_ALL & ( ~Interface::REDRAW_RADAR ) ); | ||
| } | ||
|
Comment on lines
+796
to
+800
There was a problem hiding this comment. Do we want to rebuild everything even if the interface type is going to be the same? |
||
|
|
||
| _iconsPanel.hideIcons( ICON_ANY ); | ||
| _statusPanel.Reset(); | ||
|
|
||
|
|
@@ -804,8 +818,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]> * | ||
|
|
@@ -126,6 +126,27 @@ bool Race::isMagicalRace( const int race ) | |
| return false; | ||
| } | ||
|
|
||
| bool Race::isEvilRace( const int race ) | ||
| { | ||
| switch ( race ) { | ||
| case BARB: | ||
| case WRLK: | ||
| case NECR: | ||
| return true; | ||
| case KNGT: | ||
| case SORC: | ||
| case WZRD: | ||
| case MULT: | ||
| case RAND: | ||
| return false; | ||
| default: | ||
| assert( 0 ); | ||
| break; | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| uint8_t Race::IndexToRace( const int index ) | ||
| { | ||
| switch ( index ) { | ||
|
|
||
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]> * | ||
|
|
@@ -22,6 +22,7 @@ | |
| ***************************************************************************/ | ||
|
|
||
| #include <algorithm> | ||
| #include <cassert> | ||
| #include <cstdlib> | ||
| #include <fstream> | ||
| #include <sstream> | ||
|
|
@@ -36,6 +37,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 +237,17 @@ bool Settings::Read( const std::string & filePath ) | |
| setBattleShowTurnOrder( config.StrParams( "battle turn order" ) == "on" ); | ||
| } | ||
|
|
||
|
Comment on lines
-238
to
-239
There was a problem hiding this comment. Here we are breaking the existing settings players set. We should read the value of the previous setting. |
||
| 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 +443,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; | ||
|
Comment on lines
+449
to
+455
There was a problem hiding this comment. None of settings have values starting from a capital letter. Please keep it the same way,. |
||
| 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 +839,6 @@ void Settings::setHideInterface( const bool enable ) | |
| } | ||
| } | ||
|
|
||
|
There was a problem hiding this comment.
|
||
| void Settings::setScreenScalingTypeNearest( const bool enable ) | ||
| { | ||
| if ( enable ) { | ||
|
|
@@ -883,9 +896,46 @@ bool Settings::isHideInterfaceEnabled() const | |
| return _gameOptions.Modes( GAME_HIDE_INTERFACE ); | ||
| } | ||
|
|
||
| void Settings::setInterfaceType( InterfaceType type ) | ||
| { | ||
| assert( type >= InterfaceType::GOOD && type <= InterfaceType::DYNAMIC ); | ||
|
There was a problem hiding this comment. Instead of avoid this assertion we simply can remove |
||
| _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(); | ||
|
There was a problem hiding this comment. This method is not static. We should use its own methods within the body. |
||
| if ( !player ) | ||
| return false; | ||
|
Comment on lines
+919
to
+920
There was a problem hiding this comment. Is it even possible? Also, please parenthesis for this if-body. There was a problem hiding this comment. Might be related to my last comment where the current player might not be set at the start of the game. I'll remove this check if I update the code once I find a way to only draw the interface once at the beginning of the game. |
||
|
|
||
| if ( player->isControlHuman() ) { | ||
| return Race::isEvilRace( player->GetRace() ); | ||
| } | ||
|
|
||
| // 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() ) { | ||
| return Race::isEvilRace( ( *iter )->GetRace() ); | ||
| } | ||
| } | ||
|
Comment on lines
+926
to
+931
There was a problem hiding this comment. Do we need to check this? UI Interface changes only during player's turn. There was a problem hiding this comment. Some parts of the UI is updated during the AI's turn. If I remove this code, the background of the shield will change color very rapidly based on the AI factions |
||
| break; | ||
| } | ||
| default: | ||
| assert( 0 ); | ||
| } | ||
|
|
||
| return false; | ||
| } | ||
|
|
||
| bool Settings::isEditorAnimationEnabled() const | ||
|
|
||
Oops, something went wrong.
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.
This is the only place where
InterfaceType::COUNTis really needed. We can simply do this for the code to avoid having an extra enumeration entry:Then we won't need checks in the code for non-existing types.