diff options
| -rw-r--r-- | engines/cge/cge.cpp | 2 | ||||
| -rw-r--r-- | engines/cge/cge_main.cpp | 13 | ||||
| -rw-r--r-- | engines/cge/cge_main.h | 1 | ||||
| -rw-r--r-- | engines/cge/snail.cpp | 3 | ||||
| -rw-r--r-- | engines/cge/vga13h.cpp | 8 | ||||
| -rw-r--r-- | engines/cge/vga13h.h | 7 |
6 files changed, 0 insertions, 34 deletions
diff --git a/engines/cge/cge.cpp b/engines/cge/cge.cpp index 168f45e45b..116bafcb64 100644 --- a/engines/cge/cge.cpp +++ b/engines/cge/cge.cpp @@ -81,7 +81,6 @@ void CGEEngine::setup() { // Initialise engine objects _text = new Text(this, progName(), 128); _vga = new Vga(M13H); - _heart = new Heart; _sys = new System(this); _pocLight = new PocLight(this); for (int i = 0; i < kPocketNX; i++) { @@ -170,7 +169,6 @@ CGEEngine::~CGEEngine() { delete _cavLight; delete _debugLine; delete _text; - delete _heart; delete _pocLight; delete _keyboard; delete _mouse; diff --git a/engines/cge/cge_main.cpp b/engines/cge/cge_main.cpp index 855834b489..dc573b8b2f 100644 --- a/engines/cge/cge_main.cpp +++ b/engines/cge/cge_main.cpp @@ -63,7 +63,6 @@ namespace CGE { uint16 _stklen = (STACK_SIZ * 2); Vga *_vga; -Heart *_heart; System *_sys; Sprite *_pocLight; EventManager *_eventManager; @@ -625,8 +624,6 @@ void CGEEngine::caveUp() { _dark = false; if (!_startupMode) _mouse->on(); - - _heart->_enable = true; } @@ -675,7 +672,6 @@ void CGEEngine::switchCave(int cav) { debugC(1, kCGEDebugEngine, "CGEEngine::switchCave(%d)", cav); if (cav != _now) { - _heart->_enable = false; if (cav < 0) { _snail->addCom(kSnLabel, -1, 0, NULL); // wait for repaint _snail->addCom2(kSnExec, -1, 0, kQGame); // switch cave @@ -1592,7 +1588,6 @@ void CGEEngine::runGame() { } _keyboard->setClient(NULL); - _heart->_enable = false; _snail->addCom(kSnClear, -1, 0, NULL); _snail_->addCom(kSnClear, -1, 0, NULL); _mouse->off(); @@ -1612,16 +1607,12 @@ void CGEEngine::movie(const char *ext) { loadScript(fn); expandSprite(_vga->_spareQ->locate(999)); feedSnail(_vga->_showQ->locate(999), kTake); - _vga->_showQ->append(_mouse); - - _heart->_enable = true; _keyboard->setClient(_sys); while (!_snail->idle() && !_eventManager->_quitFlag) mainLoop(); _keyboard->setClient(NULL); - _heart->_enable = false; _snail->addCom(kSnClear, -1, 0, NULL); _snail_->addCom(kSnClear, -1, 0, NULL); _vga->_showQ->clear(); @@ -1662,7 +1653,6 @@ bool CGEEngine::showTitle(const char *name) { _vga->copyPage(1, 2); _vga->copyPage(0, 1); _vga->_showQ->append(_mouse); - _heart->_enable = true; _mouse->on(); for (; !_snail->idle() || Vmenu::_addr;) { mainLoop(); @@ -1671,7 +1661,6 @@ bool CGEEngine::showTitle(const char *name) { } _mouse->off(); - _heart->_enable = false; _vga->_showQ->clear(); _vga->copyPage(0, 2); _soundOk = 2; @@ -1698,13 +1687,11 @@ bool CGEEngine::showTitle(const char *name) { strcpy(_usrFnam, "User"); usr_ok = true; } else { - _heart->_enable = true; for (takeName(); GetText::_ptr;) { mainLoop(); if (_eventManager->_quitFlag) return false; } - _heart->_enable = false; if (_keyboard->last() == Enter && *_usrFnam) usr_ok = true; } diff --git a/engines/cge/cge_main.h b/engines/cge/cge_main.h index 681e756c06..d811236485 100644 --- a/engines/cge/cge_main.h +++ b/engines/cge/cge_main.h @@ -122,7 +122,6 @@ private: }; extern Vga *_vga; -extern Heart *_heart; extern System *_sys; extern int _offUseCount; extern Sprite *_pocLight; diff --git a/engines/cge/snail.cpp b/engines/cge/snail.cpp index aa37922b70..2cd38d671f 100644 --- a/engines/cge/snail.cpp +++ b/engines/cge/snail.cpp @@ -501,16 +501,13 @@ void CGEEngine::snZTrim(Sprite *spr) { if (spr) if (spr->active()) { - bool en = _heart->_enable; Sprite *s; - _heart->_enable = false; s = (spr->_flags._shad) ? spr->_prev : NULL; _vga->_showQ->insert(_vga->_showQ->remove(spr)); if (s) { s->_z = spr->_z; _vga->_showQ->insert(_vga->_showQ->remove(s), spr); } - _heart->_enable = en; } } diff --git a/engines/cge/vga13h.cpp b/engines/cge/vga13h.cpp index 6e14666bd9..9b30e02e4d 100644 --- a/engines/cge/vga13h.cpp +++ b/engines/cge/vga13h.cpp @@ -211,11 +211,6 @@ Sprite *locate(int ref) { return (spr) ? spr : _vga->_spareQ->locate(ref); } - -Heart::Heart() { - _enable = false; -} - Sprite::Sprite(CGEEngine *vm, BMP_PTR *shpP) : _x(0), _y(0), _z(0), _nearPtr(0), _takePtr(0), _next(NULL), _prev(NULL), _seqPtr(NO_SEQ), _time(0), //Delay(0), @@ -358,8 +353,6 @@ void Sprite::setName(char *n) { Sprite *Sprite::expand() { if (!_ext) { - bool enbl = _heart->_enable; - _heart->_enable = false; _ext = new SprExt; assert(_ext != NULL); if (*_file) { @@ -473,7 +466,6 @@ Sprite *Sprite::expand() { else _takePtr = NO_PTR; } - _heart->_enable = enbl; } return this; } diff --git a/engines/cge/vga13h.h b/engines/cge/vga13h.h index 535c7005d2..15da63efbc 100644 --- a/engines/cge/vga13h.h +++ b/engines/cge/vga13h.h @@ -117,13 +117,6 @@ extern Seq _seq2[]; #define VGAST1 (VGAST1_ & 0xFF) -class Heart { -public: - Heart(); - bool _enable; -}; - - class SprExt { public: int _x0, _y0; |