diff options
| author | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-09-02 12:02:37 +0000 |
| commit | 1bbab8f1915eebdb18365c64ec64eec2a8770bb6 (patch) | |
| tree | e7cbeca85155034e77ce1f1bbdbf645982b63182 /engines/sci/engine/message.cpp | |
| parent | b391f08b46c3f47e8631248fd70ee21ebe12b744 (diff) | |
| download | scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.gz scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.tar.bz2 scummvm-rg350-1bbab8f1915eebdb18365c64ec64eec2a8770bb6.zip | |
Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan
svn-id: r43908
Diffstat (limited to 'engines/sci/engine/message.cpp')
| -rw-r--r-- | engines/sci/engine/message.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/engine/message.cpp b/engines/sci/engine/message.cpp index 67657aab25..0e040eff8b 100644 --- a/engines/sci/engine/message.cpp +++ b/engines/sci/engine/message.cpp @@ -222,7 +222,7 @@ int MessageState::getLength() { return strlen(stringptr); } -int MessageState::loadRes(ResourceManager *resourceManager, int module, bool lock) { +int MessageState::loadRes(ResourceManager *resMan, int module, bool lock) { _cursorStack.clear(); if (_locked) { @@ -233,11 +233,11 @@ int MessageState::loadRes(ResourceManager *resourceManager, int module, bool loc } // Otherwise, free the old resource - resourceManager->unlockResource(_currentResource); + resMan->unlockResource(_currentResource); _locked = false; } - _currentResource = resourceManager->findResource(ResourceId(kResourceTypeMessage, module), lock); + _currentResource = resMan->findResource(ResourceId(kResourceTypeMessage, module), lock); if (_currentResource == NULL || _currentResource->data == NULL) { warning("Message: failed to load %d.msg", module); |