games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'vcmi/master' into develop

Browse Source
This commit is contained in:
Ivan Savenko
2024-07-11 15:59:55 +00:00
parent 719f920914 286a70c007
commit 6b8f94e6e7
96 changed files with 4648 additions and 4084 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
server/processors/TurnOrderProcessor.cpp
View File

@@ -177,13 +177,16 @@ bool TurnOrderProcessor::computeCanActSimultaneously(PlayerColor active, PlayerC
assert(activeInfo);
assert(waitingInfo);
if (gameHandler->hasBothPlayersAtSameConnection(active, waiting))
if (activeInfo->human != waitingInfo->human)
{
// only one AI and one human can play simultaneously from single connection
if (!gameHandler->getStartInfo()->simturnsInfo.allowHumanWithAI)
return false;
// only one AI and one human can play simultaneously from single connection
if (activeInfo->human == waitingInfo->human)
}
else
{
// two AI or two humans in hotseat can't play at the same time
if (gameHandler->hasBothPlayersAtSameConnection(active, waiting))
return false;
}