[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.113,1.114 dialogs.h,1.40,1.41 scumm.cpp,1.90,1.91 scumm.h,1.425,1.426

Travis Howell kirben at users.sourceforge.net
Tue Jul 20 04:31:05 CEST 2004


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

Modified Files:
	dialogs.cpp dialogs.h scumm.cpp scumm.h 
Log Message:

Add support for version key in The Dig


Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- dialogs.cpp	25 Jun 2004 22:39:19 -0000	1.113
+++ dialogs.cpp	20 Jul 2004 11:30:14 -0000	1.114
@@ -77,7 +77,8 @@
 	{73, "cancel"}, //boot11
 	{74, "quit"}, //boot12
 	{75, "ok"}, //boot13
-	{85, "game paused"}, // boot3					
+	{85, "game paused"}, // boot3
+	{96, "the dig v1.0"},
 
 	/* this is the almost complete string map for v7
 	{63, "how may I serve you?"},
@@ -602,8 +603,8 @@
 
 #pragma mark -
 
-PauseDialog::PauseDialog(ScummEngine *scumm)
-	: InfoDialog(scumm, 10) {
+PauseDialog::PauseDialog(ScummEngine *scumm, int res)
+	: InfoDialog(scumm, res) {
 }
 
 void PauseDialog::handleKeyDown(uint16 ascii, int keycode, int modifiers) {

Index: dialogs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- dialogs.h	15 Mar 2004 02:28:47 -0000	1.40
+++ dialogs.h	20 Jul 2004 11:30:15 -0000	1.41
@@ -141,7 +141,7 @@
 
 class PauseDialog : public InfoDialog {
 public:
-	PauseDialog(ScummEngine *scumm);
+	PauseDialog(ScummEngine *scumm, int res);
 	virtual void handleKeyDown(uint16 ascii, int keycode, int modifiers);
 };
 

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -d -r1.90 -r1.91
--- scumm.cpp	18 Jul 2004 11:46:50 -0000	1.90
+++ scumm.cpp	20 Jul 2004 11:30:15 -0000	1.91
@@ -372,7 +372,7 @@
 	  _version(gs.version),
 	  _heversion(gs.heversion),
 	  _features(gs.features),
-	  gdi(this), _pauseDialog(0), _optionsDialog(0), _mainMenuDialog(0),
+	  gdi(this), _pauseDialog(0), _optionsDialog(0), _mainMenuDialog(0), _versionDialog(0),
 	  _targetName(detector->_targetName) {
 
 	// Add default file directories.
@@ -437,6 +437,7 @@
 	_pauseDialog = NULL;
 	_optionsDialog = NULL;
 	_mainMenuDialog = NULL;
+	_versionDialog = NULL;
 	_fastMode = 0;
 	_actors = NULL;
 	_inventory = NULL;
@@ -946,6 +947,7 @@
 	delete _pauseDialog;
 	delete _optionsDialog;
 	delete _mainMenuDialog;
+	delete _versionDialog;
 
 	delete _sound;
 	free(_languageBuffer);
@@ -2009,6 +2011,13 @@
 		return;
 	}
 
+	// COMI version string is hard coded
+	// FT version strings are partly hard coded too
+	if (_gameId == GID_DIG && _lastKeyHit == VAR(VAR_VERSION)) {
+		versionDialog();
+		return;
+	}
+
 	if ((_version <= 2) || (_features & GF_FMTOWNS))
 		saveloadkey = 5;	// F5
 	else if ((_version <= 3) || (_gameId == GID_SAMNMAX) || (_gameId == GID_CMI))
@@ -2694,10 +2703,16 @@
 
 void ScummEngine::pauseDialog() {
 	if (!_pauseDialog)
-		_pauseDialog = new PauseDialog(this);
+		_pauseDialog = new PauseDialog(this, 10);
 	runDialog(*_pauseDialog);
 }
 
+void ScummEngine::versionDialog() {
+	if (!_versionDialog)
+		_versionDialog = new PauseDialog(this, 11);
+	runDialog(*_versionDialog);
+}
+
 void ScummEngine::mainMenuDialog() {
 	if (!_mainMenuDialog)
 		_mainMenuDialog = new MainMenuDialog(this);

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.425
retrieving revision 1.426
diff -u -d -r1.425 -r1.426
--- scumm.h	11 Jul 2004 09:15:14 -0000	1.425
+++ scumm.h	20 Jul 2004 11:30:15 -0000	1.426
@@ -418,6 +418,7 @@
 
 protected:
 	Dialog *_pauseDialog;
+	Dialog *_versionDialog;
 	Dialog *_optionsDialog;
 	Dialog *_mainMenuDialog;
 
@@ -426,6 +427,7 @@
 	void confirmexitDialog();
 	void confirmrestartDialog();
 	void pauseDialog();
+	void versionDialog();
 	void mainMenuDialog();
 public:
 	void optionsDialog();	// Used by MainMenuDialog::handleCommand()





More information about the Scummvm-git-logs mailing list