[Scummvm-cvs-logs] SF.net SVN: scummvm: [31668] scummvm/trunk/engines/made/made.cpp

john_doe at users.sourceforge.net john_doe at users.sourceforge.net
Wed Apr 23 19:41:29 CEST 2008


Revision: 31668
          http://scummvm.svn.sourceforge.net/scummvm/?rev=31668&view=rev
Author:   john_doe
Date:     2008-04-23 10:41:28 -0700 (Wed, 23 Apr 2008)

Log Message:
-----------
Loading from rtzcd.red should now actually work.

Modified Paths:
--------------
    scummvm/trunk/engines/made/made.cpp

Modified: scummvm/trunk/engines/made/made.cpp
===================================================================
--- scummvm/trunk/engines/made/made.cpp	2008-04-23 17:39:13 UTC (rev 31667)
+++ scummvm/trunk/engines/made/made.cpp	2008-04-23 17:41:28 UTC (rev 31668)
@@ -28,6 +28,7 @@
 #include "common/file.h"
 #include "common/savefile.h"
 #include "common/config-manager.h"
+#include "common/stream.h"
 
 #include "graphics/cursorman.h"
 
@@ -43,6 +44,7 @@
 #include "made/screen.h"
 #include "made/script.h"
 #include "made/sound.h"
+#include "made/redreader.h"
 
 namespace Made {
 
@@ -142,15 +144,13 @@
 		_dat->open("demo.dat");
 		_res->open("demo.prj");
 	} else {
-		_dat->open("rtzcd.dat");
+		if (Common::File::exists("rtzcd.dat"))
+			_dat->open("rtzcd.dat");
+		else
+			_dat->openFromRed("rtzcd.red", "rtzcd.dat");
 		_res->open("rtzcd.prj");
 	}
 
-	PictureResource *flex1 = _res->getPicture(78);
-	Graphics::Surface *surf = flex1->getPicture();
-	CursorMan.replaceCursor((const byte *)surf->pixels, surf->w, surf->h, 0, 0, 0);
-	CursorMan.showMouse(true);
-	_res->freeResource(flex1);
 	_eventMouseX = _eventMouseY = 0;
 	_script->runScript(_dat->getMainCodeObjectIndex());
 


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