aboutsummaryrefslogtreecommitdiff
path: root/engines/parallaction/parallaction.cpp
diff options
context:
space:
mode:
authorNicola Mettifogo2007-11-18 21:32:22 +0000
committerNicola Mettifogo2007-11-18 21:32:22 +0000
commit28289fb694b1766a672bfc77f01e0cc3e88723de (patch)
tree7c07184436e317917a1eef19316660f0d082ca0d /engines/parallaction/parallaction.cpp
parent7731af9833dbc01e5ae66bbce4b3e364e414b99a (diff)
downloadscummvm-rg350-28289fb694b1766a672bfc77f01e0cc3e88723de.tar.gz
scummvm-rg350-28289fb694b1766a672bfc77f01e0cc3e88723de.tar.bz2
scummvm-rg350-28289fb694b1766a672bfc77f01e0cc3e88723de.zip
Cleanup.
svn-id: r29562
Diffstat (limited to 'engines/parallaction/parallaction.cpp')
-rw-r--r--engines/parallaction/parallaction.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/engines/parallaction/parallaction.cpp b/engines/parallaction/parallaction.cpp
index e37d31ad6f..1a61e5c0e0 100644
--- a/engines/parallaction/parallaction.cpp
+++ b/engines/parallaction/parallaction.cpp
@@ -176,8 +176,6 @@ int Parallaction::init() {
initInventory(); // needs to be pushed into subclass
- _jDrawLabel = NULL;
- _jEraseLabel = NULL;
_hoverZone = NULL;
_animations.push_front(&_char._ani);
@@ -287,16 +285,16 @@ void Parallaction::runGame() {
changeLocation(_location._name);
}
- jobEraseLabel(0, 0);
- jobEraseAnimations((void*)1, 0);
+ eraseLabel();
+ eraseAnimations();
runJobs();
- jobDisplayAnimations(0, 0);
- jobDisplayLabel(0, 0);
+ drawAnimations();
+ drawLabel();
if (_engineFlags & kEngineInventory) {
- jobShowInventory(0, 0);
+ showInventory();
}
updateView();
@@ -893,8 +891,7 @@ void Parallaction::doLocationEnterTransition() {
_gfx->setPalette(pal);
jobRunScripts(NULL, NULL);
- jobEraseAnimations(NULL, NULL);
- jobDisplayAnimations(NULL, NULL);
+ drawAnimations();
_gfx->swapBuffers();
_gfx->copyScreen(Gfx::kBitFront, Gfx::kBitBack);