aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-06-13 22:36:32 +0200
committeruruk2014-06-13 22:36:32 +0200
commita2c3a11708840f7b21d971241ad2b1fa70d74025 (patch)
tree29d6c9ae488f5c06e427fbea128f5d67b2d923c3
parent2b5eec4427814e501f4a11103befedaf4628f528 (diff)
downloadscummvm-rg350-a2c3a11708840f7b21d971241ad2b1fa70d74025.tar.gz
scummvm-rg350-a2c3a11708840f7b21d971241ad2b1fa70d74025.tar.bz2
scummvm-rg350-a2c3a11708840f7b21d971241ad2b1fa70d74025.zip
CGE2: Rename setCave() to setScene().
-rw-r--r--engines/cge2/hero.cpp4
-rw-r--r--engines/cge2/hero.h2
-rw-r--r--engines/cge2/snail.cpp6
-rw-r--r--engines/cge2/vga13h.cpp2
-rw-r--r--engines/cge2/vga13h.h2
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);