1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00

Merge branch 'develop' into feature/nullkiller2

This commit is contained in:
Mircea TheHonestCTO
2025-09-01 04:26:01 +02:00
122 changed files with 1572 additions and 14857 deletions

View File

@@ -599,7 +599,7 @@ void CVCMIServer::setPlayer(PlayerColor clickedColor)
{
PlayerColor color;
PlayerConnectionID id;
void reset() { id = PlayerConnectionID::PLAYER_AI; color = PlayerColor::CANNOT_DETERMINE; }
void reset() { id = PlayerConnectionID::INVALID; color = PlayerColor::CANNOT_DETERMINE; }
PlayerToRestore(){ reset(); }
};