[Scummvm-cvs-logs] SF.net SVN: scummvm: [24833] scummvm/trunk/engines/scumm

[kirben at users.sourceforge.net]

Revision: 24833
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24833&view=rev
Author:   kirben
Date:     2006-12-10 16:40:10 -0800 (Sun, 10 Dec 2006)

Log Message:
-----------
Fix error when exiting original options screen of COMI. BlastObjects are removed, right after checking for load/save game, in original COMI.

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/intern.h
    scummvm/trunk/engines/scumm/scumm.cpp

Modified: scummvm/trunk/engines/scumm/intern.h
===================================================================
--- scummvm/trunk/engines/scumm/intern.h	2006-12-10 14:28:37 UTC (rev 24832)
+++ scummvm/trunk/engines/scumm/intern.h	2006-12-11 00:40:10 UTC (rev 24833)
@@ -961,6 +961,8 @@
 	virtual void executeOpcode(byte i);
 	virtual const char *getOpcodeDesc(byte i);
 
+	virtual void scummLoop_handleSaveLoad();
+
 	virtual void setupScummVars();
 	virtual void resetScummVars();
 	virtual void decodeParseString(int m, int n);

Modified: scummvm/trunk/engines/scumm/scumm.cpp
===================================================================
--- scummvm/trunk/engines/scumm/scumm.cpp	2006-12-10 14:28:37 UTC (rev 24832)
+++ scummvm/trunk/engines/scumm/scumm.cpp	2006-12-11 00:40:10 UTC (rev 24833)
@@ -1734,7 +1734,6 @@
 load_game:
 	scummLoop_handleSaveLoad();
 
-
 	if (_completeScreenRedraw) {
 		_charset->clearCharsetMask();
 		_charset->_hasMask = false;
@@ -1938,6 +1937,14 @@
 	}
 }
 
+#ifndef DISABLE_SCUMM_7_8
+void ScummEngine_v8::scummLoop_handleSaveLoad() {
+	ScummEngine::scummLoop_handleSaveLoad();
+
+	removeBlastObjects();
+}
+#endif
+
 void ScummEngine::scummLoop_handleDrawing() {
 	if (camera._cur != camera._last || _bgNeedsRedraw || _fullRedraw) {
 		redrawBGAreas();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.