Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

J :

Browse Source 
* Fixes for compilation on 64-bit architectures :
  string position-returning functions return size_t, not uint.
  Fix that.
* Fixes warnings with new gcc about non-fixed string AND no arguments.

NOTE : 64-bit architectures still do not compile. There are 2 different places
where printf is used with a specifier that is not large enough on 64-bit because
size_t is now a ulong and not a uint. The solution on GNU systems is the %zu
specifier, but as I'm not sure it is supported on windows I don't want to
introduce a huge hard-to-notice bug, so I'll do it at a time when I got a
windowser to back me up.
This commit is contained in:
jean.chalard
2010-01-25 09:58:30 +00:00
parent 9b91fab61b
commit 0a083f4385
13 changed files with 48 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/src/MTGAbility.cpp
+12 -12
View File
@@ -273,7 +273,7 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
}
int limit = 0;
unsigned int limit_str = sWithoutTc.find("limit:");
size_t limit_str = sWithoutTc.find("limit:");
if (limit_str != string::npos){
limit = atoi(sWithoutTc.substr(limit_str+6).c_str());
}
@@ -577,9 +577,9 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
//Damage
found = s.find("damage");
if (found != string::npos){
unsigned int start = s.find(":",found);
size_t start = s.find(":",found);
if (start == string::npos) start = s.find(" ",found);
unsigned int end = s.find(" ",start);
size_t end = s.find(" ",start);
string d;
if (end != string::npos){
d = s.substr(start+1,end-start-1);
@@ -598,8 +598,8 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
//gain/lose life
found = s.find("life:");
if (found != string::npos){
unsigned int start = found+4;
unsigned int end = s.find(" ",start);
size_t start = found+4;
size_t end = s.find(" ",start);
string life_s;
if (end != string::npos){
life_s = s.substr(start+1,end-start-1);
@@ -617,8 +617,8 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
//Draw
found = s.find("draw:");
if (found != string::npos){
unsigned int start = s.find(":",found);
unsigned int end = s.find(" ",start);
size_t start = s.find(":",found);
size_t end = s.find(" ",start);
string nbcardsStr;
if (end != string::npos){
nbcardsStr = s.substr(start+1,end-start-1);
@@ -636,8 +636,8 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
//Deplete
found = s.find("deplete:");
if (found != string::npos){
unsigned int start = s.find(":",found);
unsigned int end = s.find(" ",start);
size_t start = s.find(":",found);
size_t end = s.find(" ",start);
int nbcards;
if (end != string::npos){
nbcards = atoi(s.substr(start+1,end-start-1).c_str());
@@ -665,8 +665,8 @@ MTGAbility * AbilityFactory::parseMagicLine(string s, int id, Spell * spell, MTG
//Discard
found = s.find("discard:");
if (found != string::npos){
unsigned int start = s.find(":",found);
unsigned int end = s.find(" ",start);
size_t start = s.find(":",found);
size_t end = s.find(" ",start);
int nbcards;
if (end != string::npos){
nbcards = atoi(s.substr(start+1,end-start-1).c_str());
@@ -971,7 +971,7 @@ int AbilityFactory::getAbilities(vector<MTGAbility *> * v, Spell * spell, MTGCar
string line;
int size = magicText.size();
if (size == 0) return 0;
unsigned int found;
size_t found;
int result = id;
while (magicText.size()){