[Scummvm-cvs-logs] CVS: scummvm/scumm input.cpp,2.5,2.6 scumm.cpp,1.273,1.274
Max Horn
fingolfin at users.sourceforge.net
Sat Nov 20 16:33:10 CET 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25810/scumm
Modified Files:
input.cpp scumm.cpp
Log Message:
Removing walkthrough stuff again (talked to aquadran about this, he had no objections)
Index: input.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/input.cpp,v
retrieving revision 2.5
retrieving revision 2.6
diff -u -d -r2.5 -r2.6
--- input.cpp 19 Nov 2004 19:50:02 -0000 2.5
+++ input.cpp 20 Nov 2004 23:49:10 -0000 2.6
@@ -65,8 +65,6 @@
_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.273
retrieving revision 1.274
diff -u -d -r1.273 -r1.274
--- scumm.cpp 19 Nov 2004 19:50:02 -0000 1.273
+++ scumm.cpp 20 Nov 2004 23:49:10 -0000 1.274
@@ -897,8 +897,6 @@
}
_midi = gs.midi;
-
- _walkthroughDialog->setGameName(detector->_game.name);
}
ScummEngine::~ScummEngine() {
@@ -945,8 +943,6 @@
free(_languageIndex);
delete _debugger;
-
- _walkthroughDialog->destroy();
}
ScummEngine_v6::ScummEngine_v6(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16])
@@ -990,8 +986,6 @@
// 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);
More information about the Scummvm-git-logs
mailing list