[Scummvm-git-logs] scummvm master -> 70f1cd6efe9eab880692dfddf625180b5a0b9bb0
Strangerke
Strangerke at scummvm.org
Sun Feb 12 18:12:50 CET 2017
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
70f1cd6efe CRYO: Remove some more dead code, remove _keyboardHeld
Commit: 70f1cd6efe9eab880692dfddf625180b5a0b9bb0
https://github.com/scummvm/scummvm/commit/70f1cd6efe9eab880692dfddf625180b5a0b9bb0
Author: Strangerke (strangerke at scummvm.org)
Date: 2017-02-12T18:10:25+01:00
Commit Message:
CRYO: Remove some more dead code, remove _keyboardHeld
Changed paths:
engines/cryo/eden.cpp
engines/cryo/eden.h
engines/cryo/graphics.cpp
diff --git a/engines/cryo/eden.cpp b/engines/cryo/eden.cpp
index 22989f3..b79eb4e 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 0e200ce..bdd1ba8 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 bfbce13..51cb818 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) {
More information about the Scummvm-git-logs
mailing list