aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarisa-Chan2014-11-12 16:06:31 +0600
committerMarisa-Chan2014-11-12 16:06:31 +0600
commitf43326a533faec014fb1987f9ba3729127c46487 (patch)
treec21bf96d363febd4dc729248f5b7d7ebe57d4bd9
parente970d121ff1acbe426e652a4ac17deebaf351821 (diff)
downloadscummvm-rg350-f43326a533faec014fb1987f9ba3729127c46487.tar.gz
scummvm-rg350-f43326a533faec014fb1987f9ba3729127c46487.tar.bz2
scummvm-rg350-f43326a533faec014fb1987f9ba3729127c46487.zip
ZVISION: Clean of useless code
-rw-r--r--engines/zvision/core/events.cpp3
-rw-r--r--engines/zvision/zvision.cpp27
2 files changed, 0 insertions, 30 deletions
diff --git a/engines/zvision/core/events.cpp b/engines/zvision/core/events.cpp
index 5f8f8e243f..0d38e08b88 100644
--- 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
index 4d9830a0e3..84856429e9 100644
--- 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);