games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-28 08:48:48 +02:00
Code Issues Releases Activity

Integrated valid fixes from PR #1143

Browse Source
This commit is contained in:
Ivan Savenko 2022-12-07 18:13:54 +02:00
parent 111ac36417
commit 65802d958b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/mapHandler.cpp
View File

@ -569,7 +569,7 @@ void CMapHandler::CMapWorldViewBlitter::drawOverlayEx(SDL_Surface * targetSurf)
continue;
realPos.x = initPos.x + (iconInfo.pos.x - topTile.x) * tileSize;
realPos.y = initPos.x + (iconInfo.pos.y - topTile.y) * tileSize;
realPos.y = initPos.y + (iconInfo.pos.y - topTile.y) * tileSize;
auto wvIcon = this->objectToIcon(iconInfo.id, iconInfo.subId, iconInfo.owner);

2
client/windows/GUIClasses.cpp
View File

@ -918,7 +918,7 @@ std::function<void()> CExchangeController::onSwapArmy()
{
GsThread::run([=]
{
if(right->tempOwner != cb->getMyColor()
if(left->tempOwner != cb->getMyColor()
|| right->tempOwner != cb->getMyColor())
{
return;

4
lib/mapObjects/CRewardableConstructor.cpp
View File

@ -126,7 +126,7 @@ void CRandomRewardObjectInfo::configureObject(CRewardableObject * object, CRando
object->canRefuse = parameters["canRefuse"].Bool();
auto visitMode = parameters["visitMode"].String();
for(int i = 0; Rewardable::VisitModeString.size(); ++i)
for(int i = 0; i < Rewardable::VisitModeString.size(); ++i)
{
if(Rewardable::VisitModeString[i] == visitMode)
{
@ -136,7 +136,7 @@ void CRandomRewardObjectInfo::configureObject(CRewardableObject * object, CRando
}
auto selectMode = parameters["selectMode"].String();
for(int i = 0; Rewardable::SelectModeString.size(); ++i)
for(int i = 0; i < Rewardable::SelectModeString.size(); ++i)
{
if(Rewardable::SelectModeString[i] == selectMode)
{