aboutsummaryrefslogtreecommitdiff
path: root/engines/sherlock/objects.cpp
diff options
context:
space:
mode:
authorPaul Gilbert2015-06-06 22:40:29 -0400
committerPaul Gilbert2015-06-06 22:40:29 -0400
commit933e6751943fcb28fdb1b616f9834bd4f231f63d (patch)
tree4c4fc326b171ee60725af90c0afad08e779f04d3 /engines/sherlock/objects.cpp
parent3511f30a2621af4773df5271cdffb6275b9e829e (diff)
downloadscummvm-rg350-933e6751943fcb28fdb1b616f9834bd4f231f63d.tar.gz
scummvm-rg350-933e6751943fcb28fdb1b616f9834bd4f231f63d.tar.bz2
scummvm-rg350-933e6751943fcb28fdb1b616f9834bd4f231f63d.zip
SHERLOCK: Setting up game specific People descendant classes
Diffstat (limited to 'engines/sherlock/objects.cpp')
-rw-r--r--engines/sherlock/objects.cpp21
1 files changed, 11 insertions, 10 deletions
diff --git a/engines/sherlock/objects.cpp b/engines/sherlock/objects.cpp
index 2131626bc9..9adaf49b7b 100644
--- a/engines/sherlock/objects.cpp
+++ b/engines/sherlock/objects.cpp
@@ -20,11 +20,12 @@
*
*/
-#include "sherlock/objects.h"
+#include "common/util.h"
#include "sherlock/sherlock.h"
+#include "sherlock/objects.h"
#include "sherlock/people.h"
#include "sherlock/scene.h"
-#include "common/util.h"
+#include "sherlock/scalpel/scalpel_people.h"
namespace Sherlock {
@@ -256,14 +257,14 @@ void Sprite::adjustSprite() {
if (_walkSequences[_sequenceNumber][_frameNumber] == 0) {
switch (_sequenceNumber) {
- case STOP_UP:
- case STOP_DOWN:
- case STOP_LEFT:
- case STOP_RIGHT:
- case STOP_UPRIGHT:
- case STOP_UPLEFT:
- case STOP_DOWNRIGHT:
- case STOP_DOWNLEFT:
+ case Scalpel::STOP_UP:
+ case Scalpel::STOP_DOWN:
+ case Scalpel::STOP_LEFT:
+ case Scalpel::STOP_RIGHT:
+ case Scalpel::STOP_UPRIGHT:
+ case Scalpel::STOP_UPLEFT:
+ case Scalpel::STOP_DOWNRIGHT:
+ case Scalpel::STOP_DOWNLEFT:
// We're in a stop sequence, so reset back to the last frame, so
// the character is shown as standing still
--_frameNumber;