VOYEUR: Removed redundant LockClass class

4 files changed, 4 insertions, 132 deletions

diff --git a/engines/voyeur/module.mk b/engines/voyeur/module.mk
index f2a69dfe76..aab254cf36 100644
--- a/engines/voyeur/module.mk
+++ b/engines/voyeur/module.mk
@@ -11,7 +11,6 @@ MODULE_OBJS := \
 	graphics.o \
 	sound.o \
 	staticres.o \
-	utils.o \
 	voyeur.o \
 	voyeur_game.o
 
diff --git a/engines/voyeur/utils.cpp b/engines/voyeur/utils.cpp
deleted file mode 100644
index 74470dc6c7..0000000000
--- a/engines/voyeur/utils.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#include "voyeur/utils.h"
-#include "common/savefile.h"
-
-namespace Voyeur {
-
-LockTime::LockTime() { 
-	field0 = field1 = field2 = field3 = 0; 
-}
-
-void LockClass::getSysDate() {
-	// May not be needed for ScummVM
-}
-
-void LockClass::getThePassword() {
-	field0 = 26;
-	_password = "3333";
-	fieldE = field16;
-	field12 = field1A;
-	fieldC = -1;
-
-	// TODO: Original loaded 'VOYEUR.DAT' here to get most recent game's password.
-	// but since we allow seperate savegames in ScummVM, this is somewhat deprecated.
-}
-
-void LockClass::saveThePassword() {
-	// May not be needed for ScummVM
-}
-
-Common::String LockClass::getDateString() {
-	return Common::String("ScummVM");
-}
-
-} // End of namespace Voyeur
diff --git a/engines/voyeur/utils.h b/engines/voyeur/utils.h
deleted file mode 100644
index b9266781dc..0000000000
--- a/engines/voyeur/utils.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* ScummVM - Graphic Adventure Engine
- *
- * ScummVM is the legal property of its developers, whose names
- * are too numerous to list here. Please refer to the COPYRIGHT
- * file distributed with this source distribution.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
-
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
-
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- */
-
-#ifndef VOYEUR_UTILS_H
-#define VOYEUR_UTILS_H
-
-#include "common/scummsys.h"
-#include "common/str.h"
-
-namespace Voyeur {
-
-class LockTime {
-public:
-	int field0;
-	int field1;
-	int field2;
-	int field3;
-
-	LockTime();
-};
-
-class LockClass {
-public:
-	int field0;
-	Common::String _password;
-	int fieldC;
-	LockTime fieldE;
-	int field12;
-	LockTime field16;
-	int field1A;
-public:
-	void getSysDate();
-	void getThePassword();
-	void saveThePassword();
-	Common::String getDateString();
-};
-
-} // End of namespace Voyeur
-
-#endif /* VOYEUR_UTILS_H */
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 8e597bbea9..4d3f235d82 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -24,7 +24,6 @@
 #include "voyeur/animation.h"
 #include "voyeur/graphics.h"
 #include "voyeur/staticres.h"
-#include "voyeur/utils.h"
 #include "common/scummsys.h"
 #include "common/config-manager.h"
 #include "common/debug-channels.h"
@@ -241,16 +240,12 @@ bool VoyeurEngine::doLock() {
 	int buttonVocSize, wrongVocSize;
 	byte *buttonVoc = _filesManager.fload("button.voc", &buttonVocSize);
 	byte *wrongVoc = _filesManager.fload("wrong.voc", &wrongVocSize);
-	LockClass lock;
 
 	if (_bVoy->getBoltGroup(0x700)) {
-		lock.getSysDate();
-		lock.getThePassword();
-		
-		_voy._field4380 = lock.fieldC;
+		_voy._field4380 = 0;
 		_voy._viewBounds = _bVoy->boltEntry(0x704)._rectResource;
 
-		Common::String password = lock._password;
+		Common::String password = "3333";
 		PictureResource *cursorPic = _bVoy->getPictureResource(0x702);
 		assert(cursorPic);
 
@@ -287,7 +282,7 @@ bool VoyeurEngine::doLock() {
 		_graphicsManager._fontPtr->_fontSaveBack = 0;
 		_graphicsManager._fontPtr->_fontFlags = 0;
 
-		Common::String dateString = lock.getDateString();
+		Common::String dateString = "ScummVM";
  		Common::String displayString = Common::String::format("Last Play %s", dateString.c_str());
 
 		bool firstLoop = true;
@@ -396,10 +391,6 @@ bool VoyeurEngine::doLock() {
 		flipPageAndWait();
 		_graphicsManager.resetPalette();
 
-		if (flag && result)
-			lock._password = displayString;
-		lock.saveThePassword();
-
 		_voy._viewBounds = nullptr;
 		_bVoy->freeBoltGroup(0x700);
 	}
@@ -665,11 +656,7 @@ void VoyeurEngine::doTransitionCard(const Common::String &time, const Common::St
 }
 
 void VoyeurEngine::saveLastInplay() {
-	LockClass lock;
-	lock.getThePassword();
-	lock.fieldC = _voy._field4380;
-	lock.getSysDate();
-	lock.saveThePassword();
+	// No implementation in ScummVM version
 }
 
 void VoyeurEngine::flipPageAndWait() {