[Scummvm-cvs-logs] scummvm master -> 5ba98f2d7b4248417ad318098efa0ce76c792fdd

bluegr md5 at scummvm.org
Wed Aug 24 20:14:38 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:
5ba98f2d7b DREAMWEB: Added a TODO and an error call to a variant of getroomdata()


Commit: 5ba98f2d7b4248417ad318098efa0ce76c792fdd
    https://github.com/scummvm/scummvm/commit/5ba98f2d7b4248417ad318098efa0ce76c792fdd
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2011-08-24T11:09:17-07:00

Commit Message:
DREAMWEB: Added a TODO and an error call to a variant of getroomdata()

This variant recursively calls itself. It's not used anywhere, so it should
be removed if it's actually unused.

Changed paths:
    engines/dreamweb/stubs.cpp



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 644150e..10ecd3a 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -692,7 +692,11 @@ void DreamGenContext::getroomdata() {
 }
 
 void DreamGenContext::getroomdata(uint8 roomIndex) {
-	getroomdata(roomIndex);
+	// FIXME: This calls itself recursively! Clearly not what was intended.
+	// It isn't called anywhere right now, so just throw an error if it's
+	// ever called.
+	//getroomdata(roomIndex);
+	error("getroomdata() with roomIndex param called");
 }
 
 void DreamGenContext::startloading() {






More information about the Scummvm-git-logs mailing list