Changeset 6417 for code/trunk/src/libraries/core/input/Button.cc

Timestamp:

Dec 25, 2009, 10:23:58 PM (15 years ago)

Author:

rgrieder

Message:

Merged presentation2 branch back to trunk.
Major new features:

• Actual GUI with settings, etc.
• Improved space ship steering (human interaction)
• Rocket fire and more particle effects
• Advanced sound framework

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/libraries/core/input/Button.cc (modified) (4 diffs)

code/trunk/src/libraries/core/input/Button.cc

@@ -116 +116 @@
         for (unsigned int iCommand = 0; iCommand < commandStrings.size(); iCommand++)
         {
-            if (commandStrings[iCommand] != "")
+            if (!commandStrings[iCommand].empty())
             {
                 SubString tokens(commandStrings[iCommand], " ", SubString::WhiteSpaces, false,
@@ -123 +123 @@
                 KeybindMode::Value mode = KeybindMode::None;
                 float paramModifier = 1.0f;
-                std::string commandStr = "";
+                std::string commandStr;
 
                 for (unsigned int iToken = 0; iToken < tokens.size(); ++iToken)
                 {
-                    std::string token = getLowercase(tokens[iToken]);
+                    const std::string& token = getLowercase(tokens[iToken]);
 
                     if (token == "onpress")
@@ -159 +159 @@
                         // we interpret everything from here as a command string
                         while (iToken != tokens.size())
-                            commandStr += tokens[iToken++] + " ";
-                    }
-                }
-
-                if (commandStr == "")
+                            commandStr += tokens[iToken++] + ' ';
+                    }
+                }
+
+                if (commandStr.empty())
                 {
                     parseError("No command string given.", false);
@@ -242 +242 @@
     }
 
-    inline void Button::parseError(std::string message, bool serious)
+    inline void Button::parseError(const std::string& message, bool serious)
     {
         if (serious)