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

* JsonReader can convert to enums

Browse Source 
* refactoring
This commit is contained in:
mateuszb
2013-02-03 21:05:44 +00:00
parent 1fca96257d
commit 8769f67c5d
38 changed files with 312 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/IGameCallback.cpp
View File

@@ -651,14 +651,14 @@ const CMapHeader * CGameInfoCallback::getMapHeader() const
bool CGameInfoCallback::hasAccess(int playerId) const
{
return player < 0 || gs->getPlayerRelations( playerId, player );
return player < 0 || gs->getPlayerRelations( playerId, player ) != PlayerRelations::ENEMIES;
}
int CGameInfoCallback::getPlayerStatus(int player) const
{
const PlayerState *ps = gs->getPlayer(player, false);
if(!ps)
return -1;
ERROR_RET_VAL_IF(!ps, "No such player!", -1);
return ps->status;
}
@@ -667,7 +667,7 @@ std::string CGameInfoCallback::getTavernGossip(const CGObjectInstance * townOrTa
return "GOSSIP TEST";
}
int CGameInfoCallback::getPlayerRelations( ui8 color1, ui8 color2 ) const
PlayerRelations::PlayerRelations CGameInfoCallback::getPlayerRelations( TPlayerColor color1, TPlayerColor color2 ) const
{
return gs->getPlayerRelations(color1, color2);
}