aboutsummaryrefslogtreecommitdiff
path: root/engines/saga/actor_walk.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2008-05-26 11:10:46 +0000
committerFilippos Karapetis2008-05-26 11:10:46 +0000
commit966239fc52146826e5096cbf41412b035de8c1fe (patch)
treed89e7faa8fc468d3ddd3096263c87bb0024ed56b /engines/saga/actor_walk.cpp
parent23da4c5fa24270622edca0fbdc1153fa1cc069f6 (diff)
downloadscummvm-rg350-966239fc52146826e5096cbf41412b035de8c1fe.tar.gz
scummvm-rg350-966239fc52146826e5096cbf41412b035de8c1fe.tar.bz2
scummvm-rg350-966239fc52146826e5096cbf41412b035de8c1fe.zip
Code cleanup:
- Removed sagaresnames.h - Moved all special scenes to scene.h, and named them consistently (e.g. RID_ITE_OVERMAP_SCENE -> ITE_SCENE_OVERMAP) - Moved all resources which were used by the ITE intro into ite_introproc.cpp - Removed several defines which were only used once (e.g. the SFX names) - Reordered the GameResourceDescription resources so that ITE and IHNM specific resources are placed in the end - Updated the comment about the IHNM Mac music - Changed the callocs in loadPalAnim to mallocs, like in the rest of the code - Removed the MEM error svn-id: r32282
Diffstat (limited to 'engines/saga/actor_walk.cpp')
-rw-r--r--engines/saga/actor_walk.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/saga/actor_walk.cpp b/engines/saga/actor_walk.cpp
index 0c573c0c40..d62c1c61d7 100644
--- a/engines/saga/actor_walk.cpp
+++ b/engines/saga/actor_walk.cpp
@@ -30,7 +30,6 @@
#include "saga/events.h"
#include "saga/isomap.h"
#include "saga/objectmap.h"
-#include "saga/sagaresnames.h"
#include "saga/script.h"
#include "saga/sound.h"
#include "saga/scene.h"
@@ -209,7 +208,7 @@ void Actor::updateActorsScene(int actorsEntrance) {
actor->_finalTarget = actor->_location;
_centerActor = _protagonist = actor;
} else if (_vm->getGameType() == GType_ITE &&
- _vm->_scene->currentSceneResourceId() == RID_ITE_OVERMAP_SCENE) {
+ _vm->_scene->currentSceneResourceId() == ITE_SCENE_OVERMAP) {
continue;
}
@@ -416,7 +415,7 @@ void Actor::handleActions(int msec, bool setup) {
speed = 4;
}
- if (_vm->_scene->currentSceneResourceId() == RID_ITE_OVERMAP_SCENE) {
+ if (_vm->_scene->currentSceneResourceId() == ITE_SCENE_OVERMAP) {
speed = 2;
}