aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoruruk2014-07-17 16:44:02 +0200
committeruruk2014-07-17 16:44:02 +0200
commit5e780d3d97cc992a0cdb46266dfddfdaa229d605 (patch)
treecd40b394466cad76201705902196d117c41fba90
parent2203b7df8c6d212899d86bb7460526b670ad44f1 (diff)
downloadscummvm-rg350-5e780d3d97cc992a0cdb46266dfddfdaa229d605.tar.gz
scummvm-rg350-5e780d3d97cc992a0cdb46266dfddfdaa229d605.tar.bz2
scummvm-rg350-5e780d3d97cc992a0cdb46266dfddfdaa229d605.zip
CGE2: Use locate() instead of take() where possible.
-rw-r--r--engines/cge2/cge2_main.cpp9
1 files changed, 3 insertions, 6 deletions
diff --git a/engines/cge2/cge2_main.cpp b/engines/cge2/cge2_main.cpp
index d9fcbb2a97..9111a10e58 100644
--- a/engines/cge2/cge2_main.cpp
+++ b/engines/cge2/cge2_main.cpp
@@ -525,14 +525,13 @@ void CGE2Engine::storeHeroPos() {
}
void CGE2Engine::showBak(int ref) {
- Sprite *spr = _spare->take(ref);
+ Sprite *spr = _spare->locate(ref);
if (spr != nullptr) {
_bitmapPalette = _vga->_sysPal;
spr->expand();
_bitmapPalette = nullptr;
spr->show(2);
_vga->copyPage(1, 2);
- _spare->dispose(spr);
}
}
@@ -712,10 +711,9 @@ void CGE2Engine::loadHeroes() { // Original name: loadGame()
_spare->update(h);
}
_heroTab[0]->_ptr = h;
- s = _spare->take(152);
+ s = _spare->locate(152);
_vga->_showQ->insert(s);
_heroTab[0]->_face = s;
- _spare->update(s);
// initialize Wacek/Vincent
s = _spare->take(141);
@@ -727,10 +725,9 @@ void CGE2Engine::loadHeroes() { // Original name: loadGame()
_spare->update(h);
}
_heroTab[1]->_ptr = h;
- s = _spare->take(151);
+ s = _spare->locate(151);
_vga->_showQ->insert(s);
_heroTab[1]->_face = s;
- _spare->update(s);
//--- start!
switchHero(_sex);