diff options
author | Matthew Hoops | 2010-09-05 00:48:38 +0000 |
---|---|---|
committer | Matthew Hoops | 2010-09-05 00:48:38 +0000 |
commit | 34f570419ad49550c6a7790e2a97a7d88d02fbac (patch) | |
tree | f73e98ce60a32b2212868500552e3e1cbb6d5cf0 /engines/mohawk/graphics.cpp | |
parent | f8ff771b8edc97861efb127a4bccc43e1acef5bc (diff) | |
download | scummvm-rg350-34f570419ad49550c6a7790e2a97a7d88d02fbac.tar.gz scummvm-rg350-34f570419ad49550c6a7790e2a97a7d88d02fbac.tar.bz2 scummvm-rg350-34f570419ad49550c6a7790e2a97a7d88d02fbac.zip |
MOHAWK: Cleanup
- Split the main Riven event loop into a separate function for readability and for use in the sunner external functions eventually
- Some minor function signature changes (const!)
- Rename matchVarToString() to getVar() (I have no idea where that original name came from, considering it takes a string and returns a variable
- Use solely Common::String in getVar()
svn-id: r52538
Diffstat (limited to 'engines/mohawk/graphics.cpp')
-rw-r--r-- | engines/mohawk/graphics.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/graphics.cpp b/engines/mohawk/graphics.cpp index fb0bf86f42..64629f949d 100644 --- a/engines/mohawk/graphics.cpp +++ b/engines/mohawk/graphics.cpp @@ -399,7 +399,7 @@ void RivenGraphics::clearWaterEffects() { bool RivenGraphics::runScheduledWaterEffects() { // Don't run the effect if it's disabled - if (*_vm->matchVarToString("waterenabled") == 0) + if (*_vm->getVar("waterenabled") == 0) return false; Graphics::Surface *screen = NULL; @@ -613,8 +613,8 @@ void RivenGraphics::showInventory() { // you get Catherine's journal and the trap book. Near the end, // you lose the trap book and have just the two journals. - bool hasCathBook = *_vm->matchVarToString("acathbook") != 0; - bool hasTrapBook = *_vm->matchVarToString("atrapbook") != 0; + bool hasCathBook = *_vm->getVar("acathbook") != 0; + bool hasTrapBook = *_vm->getVar("atrapbook") != 0; if (!hasCathBook) { drawInventoryImage(101, g_atrusJournalRect1); |