Erwan

- fix for issue 467 (simultaneous triggers + "trigger" keyword)
- MootPoint's patch for some string parsing
- some random int/float compilation warning fixes

projects/mtg/src/utils.cpp

@@ -182,44 +182,22 @@ u32 ramAvailable (void)
 } 
 
 
-
 string& trim(string &str)
 {
-    int i,j,start,end;
-
-    //ltrim
-    for (i=0; (str[i]!=0 && str[i]<=32); )
-        i++;
-    start=i;
-
-    //rtrim
-    for(i=0,j=0; str[i]!=0; i++)
-        j = ((str[i]<=32)? j+1 : 0);
-    end=i-j;
-    str = str.substr(start,end-start);
-    return str;
+	str = ltrim(str);
+	str = rtrim(str);
+	return str;
 }
 
 
 string& ltrim(string &str)
 {
-    int i,start;
-
-    for (i=0; (str[i]!=0 && str[i]<=32); )
-        i++;
-    start=i;
-
-    str = str.substr(start,str.length()-start);
-    return str;
+	str.erase(0, str.find_first_not_of(" \t"));
+	return str;
 }
+
 string& rtrim(string &str)
 {
-    int i,j,end;
-
-    for(i=0,j=0; str[i]!=0; i++)
-        j = ((str[i]<=32)? j+1 : 0);
-    end=i-j;
-
-    str = str.substr(0,end);
-    return str;
+	str.resize(str.find_last_not_of(" \t") + 1);
+	return str;
 }