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

went through the rest of cppcheck warnings, mostly harmless

Browse Source
This commit is contained in:
Ivan Savenko
2013-11-07 12:48:41 +00:00
parent 71d6b0fea9
commit ee6cdbeffe
39 changed files with 88 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/CGameState.cpp
View File

@ -719,29 +719,22 @@ int CGameState::getDate(Date::EDateType mode) const
{
case Date::DAY:
return day;
break;
case Date::DAY_OF_WEEK: //day of week
temp = (day)%7; // 1 - Monday, 7 - Sunday
if (temp)
return temp;
else return 7;
break;
return temp ? temp : 7;
case Date::WEEK: //current week
temp = ((day-1)/7)+1;
if (!(temp%4))
return 4;
else
return (temp%4);
break;
case Date::MONTH: //current month
return ((day-1)/28)+1;
break;
case Date::DAY_OF_MONTH: //day of month
temp = (day)%28;
if (temp)
return temp;
else return 28;
break;
}
return 0;
}
@ -2152,7 +2145,6 @@ int CGameState::victoryCheck( PlayerColor player ) const
}
}
return 1;
break;
case EVictoryConditionType::TAKEMINES:
for(auto & elem : map->objects)
{
@ -2166,7 +2158,6 @@ int CGameState::victoryCheck( PlayerColor player ) const
}
}
return 1;
break;
case EVictoryConditionType::TRANSPORTITEM:
{
const CGTownInstance *t = static_cast<const CGTownInstance *>(map->victoryCondition.obj);