[Scummvm-cvs-logs] CVS: scummvm gfx.cpp,1.69,1.70 gui.cpp,1.34,1.35

[James Brown]

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

Modified Files:
	gfx.cpp gui.cpp 
Log Message:
Don't shake when GUI is displayed.



Index: gfx.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gfx.cpp,v
retrieving revision 1.69
retrieving revision 1.70
diff -C2 -d -r1.69 -r1.70
*** gfx.cpp	17 Apr 2002 17:01:08 -0000	1.69
--- gfx.cpp	18 Apr 2002 15:02:57 -0000	1.70
***************
*** 22,25 ****
--- 22,26 ----
  #include "stdafx.h"
  #include "scumm.h"
+ #include "gui.h"
  
  void Scumm::getGraphicsPerformance()
***************
*** 152,156 ****
  
  	/* Handle shaking */
! 	if (_shakeEnabled) {
  		_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
  		_system->set_shake_pos(shake_positions[_shakeFrame]);
--- 153,157 ----
  
  	/* Handle shaking */
! 	if (_shakeEnabled &&  !_gui->_active) {
  		_shakeFrame = (_shakeFrame + 1) & (NUM_SHAKE_POSITIONS - 1);
  		_system->set_shake_pos(shake_positions[_shakeFrame]);

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** gui.cpp	17 Apr 2002 16:02:29 -0000	1.34
--- gui.cpp	18 Apr 2002 15:02:57 -0000	1.35
***************
*** 785,789 ****
  			return;
  
! 		if (letter == 13) {
  			handleCommand(8);
  			return;
--- 785,789 ----
  			return;
  
! 		if (letter == 13) { 
  			handleCommand(8);
  			return;