diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/cge2/hero.cpp | 4 | ||||
-rw-r--r-- | engines/cge2/hero.h | 2 | ||||
-rw-r--r-- | engines/cge2/snail.cpp | 6 | ||||
-rw-r--r-- | engines/cge2/vga13h.cpp | 2 | ||||
-rw-r--r-- | engines/cge2/vga13h.h | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/engines/cge2/hero.cpp b/engines/cge2/hero.cpp index 49d1361f42..f68cf82539 100644 --- a/engines/cge2/hero.cpp +++ b/engines/cge2/hero.cpp @@ -530,8 +530,8 @@ int CGE2Engine::mapCross(const V2D &a, const V2D &b) { return cnt; } -void Hero::setCave(int c) { - Sprite::setCave(c); +void Hero::setScene(int c) { + Sprite::setScene(c); resetFun(); } diff --git a/engines/cge2/hero.h b/engines/cge2/hero.h index 26b6dcc12a..69ee7b7810 100644 --- a/engines/cge2/hero.h +++ b/engines/cge2/hero.h @@ -102,7 +102,7 @@ public: Action action() { return (Action)(_ref % 10); } void reach(int mode); void setCurrent(); - void setCave(int c); + void setScene(int c); void operator++(); void operator--(); }; diff --git a/engines/cge2/snail.cpp b/engines/cge2/snail.cpp index 86ce006e4a..bf9108df26 100644 --- a/engines/cge2/snail.cpp +++ b/engines/cge2/snail.cpp @@ -335,7 +335,7 @@ void CGE2Engine::snKill(Sprite *spr) { if (spr->_flags._kill) delete spr; else { - spr->setCave(-1); + spr->setScene(-1); _spare->dispose(spr); } if (nx && nx->_flags._slav) @@ -422,7 +422,7 @@ void CGE2Engine::snCover(Sprite *spr, int val) { Sprite *xspr = locate(val); if (spr && xspr) { spr->_flags._hide = true; - xspr->setCave(spr->_scene); + xspr->setScene(spr->_scene); xspr->gotoxyz(spr->_pos3D); expandSprite(xspr); if ((xspr->_flags._shad = spr->_flags._shad) == true) { @@ -440,7 +440,7 @@ void CGE2Engine::snCover(Sprite *spr, int val) { void CGE2Engine::snUncover(Sprite *spr, Sprite *spr2) { if (spr && spr2) { spr->_flags._hide = false; - spr->setCave(spr2->_scene); + spr->setScene(spr2->_scene); if ((spr->_flags._shad = spr2->_flags._shad) == true) { _vga->_showQ->insert(_vga->_showQ->remove(spr2->_prev), spr); spr2->_flags._shad = false; diff --git a/engines/cge2/vga13h.cpp b/engines/cge2/vga13h.cpp index 24987813a5..71e472f766 100644 --- a/engines/cge2/vga13h.cpp +++ b/engines/cge2/vga13h.cpp @@ -516,7 +516,7 @@ void Sprite::tick() { step(); } -void Sprite::setCave(int c) { +void Sprite::setScene(int c) { _scene = c; } diff --git a/engines/cge2/vga13h.h b/engines/cge2/vga13h.h index c864e481af..67506c8739 100644 --- a/engines/cge2/vga13h.h +++ b/engines/cge2/vga13h.h @@ -262,7 +262,7 @@ public: CommandHandler::Command *snList(Action type); virtual void touch(uint16 mask, int x, int y, Common::KeyCode keyCode); virtual void tick(); - virtual void setCave(int c); + virtual void setScene(int c); void clrHide() { if (_ext) _ext->_b0 = NULL; } void sync(Common::Serializer &s); |