libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-05 10:26:40 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

SHERLOCK: RT: Add RT version of default scene facing list

Browse Source
This commit is contained in:
Paul Gilbert 2015-07-25 17:02:24 -04:00
parent d325d53755
commit 8753fa17d3
5 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/sherlock/scalpel/scalpel_scene.cpp
View File

@ -34,6 +34,12 @@ namespace Sherlock {
namespace Scalpel {
const int FS_TRANS[8] = {
STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN, STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT
};
/*----------------------------------------------------------------*/
bool ScalpelScene::loadScene(const Common::String &filename) {
ScalpelMap &map = *(ScalpelMap *)_vm->_map;
bool result = Scene::loadScene(filename);

2
engines/sherlock/scalpel/scalpel_scene.h
View File

@ -35,6 +35,8 @@ namespace Sherlock {
namespace Scalpel {
extern const int FS_TRANS[8];
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 };

13
engines/sherlock/scene.cpp
View File

@ -32,13 +32,6 @@
namespace Sherlock {
static const int FS_TRANS[8] = {
Scalpel::STOP_UP, Scalpel::STOP_UPRIGHT, Scalpel::STOP_RIGHT, Scalpel::STOP_DOWNRIGHT,
Scalpel::STOP_DOWN, Scalpel::STOP_DOWNLEFT, Scalpel::STOP_LEFT, Scalpel::STOP_UPLEFT
};
/*----------------------------------------------------------------*/
BgFileHeader::BgFileHeader() {
_numStructs = -1;
_numImages = -1;
@ -1198,7 +1191,11 @@ void Scene::transitionToScene() {
// Note: If a savegame was just loaded, then the data is already correct.
// Otherwise, this is a linked scene or entrance info, and must be translated
if (hSavedFacing < 8 && !saves._justLoaded) {
hSavedFacing = FS_TRANS[hSavedFacing];
if (IS_ROSE_TATTOO)
hSavedFacing = Tattoo::FS_TRANS[hSavedFacing];
else
hSavedFacing = Scalpel::FS_TRANS[hSavedFacing];
hSavedPos.x *= FIXED_INT_MULTIPLIER;
hSavedPos.y *= FIXED_INT_MULTIPLIER;
}

6
engines/sherlock/tattoo/tattoo_scene.cpp
View File

@ -31,6 +31,12 @@ namespace Sherlock {
namespace Tattoo {
const int FS_TRANS[8] = {
STOP_UP, STOP_UPRIGHT, STOP_RIGHT, STOP_DOWNRIGHT, STOP_DOWN, STOP_DOWNLEFT, STOP_LEFT, STOP_UPLEFT
};
/*----------------------------------------------------------------*/
struct ShapeEntry {
Object *_shape;
TattooPerson *_person;

2
engines/sherlock/tattoo/tattoo_scene.h
View File

@ -31,6 +31,8 @@ namespace Sherlock {
namespace Tattoo {
extern const int FS_TRANS[8];
enum {
STARTING_GAME_SCENE = 1, STARTING_INTRO_SCENE = 91, OVERHEAD_MAP2 = 90, OVERHEAD_MAP = 100
};