Remove Interface options from the list

relates to #2450
ihhub · Mar 15, 2021 · e01de31 · e01de31
1 parent 87f08c0
commit e01de31
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 15 deletions.
diff --git a/src/fheroes2/battle/battle_interface.cpp b/src/fheroes2/battle/battle_interface.cpp
@@ -2214,16 +2214,7 @@ void Battle::Interface::HumanBattleTurn( const Unit & b, Actions & a, std::strin
     // Add offsets to inner objects
     const Rect mainTowerRect = main_tower + _interfacePosition.getPosition();
     const Rect armiesOrderRect = armies_order + _interfacePosition.getPosition();
-    if ( pocket_book.w && le.MouseCursor( pocket_book ) ) {
-        cursor.SetThemes( Cursor::WAR_POINTER );
-        msg = _( "Spell cast" );
-
-        if ( le.MouseClickLeft( pocket_book ) ) {
-            ProcessingHeroDialogResult( 1, a );
-            humanturn_redraw = true;
-        }
-    }
-    else if ( Arena::GetTower( TWR_CENTER ) && le.MouseCursor( mainTowerRect ) ) {
+    if ( Arena::GetTower( TWR_CENTER ) && le.MouseCursor( mainTowerRect ) ) {
         cursor.SetThemes( Cursor::WAR_INFO );
         msg = _( "View Ballista Info" );
 

diff --git a/src/fheroes2/battle/battle_interface.h b/src/fheroes2/battle/battle_interface.h
@@ -339,7 +339,6 @@ namespace Battle
 
         s32 index_pos;
         s32 teleport_src;
-        Rect pocket_book;
         Rect main_tower;
 
         StatusListBox * listlog;

diff --git a/src/fheroes2/dialog/dialog.h b/src/fheroes2/dialog/dialog.h
@@ -112,7 +112,6 @@ namespace Dialog
     void Marketplace( bool fromTradingPost = false );
     void MakeGiftResource( void );
     int BuyBoat( bool enable );
-    void PuzzleMaps( void );
     void ThievesGuild( bool oracle );
     void GameInfo( void );
 

diff --git a/src/fheroes2/dialog/dialog_settings.cpp b/src/fheroes2/dialog/dialog_settings.cpp
@@ -158,11 +158,8 @@ void Dialog::ExtSettings( bool readonly )
     states.push_back( Settings::GAME_SAVE_REWRITE_CONFIRM );
     states.push_back( Settings::GAME_REMEMBER_LAST_FOCUS );
     states.push_back( Settings::GAME_SHOW_SYSTEM_INFO );
-    states.push_back( Settings::GAME_EVIL_INTERFACE );
     states.push_back( Settings::GAME_BATTLE_SHOW_DAMAGE );
 
-    states.push_back( Settings::GAME_HIDE_INTERFACE );
-
     states.push_back( Settings::GAME_DYNAMIC_INTERFACE );
 
     states.push_back( Settings::GAME_AUTOSAVE_ON );