[Scummvm-cvs-logs] SF.net SVN: scummvm:[47830] scummvm/trunk/engines/gob

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Wed Feb 3 01:51:09 CET 2010


Revision: 47830
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47830&view=rev
Author:   strangerke
Date:     2010-02-03 00:51:09 +0000 (Wed, 03 Feb 2010)

Log Message:
-----------
Fascination - Fix screen transition 

Modified Paths:
--------------
    scummvm/trunk/engines/gob/draw.cpp
    scummvm/trunk/engines/gob/draw.h
    scummvm/trunk/engines/gob/game.cpp

Modified: scummvm/trunk/engines/gob/draw.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw.cpp	2010-02-02 23:45:14 UTC (rev 47829)
+++ scummvm/trunk/engines/gob/draw.cpp	2010-02-03 00:51:09 UTC (rev 47830)
@@ -653,7 +653,7 @@
  return true;
 }
 
-void Draw::closeWin (int16 i) {
+void Draw::closeWin(int16 i) {
 	warning("closeWin %d", i);
 	if (_fascinWin[i].id == -1)
 		return;
@@ -665,6 +665,13 @@
 	_winCount--;
 }
 
+void Draw::closeAllWin() {
+	for (int i = 0; i < 10; i++){
+		activeWin(i);
+		closeWin(i);
+	}
+}
+
 int16 Draw::openWin(int16 id) {
 	if (_fascinWin[id].id != -1)
 		return 0;

Modified: scummvm/trunk/engines/gob/draw.h
===================================================================
--- scummvm/trunk/engines/gob/draw.h	2010-02-02 23:45:14 UTC (rev 47829)
+++ scummvm/trunk/engines/gob/draw.h	2010-02-03 00:51:09 UTC (rev 47830)
@@ -193,6 +193,7 @@
 	void winDecomp(int16 x, int16 y, SurfaceDescPtr bmp);
 	void activeWin(int16 id);
 	void closeWin(int16 id);
+	void closeAllWin();
 	void restoreWin(int16 i);
 	void saveWin(int16 id);
 	void winMove(int16 id);

Modified: scummvm/trunk/engines/gob/game.cpp
===================================================================
--- scummvm/trunk/engines/gob/game.cpp	2010-02-02 23:45:14 UTC (rev 47829)
+++ scummvm/trunk/engines/gob/game.cpp	2010-02-03 00:51:09 UTC (rev 47830)
@@ -352,6 +352,8 @@
 				}
 			}
 
+			if (_vm->getGameType() == kGameTypeFascination)
+				_vm->_draw->closeAllWin();
 			if (_totToLoad[0] == 0)
 				break;
 


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