aboutsummaryrefslogtreecommitdiff
path: root/scumm/resource_v2.cpp
diff options
context:
space:
mode:
authorTravis Howell2003-08-14 02:28:19 +0000
committerTravis Howell2003-08-14 02:28:19 +0000
commitcd40c899b2da2b9f0bf857946ac74be119b90bd6 (patch)
treee3bcaf370898ebbc97279909443c445b7d53451c /scumm/resource_v2.cpp
parent03524d071e0ab4491165bde7277604468c58c6c1 (diff)
downloadscummvm-rg350-cd40c899b2da2b9f0bf857946ac74be119b90bd6.tar.gz
scummvm-rg350-cd40c899b2da2b9f0bf857946ac74be119b90bd6.tar.bz2
scummvm-rg350-cd40c899b2da2b9f0bf857946ac74be119b90bd6.zip
Inital support for v1 maniac sound from Hoenicke
Had to move music init for v1/v2 games to get this working svn-id: r9675
Diffstat (limited to 'scumm/resource_v2.cpp')
-rw-r--r--scumm/resource_v2.cpp16
1 files changed, 16 insertions, 0 deletions
diff --git a/scumm/resource_v2.cpp b/scumm/resource_v2.cpp
index 89fa40409c..5ef6fb98b0 100644
--- a/scumm/resource_v2.cpp
+++ b/scumm/resource_v2.cpp
@@ -22,18 +22,27 @@
#include "stdafx.h"
#include "scumm.h"
#include "intern.h"
+#include "player_v2.h"
+#include "player_v1.h"
#include "resource.h"
+#include "sound/mididrv.h"
void Scumm_v2::readClassicIndexFile() {
int i;
if (_gameId == GID_MANIAC) {
+ if (!(_features & GF_AMIGA))
+ _playerV2 = new Player_V1(this);
+
_numGlobalObjects = 800;
_numRooms = 55;
_numCostumes = 35;
_numScripts = 200;
_numSounds = 100;
} else if (_gameId == GID_ZAK) {
+ if (!(_features & GF_AMIGA))
+ _playerV2 = new Player_V2(this);
+
_numGlobalObjects = 775;
_numRooms = 61;
_numCostumes = 37;
@@ -96,6 +105,13 @@ void Scumm_v2::readClassicIndexFile() {
}
void Scumm_v2::readEnhancedIndexFile() {
+
+ if (!(_features & GF_AMIGA)) {
+ _playerV2 = new Player_V2(this);
+ if (_midiDriver == MD_PCSPK)
+ _playerV2->set_pcjr(false);
+ }
+
_numGlobalObjects = _fileHandle.readUint16LE();
_fileHandle.seek(_numGlobalObjects, SEEK_CUR); // Skip object flags
_numRooms = _fileHandle.readByte();