[Scummvm-cvs-logs] SF.net SVN: scummvm:[53987] scummvm/trunk/engines/hugo

strangerke at users.sourceforge.net strangerke at users.sourceforge.net
Sun Oct 31 22:20:22 CET 2010


Revision: 53987
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53987&view=rev
Author:   strangerke
Date:     2010-10-31 21:20:22 +0000 (Sun, 31 Oct 2010)

Log Message:
-----------
HUGO: Suppress Playback code

Also change 3 variable types in order to match types used 
in create_hugo 

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/file.cpp
    scummvm/trunk/engines/hugo/file.h
    scummvm/trunk/engines/hugo/hugo.cpp
    scummvm/trunk/engines/hugo/hugo.h

Modified: scummvm/trunk/engines/hugo/file.cpp
===================================================================
--- scummvm/trunk/engines/hugo/file.cpp	2010-10-31 20:57:50 UTC (rev 53986)
+++ scummvm/trunk/engines/hugo/file.cpp	2010-10-31 21:20:22 UTC (rev 53987)
@@ -470,24 +470,6 @@
 		Utils::Error(WRITE_ERR, "%s", _vm->_initFilename.c_str());
 }
 
-void FileManager::openPlaybackFile(bool playbackFl, bool recordFl) {
-	debugC(1, kDebugFile, "openPlaybackFile(%d, %d)", (playbackFl) ? 1 : 0, (recordFl) ? 1 : 0);
-
-/*
-	if (playbackFl) {
-		if (!(fpb = fopen(PBFILE, "r+b")))
-			Utils::Error(FILE_ERR, "%s", PBFILE);
-	} else if (recordFl) {
-		fpb = fopen(PBFILE, "wb");
-	}
-*/
-	pbdata.time = 0;                                // Say no key available
-}
-
-void FileManager::closePlaybackFile() {
-//	fclose(fpb);
-}
-
 void FileManager::printBootText() {
 // Read the encrypted text from the boot file and print it
 	debugC(1, kDebugFile, "printBootText");

Modified: scummvm/trunk/engines/hugo/file.h
===================================================================
--- scummvm/trunk/engines/hugo/file.h	2010-10-31 20:57:50 UTC (rev 53986)
+++ scummvm/trunk/engines/hugo/file.h	2010-10-31 21:20:22 UTC (rev 53987)
@@ -47,12 +47,6 @@
 	byte   fill2[60];
 };                                                  // Header of a PCC file
 
-// Record and playback handling stuff:
-struct pbdata_t {
-//	int    key;                                     // Character
-	uint32 time;                                    // Time at which character was pressed
-};
-
 namespace Hugo {
 
 class FileManager {
@@ -64,7 +58,6 @@
 	bool     fileExists(char *filename);
 	sound_pt getSound(short sound, uint16 *size);
 
-	void     closePlaybackFile();
 	void     initSavedGame();
 	void     instructions();
 	void     readBootFile();
@@ -95,14 +88,8 @@
 	byte *convertPCC(byte *p, uint16 y, uint16 bpl, image_pt data_p);
 	uif_hdr_t *getUIFHeader(uif_t id);
 
-	pbdata_t pbdata;
-//	FILE *fpb;
-
 //Strangerke : Not used?
-	void     openPlaybackFile(bool playbackFl, bool recordFl);
 	void     printBootText();
-//	bool     pkkey();
-//	char     pbget();
 };
 
 class FileManager_v1d : public FileManager {

Modified: scummvm/trunk/engines/hugo/hugo.cpp
===================================================================
--- scummvm/trunk/engines/hugo/hugo.cpp	2010-10-31 20:57:50 UTC (rev 53986)
+++ scummvm/trunk/engines/hugo/hugo.cpp	2010-10-31 21:20:22 UTC (rev 53987)
@@ -287,6 +287,7 @@
 				break;
 			}
 		}
+		_status.doQuitFl = shouldQuit();            // update game quit flag
 	}
 	return Common::kNoError;
 }
@@ -1237,13 +1238,13 @@
 	}
 	for (int varnt = 0; varnt < _numVariant; varnt++) {
 		if (varnt == _gameVariant) {
-			_tunesNbr     = in.readByte();
-			_soundSilence = in.readByte();
-			_soundTest    = in.readByte();
+			_tunesNbr     = in.readSByte();
+			_soundSilence = in.readSByte();
+			_soundTest    = in.readSByte();
 		} else {
-			in.readByte();
-			in.readByte();
-			in.readByte();
+			in.readSByte();
+			in.readSByte();
+			in.readSByte();
 		}
 	}
 
@@ -1585,8 +1586,6 @@
 	debugC(1, kDebugEngine, "shutdown");
 
 	_file->closeDatabaseFiles();
-	if (_status.recordFl || _status.playbackFl)
-		_file->closePlaybackFile();
 	_object->freeObjects();
 }
 

Modified: scummvm/trunk/engines/hugo/hugo.h
===================================================================
--- scummvm/trunk/engines/hugo/hugo.h	2010-10-31 20:57:50 UTC (rev 53986)
+++ scummvm/trunk/engines/hugo/hugo.h	2010-10-31 21:20:22 UTC (rev 53987)
@@ -114,9 +114,9 @@
 	byte   _gameVariant;
 	byte   _maxInvent;
 	byte   _numBonuses;
-	byte   _soundSilence;
-	byte   _soundTest;
-	byte   _tunesNbr;
+	int8   _soundSilence;
+	int8   _soundTest;
+	int8   _tunesNbr;
 	uint16 _numScreens;
 
 	object_t *_hero;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list