[Scummvm-cvs-logs] scummvm master -> fd9e50e24577714dc6583c1f3fdf14173e15a95f

tramboi bertrand_augereau at yahoo.fr
Wed Aug 24 20:59:37 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:
fd9e50e245 DREAMWEB: Wrong and useless 'getroomdata' overload spotted by bluegr removed


Commit: fd9e50e24577714dc6583c1f3fdf14173e15a95f
    https://github.com/scummvm/scummvm/commit/fd9e50e24577714dc6583c1f3fdf14173e15a95f
Author: Bertrand Augereau (bertrand_augereau at yahoo.fr)
Date: 2011-08-24T13:55:54-07:00

Commit Message:
DREAMWEB: Wrong and useless 'getroomdata' overload spotted by bluegr removed

Changed paths:
    engines/dreamweb/stubs.cpp
    engines/dreamweb/stubs.h



diff --git a/engines/dreamweb/stubs.cpp b/engines/dreamweb/stubs.cpp
index 1f10f48..22a3cf0 100644
--- a/engines/dreamweb/stubs.cpp
+++ b/engines/dreamweb/stubs.cpp
@@ -691,14 +691,6 @@ void DreamGenContext::getroomdata() {
 	bx = kRoomdata + sizeof(Room) * al;
 }
 
-void DreamGenContext::getroomdata(uint8 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() {
 	const Room *room = (Room *)cs.ptr(bx, sizeof(Room));
 	startloading(room);
diff --git a/engines/dreamweb/stubs.h b/engines/dreamweb/stubs.h
index 555acfb..8fbfda3 100644
--- a/engines/dreamweb/stubs.h
+++ b/engines/dreamweb/stubs.h
@@ -61,7 +61,6 @@
 	void kernchars();
 	uint8 kernchars(uint8 firstChar, uint8 secondChar, uint8 width);
 	void getroomdata();
-	void getroomdata(uint8 roomIndex);
 	void readheader();
 	void fillspace();
 	void startloading();






More information about the Scummvm-git-logs mailing list