[Scummvm-cvs-logs] SF.net SVN: scummvm:[34660] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sat Sep 27 20:34:24 CEST 2008


Revision: 34660
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34660&view=rev
Author:   fingolfin
Date:     2008-09-27 18:34:24 +0000 (Sat, 27 Sep 2008)

Log Message:
-----------
Fixed a nasty bug in SearchManager::addDirectory; made the 'char' constructor of Common::String explicit, to avoid such bugs in the future

Modified Paths:
--------------
    scummvm/trunk/common/archive.cpp
    scummvm/trunk/common/str.h
    scummvm/trunk/engines/parallaction/balloons.cpp

Modified: scummvm/trunk/common/archive.cpp
===================================================================
--- scummvm/trunk/common/archive.cpp	2008-09-27 18:32:01 UTC (rev 34659)
+++ scummvm/trunk/common/archive.cpp	2008-09-27 18:34:24 UTC (rev 34660)
@@ -338,7 +338,7 @@
 }
 
 void SearchManager::addDirectory(const String &name, const String &directory) {
-	addDirectoryRecursive(name, 1);
+	addDirectoryRecursive(name, directory, 1);
 }
 
 void SearchManager::addDirectoryRecursive(const String &name, const String &directory, int depth) {

Modified: scummvm/trunk/common/str.h
===================================================================
--- scummvm/trunk/common/str.h	2008-09-27 18:32:01 UTC (rev 34659)
+++ scummvm/trunk/common/str.h	2008-09-27 18:34:24 UTC (rev 34660)
@@ -112,7 +112,7 @@
 	String(const String &str);
 	
 	/** Construct a string consisting of the given character. */
-	String(char c);
+	explicit String(char c);
 
 	~String();
 

Modified: scummvm/trunk/engines/parallaction/balloons.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/balloons.cpp	2008-09-27 18:32:01 UTC (rev 34659)
+++ scummvm/trunk/engines/parallaction/balloons.cpp	2008-09-27 18:34:24 UTC (rev 34660)
@@ -79,7 +79,7 @@
 			token = tokenizer.nextToken();
 			token = expand(token);
 
-			if (token == '/') {
+			if (token == "/") {
 				tokenWidth = 0;
 				action();
 				textNewLine();


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