[Scummvm-cvs-logs] scummvm master -> 49f209a4d20bec37fe567164671c3341a3e8d300

bluegr md5 at scummvm.org
Sat Jul 9 13:37:11 CEST 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
49f209a4d2 MOHAWK: Silence MSVC warnings


Commit: 49f209a4d20bec37fe567164671c3341a3e8d300
    https://github.com/scummvm/scummvm/commit/49f209a4d20bec37fe567164671c3341a3e8d300
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-07-09T04:34:59-07:00

Commit Message:
MOHAWK: Silence MSVC warnings

Changed paths:
    engines/mohawk/livingbooks.h
    engines/mohawk/livingbooks_code.cpp



diff --git a/engines/mohawk/livingbooks.h b/engines/mohawk/livingbooks.h
index 8426945..27e703a 100644
--- a/engines/mohawk/livingbooks.h
+++ b/engines/mohawk/livingbooks.h
@@ -673,7 +673,7 @@ public:
 	GUI::Debugger *getDebugger() { return _console; }
 
 	void addArchive(Archive *archive);
-	void removeArchive(Archive *Archive);
+	void removeArchive(Archive *archive);
 	void addItem(LBItem *item);
 	void removeItems(const Common::Array<LBItem *> &items);
 
diff --git a/engines/mohawk/livingbooks_code.cpp b/engines/mohawk/livingbooks_code.cpp
index 6531f65..80b5fe9 100644
--- a/engines/mohawk/livingbooks_code.cpp
+++ b/engines/mohawk/livingbooks_code.cpp
@@ -1181,8 +1181,8 @@ bool LBCode::parseCodeSymbol(const Common::String &name, uint &pos, Common::Arra
 	// first, check whether the name matches a known function
 	for (uint i = 0; i < 2; i++) {
 		byte cmdToken;
-		CodeCommandInfo *cmdInfo;
-		uint cmdCount;
+		CodeCommandInfo *cmdInfo = NULL;
+		uint cmdCount = 0;
 
 		switch (i) {
 		case 0:






More information about the Scummvm-git-logs mailing list