diff options
author | Paul Gilbert | 2015-06-07 23:07:21 -0400 |
---|---|---|
committer | Paul Gilbert | 2015-06-07 23:07:21 -0400 |
commit | 62aad480effbd9cc6e37b353aa02436d075fecd2 (patch) | |
tree | 8166d1e9faa5cbe9304a16dc12ac62f3c87e1c00 /engines/sherlock/scalpel | |
parent | d171d07e2f26d17b3132aa6cd7093a264947f51f (diff) | |
download | scummvm-rg350-62aad480effbd9cc6e37b353aa02436d075fecd2.tar.gz scummvm-rg350-62aad480effbd9cc6e37b353aa02436d075fecd2.tar.bz2 scummvm-rg350-62aad480effbd9cc6e37b353aa02436d075fecd2.zip |
SHERLOCK: Move Scalpel scene enum to scalpel_scene.h
Diffstat (limited to 'engines/sherlock/scalpel')
-rw-r--r-- | engines/sherlock/scalpel/scalpel.cpp | 1 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel.h | 4 | ||||
-rw-r--r-- | engines/sherlock/scalpel/scalpel_scene.h | 4 |
3 files changed, 5 insertions, 4 deletions
diff --git a/engines/sherlock/scalpel/scalpel.cpp b/engines/sherlock/scalpel/scalpel.cpp index c349ec9e9b..f6a6bc9cc2 100644 --- a/engines/sherlock/scalpel/scalpel.cpp +++ b/engines/sherlock/scalpel/scalpel.cpp @@ -23,6 +23,7 @@ #include "engines/util.h" #include "sherlock/scalpel/scalpel.h" #include "sherlock/scalpel/scalpel_people.h" +#include "sherlock/scalpel/scalpel_scene.h" #include "sherlock/scalpel/tsage/logo.h" #include "sherlock/sherlock.h" #include "sherlock/music.h" diff --git a/engines/sherlock/scalpel/scalpel.h b/engines/sherlock/scalpel/scalpel.h index 7cd555a5b1..e84f3aa95c 100644 --- a/engines/sherlock/scalpel/scalpel.h +++ b/engines/sherlock/scalpel/scalpel.h @@ -30,10 +30,6 @@ namespace Sherlock { namespace Scalpel { -enum { BLACKWOOD_CAPTURE = 2, BAKER_STREET = 4, DRAWING_ROOM = 12, STATION = 17, PUB_INTERIOR = 19, - LAWYER_OFFICE = 27, BAKER_ST_EXTERIOR = 39, RESCUE_ANNA = 52, MOOREHEAD_DEATH = 53, EXIT_GAME = 55, - BRUMWELL_SUICIDE = 70, OVERHEAD_MAP2 = 98, DARTS_GAME = 99, OVERHEAD_MAP = 100 }; - class ScalpelEngine : public SherlockEngine { private: Darts *_darts; diff --git a/engines/sherlock/scalpel/scalpel_scene.h b/engines/sherlock/scalpel/scalpel_scene.h index d9ac1c1edc..88c7581f59 100644 --- a/engines/sherlock/scalpel/scalpel_scene.h +++ b/engines/sherlock/scalpel/scalpel_scene.h @@ -35,6 +35,10 @@ namespace Sherlock { namespace Scalpel { +enum { BLACKWOOD_CAPTURE = 2, BAKER_STREET = 4, DRAWING_ROOM = 12, STATION = 17, PUB_INTERIOR = 19, + LAWYER_OFFICE = 27, BAKER_ST_EXTERIOR = 39, RESCUE_ANNA = 52, MOOREHEAD_DEATH = 53, EXIT_GAME = 55, + BRUMWELL_SUICIDE = 70, OVERHEAD_MAP2 = 98, DARTS_GAME = 99, OVERHEAD_MAP = 100 }; + class ScalpelScene : public Scene { private: void doBgAnimCheckCursor(); |