From bb9f09df823aa616011fe9ace04b55ff68c0196c Mon Sep 17 00:00:00 2001 From: "jean.chalard" Date: Thu, 25 Dec 2008 13:18:54 +0000 Subject: [PATCH] J : * Fix a warning. --- projects/mtg/src/MTGAbility.cpp | 6 +++--- projects/mtg/src/MTGGameZones.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/mtg/src/MTGAbility.cpp b/projects/mtg/src/MTGAbility.cpp index d14c58aaa..a038f9683 100644 --- a/projects/mtg/src/MTGAbility.cpp +++ b/projects/mtg/src/MTGAbility.cpp @@ -62,13 +62,13 @@ int AbilityFactory::putInPlayFromZone(MTGCardInstance * card, MTGGameZone * zone int AbilityFactory::parsePowerToughness(string s, int *power, int *toughness){ - int found = s.find("/"); + size_t found = s.find("/"); if (found != string::npos){ - unsigned int start = s.find(":"); + size_t start = s.find(":"); if (start == string::npos) start = s.find(" "); if (start == string::npos) start = -1; *power = atoi(s.substr(start+1,s.size()-found).c_str()); - unsigned int end = s.find(" ",start); + size_t end = s.find(" ",start); if (end != string::npos){ *toughness = atoi(s.substr(found+1,end-found-1).c_str()); }else{ diff --git a/projects/mtg/src/MTGGameZones.cpp b/projects/mtg/src/MTGGameZones.cpp index 7f3dafdb5..21f7446de 100644 --- a/projects/mtg/src/MTGGameZones.cpp +++ b/projects/mtg/src/MTGGameZones.cpp @@ -349,5 +349,5 @@ MTGGameZone * MTGGameZone::stringToZone(string zoneName, MTGCardInstance * sourc if(zoneName.compare("myremovedfromgame") == 0)return p->game->removedFromGame; if(zoneName.compare("opponentremovedfromgame") == 0) return p->opponent()->game->removedFromGame; if(zoneName.compare("ownerhremovedfromgame") == 0) return source->owner->game->removedFromGame; - -} \ No newline at end of file + return NULL; +}