- fix for issue 467 (simultaneous triggers + "trigger" keyword)
- MootPoint's patch for some string parsing
- some random int/float compilation warning fixes
This commit is contained in:
wagic.the.homebrew@gmail.com
2010-10-01 16:33:07 +00:00
parent f4e87b7daf
commit 508040b3a7
9 changed files with 56 additions and 48 deletions
+9 -5
View File
@@ -843,19 +843,23 @@ bool GameOptionAward::read(string input){
tvals[i] = 0;
string buf;
for(size_t t=0,i=0;;t++){
if(!isdigit(input[t])){
if(!isspace(input[t]) && buf.size()){
for (size_t t=0,i=0; t < input.size();t++)
{
if(!isdigit(input[t]))
{
if(!isspace(input[t]) && buf.size())
{
tvals[i] = atoi(buf.c_str());
if(tvals[i] < 0)
tvals[i] = 0;
buf.clear();
i++; //Advance through input.
}
}else
}
else
buf+= input[t];
if(t >= input.size() || i >= 5)
if (i >= 5)
break;
}