Merge beta into develop

This commit is contained in:
Ivan Savenko committed 2023-04-11 19:37:35 +03:00
commit dfa2e2a349
91 files changed
+730 -442

No files matched your search

+5
View File
@@ -133,6 +133,11 @@ int3 CGObjectInstance::getPosition() const
return pos;
}
int3 CGObjectInstance::getTopVisiblePos() const
{
return pos - appearance->getTopVisibleOffset();
}
void CGObjectInstance::setOwner(const PlayerColor & ow)
{
tempOwner = ow;