ZVISION: Clean of useless code

scummvm · Nov 12, 2014 · f43326a · f43326a
1 parent e970d12
commit f43326a
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 30 deletions.
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
@@ -198,9 +198,6 @@ void ZVision::processEvents() {
 					_kbdVelocity = (_event.kbd.keycode == Common::KEYCODE_LEFT ?
 					                -_scriptManager->getStateValue(StateKey_KbdRotateSpeed) :
 					                _scriptManager->getStateValue(StateKey_KbdRotateSpeed)) * 2;
-			case Common::KEYCODE_q:
-				if (_event.kbd.hasFlags(Common::KBD_CTRL))
-					quitGame();
 				break;
 
 			case Common::KEYCODE_UP:

diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp
@@ -170,33 +170,6 @@ void ZVision::initialize() {
 		_searchManager->addPatch("U000H01Q.RAW", "U000H01Q.SRC");
 	} else if (_gameDescription->gameId == GID_NEMESIS)
 		_searchManager->loadZix("NEMESIS.ZIX");
-	// TODO: There are 10 file clashes when we flatten the directories.
-	// From a quick look, the files are exactly the same, so it shouldn't matter.
-	// But I'm noting it here just in-case it does become a problem.
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "data3", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zassets1", 0, 2, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zassets2", 0, 2, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "znemmx", 0, 1, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zgi", 0, 4, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "zgi_mx", 0, 1, true);
-	SearchMan.addSubDirectoryMatching(gameDataDir, "fonts", 0, 1, true);
-
-	// Find zfs archive files
-	Common::ArchiveMemberList list;
-	SearchMan.listMatchingMembers(list, "*.zfs");
-
-	// Register the file entries within the zfs archives with the SearchMan
-	for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
-		Common::String name = (*iter)->getName();
-		Common::SeekableReadStream *stream = (*iter)->createReadStream();
-		ZfsArchive *archive = new ZfsArchive(name, stream);
-
-		delete stream;
-
-		SearchMan.add(name, archive);
-	}
 
 	initGraphics(WINDOW_WIDTH, WINDOW_HEIGHT, true, &_pixelFormat);