More warning cleanup - converted certain class functions to return bool instead of int where appropriate. Also fixed the sdl update() tickCount assignment that I just broke in my last checkin.

This commit is contained in:
wrenczes@gmail.com
2011-06-02 07:01:42 +00:00
parent 90b1058ad5
commit 5b8ecd0cf7
5 changed files with 45 additions and 37 deletions
+4 -5
View File
@@ -38,25 +38,24 @@ int ActionLayer::removeFromGame(ActionElement * e)
}
int ActionLayer::moveToGarbage(ActionElement * e)
bool ActionLayer::moveToGarbage(ActionElement * e)
{
if (removeFromGame(e))
{
garbage.push_back(e);
return 1;
return true;
}
return 0;
return false;
}
int ActionLayer::cleanGarbage()
void ActionLayer::cleanGarbage()
{
for (size_t i = 0; i < garbage.size(); ++i)
{
delete (garbage[i]);
}
garbage.clear();
return 1;
}
int ActionLayer::reactToClick(ActionElement * ability, MTGCardInstance * card)
+21 -21
View File
@@ -532,79 +532,79 @@ MTGCardInstance * MTGGameZone::findByName(string name)
return NULL;
}
int MTGGameZone::hasType(const char * value)
bool MTGGameZone::hasType(const char * value)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->hasType(value))
{
return 1;
return true;
}
}
return 0;
return false;
}
int MTGGameZone::hasPrimaryType(const char * value,const char * secondvalue)
bool MTGGameZone::hasPrimaryType(const char * value,const char * secondvalue)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->hasType(value) && cards[i]->hasType(secondvalue))
{
return 1;
return true;
}
}
return 0;
}
int MTGGameZone::hasSpecificType(const char * value,const char * secondvalue)
bool MTGGameZone::hasSpecificType(const char * value,const char * secondvalue)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->hasType(value) && cards[i]->hasSubtype(secondvalue))
{
return 1;
return true;
}
}
return 0;
return false;
}
int MTGGameZone::hasTypeButNotType(const char * value,const char * secondvalue)
bool MTGGameZone::hasTypeButNotType(const char * value,const char * secondvalue)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->hasType(value) && cards[i]->hasSubtype(value) && !cards[i]->hasType(secondvalue) && !cards[i]->hasSubtype(secondvalue))
{
return 1;
return true;
}
}
return 0;
return false;
}
int MTGGameZone::hasName(string value)
bool MTGGameZone::hasName(string value)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->name == value)
{
return 1;
return true;
}
}
return 0;
return false;
}
int MTGGameZone::hasColor(int value)
bool MTGGameZone::hasColor(int value)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->getManaCost()->hasColor(value) && cards[i]->getManaCost()->getConvertedCost() > 0)
{
return 1;
return true;
}
}
return 0;
return false;
}
int MTGGameZone::hasX()
bool MTGGameZone::hasX()
{
for (int i = 0; i < (nb_cards); i++)
{
@@ -616,16 +616,16 @@ int MTGGameZone::hasX()
return false;
}
int MTGGameZone::hasAbility(int ability)
bool MTGGameZone::hasAbility(int ability)
{
for (int i = 0; i < (nb_cards); i++)
{
if (cards[i]->basicAbilities[ability])
{
return 1;
return true;
}
}
return 0;
return false;
}
int MTGGameZone::seenThisTurn(TargetChooser * tc, int castMethod)