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

CBattleInterface: cleaner implementation of optional drawbridge blit

Browse Source 
Checking against nullptr isn't clean solution so we only blit in case gate opened or destroyed.
This commit is contained in:
Arseniy Shestakov 2016-02-14 15:21:47 +03:00
parent 2cfdfca7e5
commit f453172d53
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
client/battle/CBattleInterface.cpp
View File

@ -2753,10 +2753,9 @@ void CBattleInterface::gateStateChanged(const EGateState state)
break;
}
SDL_FreeSurface(siegeH->walls[9]);
siegeH->walls[9] = nullptr;
SDL_FreeSurface(siegeH->walls[SiegeHelper::GATE]);
if(stateId != EWallState::NONE)
siegeH->walls[9] = BitmapHandler::loadBitmap(siegeH->getSiegeName(9, stateId));
siegeH->walls[SiegeHelper::GATE] = BitmapHandler::loadBitmap(siegeH->getSiegeName(SiegeHelper::GATE, stateId));
if(playSound)
CCS->soundh->playSound(soundBase::DRAWBRG);
}
@ -2821,11 +2820,7 @@ CBattleInterface::SiegeHelper::SiegeHelper(const CGTownInstance *siegeTown, cons
{
for(int g = 0; g < ARRAY_COUNT(walls); ++g)
{
//gate have no displayed bitmap when drawbridge is raised
if(g == SiegeHelper::GATE)
walls[g] = nullptr;
else
walls[g] = BitmapHandler::loadBitmap(getSiegeName(g));
walls[g] = BitmapHandler::loadBitmap(getSiegeName(g));
}
}
@ -2919,7 +2914,7 @@ std::string CBattleInterface::SiegeHelper::getSiegeName(ui16 what, int state) co
void CBattleInterface::SiegeHelper::printPartOfWall(SDL_Surface * to, int what)
{
Point pos = Point(-1, -1);
auto & ci = owner->siegeH->town->town->clientInfo;
auto & ci = town->town->clientInfo;
if (vstd::iswithin(what, 1, 17))
{
@ -2933,8 +2928,15 @@ void CBattleInterface::SiegeHelper::printPartOfWall(SDL_Surface * to, int what)
if(pos.x != -1)
{
if(walls[what])
blitAt(walls[what], pos.x, pos.y, to);
//gate have no displayed bitmap when drawbridge is raised
if(what == SiegeHelper::GATE)
{
auto gateState = owner->curInt->cb->battleGetGateState();
if(gateState != EGateState::OPENED && gateState != EGateState::DESTROYED)
return;
}
blitAt(walls[what], pos.x, pos.y, to);
}
}