aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Gilbert2013-06-20 08:38:38 -0400
committerPaul Gilbert2013-06-20 08:38:38 -0400
commit412ac6a00df783802301463135659cbf5b5237ef (patch)
treec3b431f994cb49282bf1f65bc9041abb61d428e8
parent4c70e6afceeb262e2500a3d0920a762fedbf4e2f (diff)
downloadscummvm-rg350-412ac6a00df783802301463135659cbf5b5237ef.tar.gz
scummvm-rg350-412ac6a00df783802301463135659cbf5b5237ef.tar.bz2
scummvm-rg350-412ac6a00df783802301463135659cbf5b5237ef.zip
VOYEUR: Minor cleanup of doLock cursor code
-rw-r--r--engines/voyeur/voyeur.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/voyeur/voyeur.cpp b/engines/voyeur/voyeur.cpp
index 664e40e6e6..276fd323cf 100644
--- a/engines/voyeur/voyeur.cpp
+++ b/engines/voyeur/voyeur.cpp
@@ -205,7 +205,7 @@ bool VoyeurEngine::doLock() {
byte *buttonVoc = _filesManager.fload("button.voc", &buttonVocSize);
byte *wrongVoc = _filesManager.fload("wrong.voc", &wrongVocSize);
LockClass lock;
- PictureResource *srcPic;
+ PictureResource *cursorPic;
byte *keyData;
int keyCount;
Common::String msg;
@@ -219,8 +219,8 @@ bool VoyeurEngine::doLock() {
_voy._eventTable[999]._data = _bVoy->memberAddr(0x704);
Common::String password = lock._password;
- srcPic = _bVoy->getPictureResource(0x702);
- assert(srcPic);
+ cursorPic = _bVoy->getPictureResource(0x702);
+ assert(cursorPic);
// Get the mappings of keys on the keypad
keyData = _bVoy->memberAddr(0x705);
@@ -295,8 +295,8 @@ bool VoyeurEngine::doLock() {
_eventsManager._intPtr.field38 = 1;
_eventsManager._intPtr._hasPalette = true;
- // TODO: Check is the mouse cursor being manually drawn here? I so, refactor
- _graphicsManager.sDrawPic(srcPic, *_graphicsManager._vPort, mousePos);
+ // TODO:Refactor the mouse cursor to use ScummVM cursor code
+ _graphicsManager.sDrawPic(cursorPic, *_graphicsManager._vPort, mousePos);
(*_graphicsManager._vPort)->_parent->_flags |= DISPFLAG_8;
_graphicsManager.flipPage();
_eventsManager.sWaitFlip();