[Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.4,2.5 scumm.cpp,1.272,1.273

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16339/scumm

Modified Files:
	input.cpp scumm.cpp 
Log Message:
added walkthrough

Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.4
retrieving revision 2.5
diff -u -d -r2.4 -r2.5
--- input.cpp	22 Oct 2004 10:25:55 -0000	2.4
+++ input.cpp	19 Nov 2004 19:50:02 -0000	2.5
@@ -65,6 +65,8 @@
 					_debugger->attach();
 				else if (event.kbd.keycode == 's')
 					resourceStats();
+				else if (event.kbd.keycode == 'w')
+					_walkthroughDialog->runModal();
 				else
 					_keyPressed = event.kbd.ascii;	// Normal key press, pass on to the game.
 			} else if (event.kbd.flags & OSystem::KBD_ALT) {

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- scumm.cpp	15 Nov 2004 03:57:21 -0000	1.272
+++ scumm.cpp	19 Nov 2004 19:50:02 -0000	1.273
@@ -897,6 +897,8 @@
 	}
 
 	_midi = gs.midi;
+
+	_walkthroughDialog->setGameName(detector->_game.name);
 }
 
 ScummEngine::~ScummEngine() {
@@ -943,6 +945,8 @@
 	free(_languageIndex);
 
 	delete _debugger;
+
+	_walkthroughDialog->destroy();
 }
 
 ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]) 
@@ -986,6 +990,8 @@
 	// Initialize backend
 	_system->initSize(_screenWidth, _screenHeight);
 
+	_walkthroughDialog->create();
+
 	int cd_num = ConfMan.getInt("cdrom");
 	if (cd_num >= 0 && (_features & GF_AUDIOTRACKS))
 		_system->openCD(cd_num);