diff options
| author | Andrew Kurushin | 2005-01-18 11:55:31 +0000 |
|---|---|---|
| committer | Andrew Kurushin | 2005-01-18 11:55:31 +0000 |
| commit | 0b4fd4adbf88b1dac138e9ef55feefc7e2fd79ca (patch) | |
| tree | d971b6b369db498d1f29c763039856141e72b63d /saga/actor.cpp | |
| parent | c9d0d4c840aac829d42bc5ec1b5b1e7f30b5a50c (diff) | |
| download | scummvm-rg350-0b4fd4adbf88b1dac138e9ef55feefc7e2fd79ca.tar.gz scummvm-rg350-0b4fd4adbf88b1dac138e9ef55feefc7e2fd79ca.tar.bz2 scummvm-rg350-0b4fd4adbf88b1dac138e9ef55feefc7e2fd79ca.zip | |
- merged ActionMap and ObjectMap
- remove ActionMap.h & ActionMap.cpp
- ObjectMap names move to Scene::_sceneStrings as in original engine
- fix wrong StringsTable::stringsCount calculation
svn-id: r16592
Diffstat (limited to 'saga/actor.cpp')
| -rw-r--r-- | saga/actor.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index 9ac8b3024f..0bb8ccafda 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -33,13 +33,13 @@ #include "saga/text.h" #include "saga/sound.h" #include "saga/scene.h" -#include "saga/actionmap.h" #include "saga/actor.h" #include "saga/actordata.h" #include "saga/stream.h" #include "saga/interface.h" #include "saga/events.h" +#include "saga/objectmap.h" #include "common/config-manager.h" namespace Saga { @@ -505,7 +505,7 @@ void Actor::updateActorsScene(int actorsEntrance) { assert(_protagonist); if (actorsEntrance >= 0) { - sceneEntry = _vm->_scene->_entryList->getEntry(actorsEntrance); + sceneEntry = _vm->_scene->_entryList.getEntry(actorsEntrance); // tiled stuff if (_vm->_scene->getFlags() & kSceneFlagISO) { //todo: it |