[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.102,1.103

Max Horn fingolfin at users.sourceforge.net
Mon Jul 22 06:41:02 CEST 2002


Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv9203

Modified Files:
	gfx.cpp 
Log Message:
no shaking while NewGUI is showing

Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -d -r1.102 -r1.103
--- gfx.cpp	16 Jul 2002 21:03:14 -0000	1.102
+++ gfx.cpp	22 Jul 2002 13:40:03 -0000	1.103
@@ -23,6 +23,7 @@
 #include "scumm.h"
 #include "actor.h"
 #include "gui.h"
+#include "newgui.h"
 #include "resource.h"
 
 void Scumm::getGraphicsPerformance()
@@ -156,7 +157,7 @@
 	}
 
 	/* Handle shaking */
-	if (_shakeEnabled && !_gui->isActive()) {
+	if (_shakeEnabled && !_gui->isActive() && !_newgui->isActive()) {
 		_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
 		_system->set_shake_pos(shake_positions[_shakeFrame]);
 	}





More information about the Scummvm-git-logs mailing list