diff options
author | Strangerke | 2017-02-12 18:10:25 +0100 |
---|---|---|
committer | Strangerke | 2017-02-12 18:10:25 +0100 |
commit | 70f1cd6efe9eab880692dfddf625180b5a0b9bb0 (patch) | |
tree | 9e8731c33ffaf967db0180d07e6f9eb1f7130e1c /engines/cryo | |
parent | 2adc84e72862e674245ef062de484934f641177b (diff) | |
download | scummvm-rg350-70f1cd6efe9eab880692dfddf625180b5a0b9bb0.tar.gz scummvm-rg350-70f1cd6efe9eab880692dfddf625180b5a0b9bb0.tar.bz2 scummvm-rg350-70f1cd6efe9eab880692dfddf625180b5a0b9bb0.zip |
CRYO: Remove some more dead code, remove _keyboardHeld
Diffstat (limited to 'engines/cryo')
-rw-r--r-- | engines/cryo/eden.cpp | 27 | ||||
-rw-r--r-- | engines/cryo/eden.h | 2 | ||||
-rw-r--r-- | engines/cryo/graphics.cpp | 13 |
3 files changed, 0 insertions, 42 deletions
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp index 22989f387c..b79eb4e984 100644 --- 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 index 0e200ce3cb..bdd1ba89ce 100644 --- a/engines/cryo/eden.h +++ b/engines/cryo/eden.h @@ -667,7 +667,6 @@ private: int16 _currCursor; Icon *_currSpot; Icon *_curSpot2; - bool _keyboardHeld; bool _mouseHeld; bool _normalCursor; byte *_hnmViewBuf; @@ -679,7 +678,6 @@ private: int16 _musicRightVol; int16 _musicLeftVol; - bool _animateTalking; bool _personTalking; byte _musicFadeFlag; diff --git a/engines/cryo/graphics.cpp b/engines/cryo/graphics.cpp index bfbce13949..51cb818f3e 100644 --- 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) { |