games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-29 23:07:48 +02:00
Code Issues Releases Activity

- fixed some extra warnings. Mostly harmless.

Browse Source 
NOTE: Please check changes in BattleState.cpp and GameHandler.cpp for possible bugs
This commit is contained in:
Ivan Savenko
2012-05-28 19:29:32 +00:00
parent 61ccabde53
commit faaf799d95
18 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/CGameHandler.cpp
View File

@@ -1517,7 +1517,7 @@ void CGameHandler::run(bool resume)
for(; i != gs->players.end(); i++)
{
if((i->second.towns.size()==0 && i->second.heroes.size()==0)
|| i->second.color<0
//|| i->second.color<0 //FIXME: color is unsigned. Redundant or incorrect check?
|| i->first>=GameConstants::PLAYER_LIMIT
|| i->second.status)
{
@@ -4984,7 +4984,7 @@ void CGameHandler::checkLossVictory( ui8 player )
}
}
void CGameHandler::getLossVicMessage( ui8 player, ui8 standard, bool victory, InfoWindow &out ) const
void CGameHandler::getLossVicMessage( ui8 player, si8 standard, bool victory, InfoWindow &out ) const
{
// const PlayerState *p = gs->getPlayer(player);
// if(!p->human)
@@ -4994,7 +4994,7 @@ void CGameHandler::getLossVicMessage( ui8 player, ui8 standard, bool victory, In
if(victory)
{
if(standard < 0) //not std loss
if(standard > 0) //not std loss
{
switch(gs->map->victoryCondition.condition)
{
@@ -5055,7 +5055,7 @@ void CGameHandler::getLossVicMessage( ui8 player, ui8 standard, bool victory, In
}
else
{
if(standard < 0) //not std loss
if(standard > 0) //not std loss
{
switch(gs->map->lossCondition.typeOfLossCon)
{