CRYO: Remove some more dead code, remove _keyboardHeld

scummvm · Feb 12, 2017 · 70f1cd6 · 70f1cd6
1 parent 2adc84e
commit 70f1cd6
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 42 deletions.
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
@@ -124,7 +124,6 @@ EdenGame::EdenGame(CryoEngine *vm) : _vm(vm), kMaxMusicSize(2200000) {
 	_cursorPosY = _cursorPosX = 0;
 	_currCursor = 0;
 	_currSpot = _curSpot2 = nullptr;
-	_keyboardHeld = false;
 	_mouseHeld = false;
 	_normalCursor = false;
 	_showVideoSubtitle = false;
@@ -4298,18 +4297,6 @@ void EdenGame::signon(const char *s) {
 void EdenGame::FRDevents() {
 	_vm->pollEvents();
 
-#if 0 // CLKeyboard_IsScanCodeDown currently always returns false
-	if (_vm->isScanCodeDown(0x30)) { //TODO: const
-		if (!_keyboardHeld) {
-			_doubledScreen = !_doubledScreen;
-			_mainView->_doubled = _doubledScreen;
-			CLBlitter_FillScreenView(0);
-			_keyboardHeld = true;
-		}
-	} else
-#endif
-	_keyboardHeld = false;
-
 	int16 mouseY;
 	int16 mouseX;
 	_vm->getMousePosition(&mouseX, &mouseY);
@@ -6382,15 +6369,8 @@ void EdenGame::phase560() {
 	_gameRooms[127]._exits[1] = 0;
 }
 
-//// saveload.c
 void EdenGame::savegame(char *name) {
-//	filespec_t fs;
-//	Common::File handle;
 	int32 size;
-//	CLFile_MakeStruct(0, 0, name, &fs);
-//	CLFile_Create(&fs);
-//	CLFile_SetFinderInfos(&fs, 'EDNS', 'LEDN');
-//	CLFile_Open(&fs, 3, handle);
 
 	Common::OutSaveFile *handle = g_system->getSavefileManager()->openForSaving(name);
 	if (!handle)
@@ -6430,8 +6410,6 @@ h->write(ptr, *size);
 
 #undef CLFile_Write
 
-//	CLFile_Close(handle);
-
 	vavaoffsetin();
 	lieuoffsetin();
 	bandeoffsetin();
@@ -6482,11 +6460,6 @@ void EdenGame::loadrestart() {
 }
 
 void EdenGame::loadgame(char *name) {
-//	filespec_t fs;
-//	Common::File handle;
-//	CLFile_MakeStruct(0, 0, name, &fs);
-//	CLFile_Open(&fs, 3, handle);
-
 	Common::InSaveFile *handle = g_system->getSavefileManager()->openForLoading(name);
 	if (!handle)
 		return;

diff --git a/engines/cryo/eden.h b/engines/cryo/eden.h
@@ -667,7 +667,6 @@ class EdenGame {
 	int16 _currCursor;
 	Icon *_currSpot;
 	Icon *_curSpot2;
-	bool  _keyboardHeld;
 	bool  _mouseHeld;
 	bool  _normalCursor;
 	byte *_hnmViewBuf;
@@ -679,7 +678,6 @@ class EdenGame {
 	int16 _musicRightVol;
 	int16 _musicLeftVol;
 
-
 	bool  _animateTalking;
 	bool  _personTalking;
 	byte  _musicFadeFlag;

diff --git a/engines/cryo/graphics.cpp b/engines/cryo/graphics.cpp
@@ -1024,19 +1024,6 @@ void EdenGame::showMovie(char arg1) {
 		assert(_vm->_screenView->_pitch == 320);
 		_vm->pollEvents();
 
-#if 0 // CLKeyboard_IsScanCodeDown currently always returns false
-		if (_vm->isScanCodeDown(0x30)) { //TODO: const
-			if (!_keyboardHeld) {
-				_doubledScreen = !_doubledScreen;
-				_hnmView->_doubled = _doubledScreen;   //TODO: but mainview ?
-				CLBlitter_FillScreenView(0);
-				_keyboardHeld = true;
-			}
-		}
-		else
-#endif
-			_keyboardHeld = false;
-
 		if (arg1) {
 			if (_vm->isMouseButtonDown()) {
 				if (!_mouseHeld) {