Changeset 1618 for code/branches/hud/src/util/Convert.h

Timestamp:

Jun 22, 2008, 11:47:09 PM (16 years ago)

Author:

rgrieder

Message:

• moved colours of the SpeedBar to XML file
• enabled render window updating in inactive mode (under windows the render window didn't show anything if inactive)
• added row/column to ticpp error description (there are a lot more to do this, may modify the macro..)

File:

• code/branches/hud/src/util/Convert.h (modified) (2 diffs)

code/branches/hud/src/util/Convert.h

@@ -668 +668 @@
 
         SubString tokens(input.substr(opening_parenthesis, closing_parenthesis - opening_parenthesis), ",", SubString::WhiteSpaces, false, '\\', true, '"', true, '\0', '\0', true, '\0');
-        if (tokens.size() >= 4)
+        if (tokens.size() >= 3)
         {
             if (!ConvertValue(&(output->r), tokens[0]))
@@ -676 +676 @@
             if (!ConvertValue(&(output->b), tokens[2]))
                 return false;
-            if (!ConvertValue(&(output->a), tokens[3]))
-                return false;
+            if (tokens.size() >= 4)
+            {
+                if (!ConvertValue(&(output->a), tokens[3]))
+                    return false;
+            }
+            else
+                output->a = 1.0;
 
             return true;