diff options
| author | Max Horn | 2009-04-11 00:29:12 +0000 |
|---|---|---|
| committer | Max Horn | 2009-04-11 00:29:12 +0000 |
| commit | 7412b0f8e87a0139ff26309bf9db8024a63b4fb9 (patch) | |
| tree | 4ddd4604afd808fceaa18cb2ea454b687e8de3b0 /engines/saga/scene.cpp | |
| parent | 46ddb35d9fa8520aa3effe7139c248db65d5fb8a (diff) | |
| download | scummvm-rg350-7412b0f8e87a0139ff26309bf9db8024a63b4fb9.tar.gz scummvm-rg350-7412b0f8e87a0139ff26309bf9db8024a63b4fb9.tar.bz2 scummvm-rg350-7412b0f8e87a0139ff26309bf9db8024a63b4fb9.zip | |
SAGA: Stop needlessly using operator*() and operator->() (many of the resulting &* uses can be removed if references are used instead of pointers everywhere, which would be a good idea anyway)
svn-id: r39920
Diffstat (limited to 'engines/saga/scene.cpp')
| -rw-r--r-- | engines/saga/scene.cpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/engines/saga/scene.cpp b/engines/saga/scene.cpp index 86500467d0..03d1726b27 100644 --- a/engines/saga/scene.cpp +++ b/engines/saga/scene.cpp @@ -252,10 +252,8 @@ void Scene::getResourceTypes(SAGAResourceTypes *&types, int &typesCount) { } void Scene::drawTextList() { - TextListEntry *entry; + for (TextList::iterator entry = _textList.begin(); entry != _textList.end(); ++entry) { - for (TextList::iterator textIterator = _textList.begin(); textIterator != _textList.end(); ++textIterator) { - entry = (TextListEntry *)textIterator.operator->(); if (entry->display) { if (entry->useRect) { @@ -317,7 +315,7 @@ void Scene::startScene() { return; } - sceneQueue = queueIterator.operator->(); + sceneQueue = &*queueIterator; loadScene(sceneQueue); } @@ -378,7 +376,7 @@ void Scene::nextScene() { } // Load the head in scene queue - sceneQueue = queueIterator.operator->(); + sceneQueue = &*queueIterator; loadScene(sceneQueue); } @@ -405,7 +403,7 @@ void Scene::skipScene() { ++queueIterator; while (queueIterator != _sceneQueue.end()) { - sceneQueue = queueIterator.operator->(); + sceneQueue = &*queueIterator; assert(sceneQueue != NULL); if (sceneQueue->sceneSkipTarget) { |