games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

CBattleInterface: first pass on client drawbridge visualization

Browse Source
This commit is contained in:
Arseniy Shestakov 2016-02-10 07:10:32 +03:00
parent 11dc428b1e
commit 422d5cabdf
7 changed files with 67 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/CPlayerInterface.cpp
View File

@ -1012,6 +1012,14 @@ void CPlayerInterface::battleObstaclePlaced(const CObstacleInstance &obstacle)
battleInt->obstaclePlaced(obstacle);
}
void CPlayerInterface::battleDrawbridgeStateChanged(const EDrawbridgeState state)
{
EVENT_HANDLER_CALLED_BY_CLIENT;
BATTLE_EVENT_POSSIBLE_RETURN;
battleInt->drawbridgeStateChanged(state);
}
void CPlayerInterface::yourTacticPhase(int distance)
{
THREAD_CREATED_BY_CLIENT;

1
client/CPlayerInterface.h
View File

@ -220,6 +220,7 @@ public:
void battleCatapultAttacked(const CatapultAttack & ca) override; //called when catapult makes an attack
void battleStacksRemoved(const BattleStacksRemoved & bsr) override; //called when certain stack is completely removed from battlefield
void battleObstaclePlaced(const CObstacleInstance &obstacle) override;
void battleDrawbridgeStateChanged(const EDrawbridgeState state) override;
void yourTacticPhase(int distance) override;
//-------------//

5
client/NetPacksClient.cpp
View File

@ -658,6 +658,11 @@ void BattleObstaclePlaced::applyCl(CClient * cl)
BATTLE_INTERFACE_CALL_IF_PRESENT_FOR_BOTH_SIDES(battleObstaclePlaced, *obstacle);
}
void BattleDrawbridgeStateChanged::applyFirstCl(CClient * cl)
{
BATTLE_INTERFACE_CALL_IF_PRESENT_FOR_BOTH_SIDES(battleDrawbridgeStateChanged, state);
}
void BattleResult::applyFirstCl( CClient *cl )
{
BATTLE_INTERFACE_CALL_IF_PRESENT_FOR_BOTH_SIDES(battleEnd,this);

54
client/battle/CBattleInterface.cpp
View File

@ -1218,9 +1218,14 @@ void CBattleInterface::stackIsCatapulting(const CatapultAttack & ca)
for(auto attackInfo : ca.attackedParts)
{
SDL_FreeSurface(siegeH->walls[attackInfo.attackedPart + 2]);
siegeH->walls[attackInfo.attackedPart + 2] = BitmapHandler::loadBitmap(
siegeH->getSiegeName(attackInfo.attackedPart + 2, curInt->cb->battleGetWallState(attackInfo.attackedPart)));
int wallId = attackInfo.attackedPart + 2;
//gate state changing handled separately
if(wallId == 9)
continue;
SDL_FreeSurface(siegeH->walls[wallId]);
siegeH->walls[wallId] = BitmapHandler::loadBitmap(
siegeH->getSiegeName(wallId, curInt->cb->battleGetWallState(attackInfo.attackedPart)));
}
}
@ -2724,6 +2729,38 @@ void CBattleInterface::obstaclePlaced(const CObstacleInstance & oi)
//CCS->soundh->playSound(sound);
}
void CBattleInterface::drawbridgeStateChanged(const EDrawbridgeState state)
{
auto oldState = curInt->cb->battleGetDrawbridgeState();
bool playSound = false;
int stateId = EWallState::NONE;
switch(state)
{
case EDrawbridgeState::RAISED:
if(oldState != EDrawbridgeState::RAISED_BLOCKED)
playSound = true;
break;
case EDrawbridgeState::RAISED_BLOCKED:
if(oldState != EDrawbridgeState::RAISED)
playSound = true;
break;
case EDrawbridgeState::LOWERED:
playSound = true;
stateId = EWallState::DAMAGED;
break;
case EDrawbridgeState::LOWERED_BORKED:
stateId = EWallState::DESTROYED;
break;
}
SDL_FreeSurface(siegeH->walls[9]);
siegeH->walls[9] = nullptr;
if(stateId != EWallState::NONE)
siegeH->walls[9] = BitmapHandler::loadBitmap(siegeH->getSiegeName(9, stateId));
if(playSound)
CCS->soundh->playSound(soundBase::DRAWBRG);
}
const CGHeroInstance * CBattleInterface::currentHero() const
{
if(attackingHeroInstance->tempOwner == curInt->playerID)
@ -2784,7 +2821,11 @@ CBattleInterface::SiegeHelper::SiegeHelper(const CGTownInstance *siegeTown, cons
{
for(int g = 0; g < ARRAY_COUNT(walls); ++g)
{
walls[g] = BitmapHandler::loadBitmap( getSiegeName(g) );
//drawbridge have no displayed bitmap when raised
if(g == 9)
walls[g] = nullptr;
else
walls[g] = BitmapHandler::loadBitmap( getSiegeName(g) );
}
}
@ -2892,7 +2933,8 @@ void CBattleInterface::SiegeHelper::printPartOfWall(SDL_Surface * to, int what)
if(pos.x != -1)
{
blitAt(walls[what], pos.x, pos.y, to);
if(walls[what])
blitAt(walls[what], pos.x, pos.y, to);
}
}
@ -3412,7 +3454,7 @@ BattleObjectsByHex CBattleInterface::sortObjectsByHex()
sorted.hex[62].walls.push_back(6); // 6. wall over gate
sorted.hex[12].walls.push_back(7); // 7. upper wall
sorted.beforeAll.walls.push_back(8); // 8. upper tower
//sorted.hex[94].walls.push_back(9); // 9. gate // Not implemented it seems
sorted.hex[94].walls.push_back(9); // 9. gate
sorted.hex[112].walls.push_back(10); // 10. gate arch
sorted.hex[165].walls.push_back(11); // 11. bottom static wall
sorted.hex[45].walls.push_back(12); // 12. upper static wall

2
client/battle/CBattleInterface.h
View File

@ -341,6 +341,8 @@ public:
BattleHex fromWhichHexAttack(BattleHex myNumber);
void obstaclePlaced(const CObstacleInstance & oi);
void drawbridgeStateChanged(const EDrawbridgeState state);
const CGHeroInstance * currentHero() const;
InfoAboutHero enemyHero() const;

1
lib/IGameEventsReceiver.h
View File

@ -69,6 +69,7 @@ public:
virtual void battleCatapultAttacked(const CatapultAttack & ca){}; //called when catapult makes an attack
virtual void battleStacksRemoved(const BattleStacksRemoved & bsr){}; //called when certain stack is completely removed from battlefield
virtual void battleObstaclePlaced(const CObstacleInstance &obstacle){};
virtual void battleDrawbridgeStateChanged(const EDrawbridgeState state){};
};
class DLL_LINKAGE IGameEventsReceiver

2
lib/NetPacks.h
View File

@ -1693,6 +1693,8 @@ struct BattleDrawbridgeStateChanged : public CPackForClient//3021
{
BattleDrawbridgeStateChanged(){type = 3021;};
void applyFirstCl(CClient *cl);
DLL_LINKAGE void applyGs(CGameState *gs);
EDrawbridgeState state;