libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-11 19:54:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SHERLOCK: RT: Slightly increase movement speed

Browse Source 
This may cause slight timing issues when doing animations of Holmes
playing musical instruments; I've already added special cases for
several of them to still keep animations in sync with the music
This commit is contained in:
Paul Gilbert 2015-10-12 21:42:35 -04:00
parent 8bed218415
commit fc6bde8f23
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sherlock/events.h
View File

@ -30,7 +30,7 @@
namespace Sherlock {
#define GAME_FRAME_RATE 30
#define GAME_FRAME_RATE 40
#define GAME_FRAME_TIME (1000 / GAME_FRAME_RATE)
enum CursorId { ARROW = 0, MAGNIFY = 1, WAIT = 2, EXIT_ZONES_START = 5, INVALID_CURSOR = -1 };

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

@ -655,7 +655,9 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) {
if (ui._windowOpen)
ui.banishWindow();
//_activeCAnim._filesize = cAnim._size;
if (_currentScene == 3 && cAnimNum == 21)
// Set framerate for correct playing of violin in Holmes' bedroom
events.setFrameRate(30);
// Open up the room resource file and get the data for the animation
Common::SeekableReadStream *stream = res.load(_roomFilename);
@ -719,6 +721,7 @@ int TattooScene::startCAnim(int cAnimNum, int playRate) {
_activeCAnim._zPlacement = REMOVE;
_activeCAnim._removeBounds = _activeCAnim._oldBounds;
_vm->_ui->_bgFound = -1;
events.setFrameRate(GAME_FRAME_RATE);
// Free up the animation
_activeCAnim.close();

5
engines/sherlock/tattoo/tattoo_talk.cpp
View File

@ -192,6 +192,9 @@ void TattooTalk::talkTo(const Common::String filename) {
if (filename == "wilb29a")
events.incWaitCounter();
if (filename == "keys33d")
events.setFrameRate(30);
Talk::talkTo(filename);
if (filename == "wilb29a")
@ -200,6 +203,8 @@ void TattooTalk::talkTo(const Common::String filename) {
events.decWaitCounter();
events.setCursor(ARROW);
}
if (filename == "keys33d")
events.setFrameRate(GAME_FRAME_RATE);
}
void TattooTalk::talkInterface(const byte *&str) {