[Scummvm-cvs-logs] CVS: scummvm scummvm.cpp,1.110,1.111 gui.h,1.15,1.16 gui.cpp,1.30,1.31

[Ludvig Strigeus]

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

Modified Files:
	scummvm.cpp gui.h gui.cpp 
Log Message:
fixed colors in gui

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -d -r1.110 -r1.111
*** scummvm.cpp	14 Apr 2002 19:43:11 -0000	1.110
--- scummvm.cpp	15 Apr 2002 17:16:09 -0000	1.111
***************
*** 769,778 ****
  void Scumm::pauseGame(bool user)
  {
! 	((Gui *)_gui)->pause(this);
  }
  
  void Scumm::setOptions()
  {
! 	((Gui *)_gui)->options(this);
  }
  
--- 769,778 ----
  void Scumm::pauseGame(bool user)
  {
! 	((Gui *)_gui)->pause();
  }
  
  void Scumm::setOptions()
  {
! 	((Gui *)_gui)->options();
  }
  
***************
*** 834,838 ****
  		if (_features & GF_AFTER_V7)
  			runScript(_vars[VAR_UNK_SCRIPT], 0, 0, 0);
! 		((Gui *)_gui)->saveLoadDialog(this);
  		if (_features & GF_AFTER_V7)
  			runScript(_vars[VAR_UNK_SCRIPT_2], 0, 0, 0);
--- 834,838 ----
  		if (_features & GF_AFTER_V7)
  			runScript(_vars[VAR_UNK_SCRIPT], 0, 0, 0);
! 		((Gui *)_gui)->saveLoadDialog();
  		if (_features & GF_AFTER_V7)
  			runScript(_vars[VAR_UNK_SCRIPT_2], 0, 0, 0);
***************
*** 1194,1198 ****
  		last_time = _system->get_msecs();
  		if (_gui->_active) {
! 			_gui->loop(this);
  			delta = 5;
  		} else {
--- 1194,1198 ----
  		last_time = _system->get_msecs();
  		if (_gui->_active) {
! 			_gui->loop();
  			delta = 5;
  		} else {

Index: gui.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** gui.h	13 Apr 2002 04:39:04 -0000	1.15
--- gui.h	15 Apr 2002 17:16:10 -0000	1.16
***************
*** 89,93 ****
  	bool valid_games[9];
  	char game_names[9][SAVEGAME_NAME_LEN];
! 	void loop(Scumm *s);
  	void init(Scumm *s);
  	void draw(int start, int end);
--- 89,93 ----
  	bool valid_games[9];
  	char game_names[9][SAVEGAME_NAME_LEN];
! 	void loop();
  	void init(Scumm *s);
  	void draw(int start, int end);
***************
*** 116,123 ****
  
  	// Dialogs
! 	void saveLoadDialog(Scumm *s);
! 	void pause(Scumm *s);
! 	void options(Scumm *s);
! 	void launcher(Scumm *s);
  
  	void handleSoundDialogCommand(int cmd);
--- 116,123 ----
  
  	// Dialogs
! 	void saveLoadDialog();
! 	void pause();
! 	void options();
! 	void launcher();
  
  	void handleSoundDialogCommand(int cmd);

Index: gui.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/gui.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** gui.cpp	14 Apr 2002 18:13:07 -0000	1.30
--- gui.cpp	15 Apr 2002 17:16:10 -0000	1.31
***************
*** 676,680 ****
  		return;
  	case 9:											/* options button */
! 		options(_s);
  		draw(0, 100);
  		return;
--- 676,680 ----
  		return;
  	case 9:											/* options button */
! 		options();
  		draw(0, 100);
  		return;
***************
*** 823,834 ****
  }
  
! void Gui::loop(Scumm *s)
  {
- 	init(s);
  	if (_active == 1) {
  		_active++;
  		draw(0, 200);								// was 100
! 		_old_cursor_mode = s->_system->show_mouse(true);
! 		s->pauseSounds(true);
  	}
  
--- 823,833 ----
  }
  
! void Gui::loop()
  {
  	if (_active == 1) {
  		_active++;
  		draw(0, 200);								// was 100
! 		_old_cursor_mode = _s->_system->show_mouse(true);
! 		_s->pauseSounds(true);
  	}
  
***************
*** 877,883 ****
  }
  
! void Gui::saveLoadDialog(Scumm *s)
  {
- 	init(s);
  	_widgets[0] = save_load_dialog;
  	_editString = -1;
--- 876,881 ----
  }
  
! void Gui::saveLoadDialog()
  {
  	_widgets[0] = save_load_dialog;
  	_editString = -1;
***************
*** 887,893 ****
  }
  
! void Gui::pause(Scumm *s)
  {
- 	init(s);
  	_widgets[0] = pause_dialog;
  	_cur_page = 0;
--- 885,890 ----
  }
  
! void Gui::pause()
  {
  	_widgets[0] = pause_dialog;
  	_cur_page = 0;
***************
*** 896,902 ****
  }
  
! void Gui::options(Scumm *s)
  {
- 	init(s);
  	_widgets[0] = options_dialog;
  	_active = true;
--- 893,898 ----
  }
  
! void Gui::options()
  {
  	_widgets[0] = options_dialog;
  	_active = true;
***************
*** 905,911 ****
  }
  
! void Gui::launcher(Scumm *s)
  {
- 	init(s);
  	_widgets[0] = launcher_dialog;
  	_active = true;
--- 901,906 ----
  }
  
! void Gui::launcher()
  {
  	_widgets[0] = launcher_dialog;
  	_active = true;