diff options
| author | Vicent Marti | 2008-06-14 14:44:29 +0000 |
|---|---|---|
| committer | Vicent Marti | 2008-06-14 14:44:29 +0000 |
| commit | d0b27cf9c66b9281899acf826cb205e19dcb7260 (patch) | |
| tree | 74e813b1d1f081f35f41ca7a95da5d048951b9e7 /engines/saga/actor.cpp | |
| parent | d51a0cab3fe494698f001d81d5d86cea7cd0395b (diff) | |
| parent | 91d3ea31359950b59ee46af8355cc0f5790257e5 (diff) | |
| download | scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.gz scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.tar.bz2 scummvm-rg350-d0b27cf9c66b9281899acf826cb205e19dcb7260.zip | |
Merged trunk into the GUI branch.
Fixed MSVS9 project files.
svn-id: r32702
Diffstat (limited to 'engines/saga/actor.cpp')
| -rw-r--r-- | engines/saga/actor.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/engines/saga/actor.cpp b/engines/saga/actor.cpp index 52b921d000..96d901fbba 100644 --- a/engines/saga/actor.cpp +++ b/engines/saga/actor.cpp @@ -31,7 +31,6 @@ #include "saga/events.h" #include "saga/isomap.h" #include "saga/objectmap.h" -#include "saga/sagaresnames.h" #include "saga/rscfile.h" #include "saga/script.h" #include "saga/sndres.h" @@ -997,7 +996,7 @@ void Actor::createDrawOrderList() { } bool Actor::getSpriteParams(CommonObjectData *commonObjectData, int &frameNumber, SpriteList *&spriteList) { - if (_vm->_scene->currentSceneResourceId() == RID_ITE_OVERMAP_SCENE) { + if (_vm->_scene->currentSceneResourceId() == ITE_SCENE_OVERMAP) { if (!(commonObjectData->_flags & kProtagonist)){ // warning("not protagonist"); return false; |