diff options
| -rw-r--r-- | saga/actor.cpp | 2 | ||||
| -rw-r--r-- | saga/resnames.h | 8 | ||||
| -rw-r--r-- | saga/script.cpp | 4 |
3 files changed, 6 insertions, 8 deletions
diff --git a/saga/actor.cpp b/saga/actor.cpp index 9cb77324d5..ddd3b85fa1 100644 --- a/saga/actor.cpp +++ b/saga/actor.cpp @@ -385,7 +385,7 @@ ActorData *Actor::getActor(uint16 actorId) { actor = &_actors[actorIdToIndex(actorId)]; if (actor->disabled) - error("Actor::getActor disabled actorId 0x%X", actorId); + warning("Actor::getActor disabled actorId 0x%X", actorId); return actor; } diff --git a/saga/resnames.h b/saga/resnames.h index 215a34fd6e..a0aead8fa8 100644 --- a/saga/resnames.h +++ b/saga/resnames.h @@ -34,9 +34,11 @@ namespace Saga { #define RID_ITE_SCENE_LUT 1806 #define RID_ITE_SCRIPT_LUT 216 - // Hmmm.... as far as I see original uses now commented values, but they're wrong -#define RID_IHNM_SCENE_LUT 1272 // 286 -#define RID_IHNM_SCRIPT_LUT 0 // 18 +#define RID_IHNM_SCENE_LUT 1272 +#define RID_IHNM_SCRIPT_LUT 29 + +#define RID_IHNMDEMO_SCENE_LUT 286 +#define RID_IHNMDEMO_SCRIPT_LUT 18 // SCENES #define ITE_DEFAULT_SCENE 32 diff --git a/saga/script.cpp b/saga/script.cpp index b68c19d95b..260c4f8339 100644 --- a/saga/script.cpp +++ b/saga/script.cpp @@ -271,10 +271,6 @@ int Script::loadScript(int script_num) { uint32 voicelut_rn; int result; - if (_vm->_gameType == GType_IHNM) { - return SUCCESS; - } - // Validate script number if ((script_num < 0) || (script_num > _scriptLUTMax)) { warning("Script::loadScript(): Invalid script number"); |