diff options
| author | johndoe123 | 2012-09-27 17:07:41 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:43:43 +0200 |
| commit | a5986fd7222f32dfb00487542086cdd765a39208 (patch) | |
| tree | 860f13d4f6ebe0162e8ef5e0d1f2f497dc7f308a /engines/neverhood/gamemodule.cpp | |
| parent | 8bdddfdb02c0327af2985b81b4803b79de5a2b33 (diff) | |
| download | scummvm-rg350-a5986fd7222f32dfb00487542086cdd765a39208.tar.gz scummvm-rg350-a5986fd7222f32dfb00487542086cdd765a39208.tar.bz2 scummvm-rg350-a5986fd7222f32dfb00487542086cdd765a39208.zip | |
NEVERHOOD: Fix resource file reading by introducing SafeMutexedSeekableSubReadStream which locks a mutex during reads and also lock the same mutex in BlbArchive::load; loading resources while music is playing shouldn't mess up the file position now
- Fix loading of non-existent resources (not elegant and not checked everywhere yet, the resource system is subject to a minor rewrite anyway)
- Rename more Klayman stuff
Diffstat (limited to 'engines/neverhood/gamemodule.cpp')
| -rw-r--r-- | engines/neverhood/gamemodule.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/neverhood/gamemodule.cpp b/engines/neverhood/gamemodule.cpp index 3b1a8c9573..5b84e610ac 100644 --- a/engines/neverhood/gamemodule.cpp +++ b/engines/neverhood/gamemodule.cpp @@ -310,7 +310,7 @@ void GameModule::startup() { _vm->gameState().sceneNum = 0; createModule(2000, -1); #endif -#if 1 +#if 0 _vm->gameState().sceneNum = 5; createModule(2200, -1); #endif @@ -344,8 +344,9 @@ void GameModule::startup() { _vm->gameState().sceneNum = 1; createModule(2700, -1); #endif -#if 0 - _vm->gameState().sceneNum = 11; +#if 1 + setGlobalVar(0x1860C990, 1); // DEBUG Make Klayman small + _vm->gameState().sceneNum = 2; createModule(2800, -1); #endif #if 0 @@ -354,7 +355,7 @@ void GameModule::startup() { createModule(2500, -1); #endif #if 0 - _vm->gameState().sceneNum = 2; + _vm->gameState().sceneNum = 1; createModule(2400, -1); #endif } |