games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-19 21:10:12 +02:00
Code Issues Releases Activity

Unblock interface during turn of another human player

Browse Source
This commit is contained in:
Ivan Savenko 2024-04-27 12:40:22 +03:00
parent ac11a0e639
commit 49691ef743
4 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/CPlayerInterface.cpp
View File

@ -1215,7 +1215,6 @@ void CPlayerInterface::loadGame( BinaryDeserializer & h )
void CPlayerInterface::moveHero( const CGHeroInstance *h, const CGPath& path ) void CPlayerInterface::moveHero( const CGHeroInstance *h, const CGPath& path )
{ {
assert(LOCPLINT->makingTurn);
assert(h); assert(h);
assert(!showingDialog->get()); assert(!showingDialog->get());
assert(dialogs.empty()); assert(dialogs.empty());

3
client/adventureMap/AdventureMapInterface.cpp
View File

@ -510,9 +510,6 @@ void AdventureMapInterface::onTileLeftClicked(const int3 &targetPosition)
if(!shortcuts->optionMapViewActive()) if(!shortcuts->optionMapViewActive())
return; return;
if(!LOCPLINT->makingTurn)
return;
const CGObjectInstance *topBlocking = LOCPLINT->cb->isVisible(targetPosition) ? getActiveObject(targetPosition) : nullptr; const CGObjectInstance *topBlocking = LOCPLINT->cb->isVisible(targetPosition) ? getActiveObject(targetPosition) : nullptr;
if(spellBeingCasted) if(spellBeingCasted)

6
client/adventureMap/AdventureMapShortcuts.cpp
View File

@ -475,16 +475,16 @@ bool AdventureMapShortcuts::optionInWorldView()
bool AdventureMapShortcuts::optionSidePanelActive() bool AdventureMapShortcuts::optionSidePanelActive()
{ {
return state == EAdventureState::MAKING_TURN || state == EAdventureState::WORLD_VIEW; return state == EAdventureState::MAKING_TURN || state == EAdventureState::WORLD_VIEW || state == EAdventureState::OTHER_HUMAN_PLAYER_TURN;
} }
bool AdventureMapShortcuts::optionMapScrollingActive() bool AdventureMapShortcuts::optionMapScrollingActive()
{ {
return state == EAdventureState::MAKING_TURN || state == EAdventureState::WORLD_VIEW || (state == EAdventureState::OTHER_HUMAN_PLAYER_TURN); return state == EAdventureState::MAKING_TURN || state == EAdventureState::WORLD_VIEW || state == EAdventureState::OTHER_HUMAN_PLAYER_TURN;
} }
bool AdventureMapShortcuts::optionMapViewActive() bool AdventureMapShortcuts::optionMapViewActive()
{ {
return state == EAdventureState::MAKING_TURN || state == EAdventureState::WORLD_VIEW || state == EAdventureState::CASTING_SPELL return state == EAdventureState::MAKING_TURN || state == EAdventureState::WORLD_VIEW || state == EAdventureState::CASTING_SPELL
|| (state == EAdventureState::OTHER_HUMAN_PLAYER_TURN); || state == EAdventureState::OTHER_HUMAN_PLAYER_TURN;
} }

20
client/mapView/MapViewController.cpp
View File

@ -16,6 +16,7 @@
#include "MapViewCache.h" #include "MapViewCache.h"
#include "MapViewModel.h" #include "MapViewModel.h"
#include "../CCallback.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"
#include "../adventureMap/AdventureMapInterface.h" #include "../adventureMap/AdventureMapInterface.h"
#include "../gui/CGuiHandler.h" #include "../gui/CGuiHandler.h"
@ -23,6 +24,7 @@
#include "../eventsSDL/InputHandler.h" #include "../eventsSDL/InputHandler.h"
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
#include "../../lib/StartInfo.h"
#include "../../lib/mapObjects/CGHeroInstance.h" #include "../../lib/mapObjects/CGHeroInstance.h"
#include "../../lib/mapObjects/MiscObjects.h" #include "../../lib/mapObjects/MiscObjects.h"
#include "../../lib/pathfinder/CGPathNode.h" #include "../../lib/pathfinder/CGPathNode.h"
@ -295,9 +297,14 @@ bool MapViewController::isEventVisible(const CGObjectInstance * obj, const Playe
if(!GH.windows().isTopWindow(adventureInt)) if(!GH.windows().isTopWindow(adventureInt))
return false; return false;
// do not focus on actions of other players during our turn (e.g. simturns) // do not focus on actions of other players except for AI with simturns off
if (LOCPLINT->makingTurn && initiator != LOCPLINT->playerID) if (initiator != LOCPLINT->playerID)
{
if (LOCPLINT->makingTurn)
return false; return false;
if (LOCPLINT->cb->getStartInfo()->playerInfos.at(initiator).isControlledByHuman())
return false;
}
if(obj->isVisitable()) if(obj->isVisitable())
return context->isVisible(obj->visitablePos()); return context->isVisible(obj->visitablePos());
@ -316,9 +323,14 @@ bool MapViewController::isEventVisible(const CGHeroInstance * obj, const int3 &
if(!GH.windows().isTopWindow(adventureInt)) if(!GH.windows().isTopWindow(adventureInt))
return false; return false;
// do not focus on actions of other players during our turn (e.g. simturns) // do not focus on actions of other players except for AI with simturns off
if (LOCPLINT->makingTurn && obj->getOwner() != LOCPLINT->playerID) if (obj->getOwner() != LOCPLINT->playerID)
{
if (LOCPLINT->makingTurn)
return false; return false;
if (LOCPLINT->cb->getStartInfo()->playerInfos.at(obj->getOwner()).isControlledByHuman())
return false;
}
if(context->isVisible(obj->convertToVisitablePos(from))) if(context->isVisible(obj->convertToVisitablePos(from)))
return true; return true;