games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Use isTeleportChannel callback functions to check teleport channel type

Browse Source
This commit is contained in:
ArseniyShestakov
2015-03-09 02:13:40 +03:00
parent 0c1a37e5a7
commit 8f8d237d5d
3 changed files with 12 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/mapObjects/MiscObjects.cpp
View File

@ -878,13 +878,10 @@ void CGMonolith::onHeroVisit( const CGHeroInstance * h ) const
TeleportDialog td(h, channel);
if(isEntrance())
{
if(ETeleportChannelType::BIDIRECTIONAL == cb->getTeleportChannelType(channel)
&& cb->getTeleportChannelExits(channel).size() > 1)
{
if(cb->isTeleportChannelBidirectional(channel) && 1 < cb->getTeleportChannelExits(channel).size())
td.exits = cb->getTeleportChannelExits(channel);
}
if(ETeleportChannelType::IMPASSABLE == cb->getTeleportChannelType(channel))
if(cb->isTeleportChannelImpassable(channel))
{
logGlobal->debugStream() << "Cannot find corresponding exit monolith for "<< id << " (obj at " << pos << ") :(";
td.impassable = true;
@ -948,7 +945,7 @@ void CGMonolith::initObj()
void CGSubterraneanGate::onHeroVisit( const CGHeroInstance * h ) const
{
TeleportDialog td(h, channel);
if(ETeleportChannelType::IMPASSABLE == cb->getTeleportChannelType(channel)) //no exit
if(cb->isTeleportChannelImpassable(channel))
{
showInfoDialog(h,153,0);//Just inside the entrance you find a large pile of rubble blocking the tunnel. You leave discouraged.
logGlobal->debugStream() << "Cannot find exit subterranean gate for "<< id << " (obj at " << pos << ") :(";
@ -1018,7 +1015,7 @@ void CGSubterraneanGate::postInit( CGameState * gs ) //matches subterranean gate
void CGWhirlpool::onHeroVisit( const CGHeroInstance * h ) const
{
TeleportDialog td(h, channel);
if(ETeleportChannelType::IMPASSABLE == cb->getTeleportChannelType(channel))
if(cb->isTeleportChannelImpassable(channel))
{
logGlobal->debugStream() << "Cannot find exit whirlpool for "<< id << " (obj at " << pos << ") :(";
td.impassable = true;