[Scummvm-cvs-logs] SF.net SVN: scummvm: [22822] scummvm/trunk/gui/eval.cpp

wjpalenstijn at users.sourceforge.net wjpalenstijn at users.sourceforge.net
Thu Jun 1 15:45:02 CEST 2006


Revision: 22822
Author:   wjpalenstijn
Date:     2006-06-01 15:44:43 -0700 (Thu, 01 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=22822&view=rev

Log Message:
-----------
small optimization in evaluator variable lookup

Modified Paths:
--------------
    scummvm/trunk/gui/eval.cpp
Modified: scummvm/trunk/gui/eval.cpp
===================================================================
--- scummvm/trunk/gui/eval.cpp	2006-06-01 22:44:08 UTC (rev 22821)
+++ scummvm/trunk/gui/eval.cpp	2006-06-01 22:44:43 UTC (rev 22822)
@@ -289,11 +289,15 @@
 		return val;
 
 	String var = String(s);
-	if (includeAliases && _aliases.contains(var))
-		var = _aliases[var];
+	if (includeAliases) {
+		AliasesMap::const_iterator itera = _aliases.find(var);
+		if (itera != _aliases.end())
+			var = itera->_value;
+	}
 
-	if (_vars.contains(var))
-		return _vars[var];
+	VariablesMap::const_iterator iterv = _vars.find(var);
+	if (iterv != _vars.end())
+		return iterv->_value;
 
 	return EVAL_UNDEF_VAR;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.





More information about the Scummvm-git-logs mailing list