Ticket #8261: indy3_fmtowns2.diff

/cygdrive/c/scummvm

@@ -928 +928 @@
 void CharsetRendererV3::setColor(byte color)
 {
         _color = color;
-        _shadowColor = (_vm->_gameId == GID_ZAK256) ? 8 : 0;
-        if (_vm->_gameId == GID_ZAK256) {
+        _shadowColor = (_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_TOWNS) ? 8 : 0;
+        if (_vm->_gameId == GID_ZAK256 || _vm->_gameId == GID_INDY3_TOWNS) {
                 _dropShadow = ((_color & 0x80) != 0);
                 _color &= 0x7f;
         } else if (_vm->_features & GF_16COLOR) {

/cygdrive/c/scummvm

@@ -31 +31 @@
                 break;
         case GID_INDY3:
         case GID_INDY3_256:
+        case GID_INDY3_TOWNS:
                 return 6;
                 break;
         case GID_LOOM:
@@ -141 +142 @@
                         break;
                 case GID_INDY3:
                 case GID_INDY3_256:
+                case GID_INDY3_TOWNS:
                         ADD_BIND("q", "Push");
                         ADD_BIND("a", "Pull");
                         ADD_BIND("z", "Give");
@@ -264 +266 @@
                 case GID_INDY3:
                 case GID_ZAK256:
                 case GID_INDY3_256:
+                case GID_INDY3_TOWNS:
                         title = "Other game controls:";
                         ADD_TEXT("Inventory:");
                         ADD_BIND("y", "Upper left item");
@@ -289 +292 @@
                 switch (gameId) {
                 case GID_INDY3:
                 case GID_INDY3_256:
+                case GID_INDY3_TOWNS:
                         title = "Fighting controls (numpad):";
                         ADD_BIND("7", "Step back");
                         ADD_BIND("4", "Step back");
@@ -312 +316 @@
                 switch (gameId) {
                 case GID_INDY3:
                 case GID_INDY3_256:
+                case GID_INDY3_TOWNS:
                         title = "Biplane controls (numpad):";
                         ADD_BIND("7", "Fly to upper left");
                         ADD_BIND("4", "Fly to left");

scumm/resource.cpp

@@ -652 +652 @@
                 tag = _fileHandle.readUint16LE();
                 _fileHandle.seek(-6, SEEK_CUR);
                 /* FIXME */
-                if ((type == rtSound) && !(_features & GF_AMIGA) && (_gameId != GID_ZAK256)) {
+                if ((type == rtSound) && !(_features & GF_AMIGA) && (_gameId != GID_ZAK256) && (_gameId != GID_INDY3_TOWNS)) {
                         return readSoundResourceSmallHeader(type, idx);
                 }
         } else {

scumm/resource_v3.cpp

@@ -152 +152 @@
                                 break;
 
                         default:
-                                error("Bad ID %c%c found in directory!", blocktype & 0xFF, blocktype >> 8);
+                                // FIXME: this is a little hack because Indy3 FM Towns has 32 bytes appended to 00.LFL.
+                                if (_gameId != GID_INDY3_TOWNS)
+                                        error("Bad ID %c%c found in directory!", blocktype & 0xFF, blocktype >> 8);
                                 return;
                         }
                 }

/cygdrive/c/scummvm

@@ -504 +504 @@
                         }
 #endif
                         checkRange(_numVariables - 1, 0, var, "Variable %d out of range(rzb)");
-                        return (_scummVars[ var ] & ( 1 << bit ) ) ? 1 : 0;
+                        return (_scummVars[var] & (1 << bit)) ? 1 : 0;
                 } else {
                         var &= 0x7FFF;
+#if defined(BYPASS_COPY_PROT)
+                        if (_gameId == GID_INDY3_TOWNS && var == 1508) {
+                                return 0;
+                        }
+#endif
                         checkRange(_numBitVariables - 1, 0, var, "Bit variable %d out of range(r)");
                         return (_bitVars[var >> 3] & (1 << (var & 7))) ? 1 : 0;
                 }
         }
 
         if (var & 0x4000) {
-                if (_gameId == GID_INDY3_256) {
+                if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3_TOWNS) {
                         var &= 0xF;
                 } else {
                         var &= 0xFFF;
@@ -580 +585 @@
         }
 
         if (var & 0x4000) {
-                if (_gameId == GID_INDY3_256) {
+                if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3_TOWNS) {
                         var &= 0xF;
                 } else {
                         var &= 0xFFF;
@@ -758 +763 @@
                 // not actual data not even a 00 (stop code)
                 // maybe we should be limiting ourselves to strictly reading the size 
                 // described in the header?
-                if (_gameId == GID_INDY3_256) {
+                if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3_TOWNS) {
                         // FIXME: Oddly, Indy3 seems to contain exit scripts with only a size
                         // and a tag - not even a terminating NULL!
                         byte *roomptr = getResourceAddress(rtRoom, _roomResource);

scumm/script_v5.cpp

@@ -599 +599 @@
         // the actor ID of the opposing soldier. So, we copy that value
         // over to the Local[5] variable of script 33.
         // See also bug #743314.
-        if (_gameId == GID_INDY3_256 && vm.slot[cur].number == 32 && script == 33) {
+        if ((_gameId == GID_INDY3_256 || _gameId == GID_INDY3_TOWNS) && vm.slot[cur].number == 32 && script == 33) {
                 vars[5] = vm.localvar[cur][5];
         }
 
@@ -667 +667 @@
                 initCharset(getVarOrDirectByte(0x80));
                 break;
         case 14:                                                                                        /* unk */
-                if (_features & GF_OLD_BUNDLE || _gameId == GID_INDY3_256) {
+                if (_features & GF_OLD_BUNDLE || _gameId == GID_INDY3_256 || _gameId == GID_INDY3_TOWNS) {
                         // FIXME: What is this supposed to do? From comparing
                         // Indy3's script 118 to the Passport Demo's script 58
                         // my guess is that it's some sort of "init charset",
@@ -690 +690 @@
                 break;
         }
 
-        if (!(_features & GF_OLD_BUNDLE) && _gameId != GID_INDY3_256) {
+        if (!(_features & GF_OLD_BUNDLE) && _gameId != GID_INDY3_256 && _gameId != GID_INDY3_TOWNS) {
                 VAR(VAR_CURSORSTATE) = _cursor.state;
                 VAR(VAR_USERPUT) = _userPut;
         }
@@ -975 +975 @@
                 return;
 
         // INDY3 uses this opcode as a wait_for_actor();
-        if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
+        if ((_gameId == GID_INDY3_TOWNS) || (_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
                 const byte *oldaddr = _scriptPointer - 1;
                 a = derefActor(getVarOrDirectByte(0x80), "o5_getActorScale (wait)");
                 if (a->moving) {
@@ -1009 +1009 @@
         int a;
         getResultPos();
 
-        if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3)
+        if (_gameId == GID_INDY3_TOWNS || _gameId == GID_INDY3_256 || _gameId == GID_INDY3)
                 a = getVarOrDirectByte(0x80);
         else
                 a = getVarOrDirectWord(0x80);
@@ -1021 +1021 @@
         int a;
         getResultPos();
 
-        if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3) {
+        if (_gameId == GID_INDY3_TOWNS || _gameId == GID_INDY3_256 || _gameId == GID_INDY3) {
                 a = getVarOrDirectByte(0x80);
 
                 // FIXME - bug 636433 workaround (can't get into Zeppelin) 
@@ -1505 +1505 @@
         _opcode = fetchScriptByte();
         if (_opcode != 17)
                 resid = getVarOrDirectByte(0x80);
-        if (_gameId != GID_ZAK256) {
+        if (_gameId != GID_ZAK256 && _gameId != GID_INDY3_TOWNS) {
                 // FIXME - this probably can be removed eventually, I don't think the following
                 // check will ever be triggered, but then I could be wrong and it's better
                 // to play it safe.
@@ -2014 +2014 @@
 }
 
 void Scumm_v5::o5_startMusic() {
-        if (_gameId == GID_ZAK256) {
+        if (_gameId == GID_ZAK256 || _gameId == GID_INDY3_TOWNS) {
                 // In Zak256, this seems to be some kind of Audio CD status query function.
                 // See also bug #762589 (thanks to Hibernatus for providing the information).
                 getResultPos();
@@ -2341 +2341 @@
 void Scumm_v5::o5_wait() {
         const byte *oldaddr = _scriptPointer - 1;
 
-        if ((_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
+        if ((_gameId == GID_INDY3_TOWNS) || (_gameId == GID_INDY3_256) || (_gameId == GID_INDY3)) {
                 _opcode = 2;
         } else
                 _opcode = fetchScriptByte();
@@ -2584 +2584 @@
                         // It's also needed for Loom, or the lines Bobbin
                         // speaks during the intro are put at position 0,0.
                         // In addition, Loom needs to remember the text colour.
-                        if (_gameId == GID_INDY3_256 || _gameId == GID_INDY3 || _gameId == GID_LOOM) {
+                        if (_gameId == GID_INDY3_TOWNS || _gameId == GID_INDY3_256 || _gameId == GID_INDY3 || _gameId == GID_LOOM) {
                                 _string[textSlot].t_xpos = _string[textSlot].xpos;
                                 _string[textSlot].t_ypos = _string[textSlot].ypos;
                                 _string[textSlot].t_color = _string[textSlot].color;
@@ -2615 +2615 @@
                 a = getVarOrDirectWord(0x80);
 
 #if 1
-                if (_gameId == GID_ZAK256) {
+                if (_gameId == GID_ZAK256 || _gameId == GID_INDY3_TOWNS) {
                         // FIXME / TODO: OK the first thing to note is: at least in Zak256,
                         // maybe also in other games, this opcode does a bit more. I added
                         // some stubs here, but somebody with a full IDA or more knowledge

/cygdrive/c/scummvm

@@ -212 +212 @@
         GID_ZAK,
         GID_PUTTDEMO,
         GID_PUTTPUTT,
-        GID_MONKEY_SEGA
+        GID_MONKEY_SEGA,
+        GID_INDY3_TOWNS
 };
 
 #define _maxRooms res.num[rtRoom]

/cygdrive/c/scummvm

@@ -90 +90 @@
         /* Scumm Version 3 */
         {"indy3EGA", "Indiana Jones and the Last Crusade", GID_INDY3, 3, VersionSettings::ADLIB_ALWAYS,
          GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_USE_KEY | GF_16COLOR | GF_OLD_BUNDLE, "00.LFL"},
+        {"indy3Towns", "Indiana Jones and the Last Crusade (FM Towns)", GID_INDY3_TOWNS, 3, VersionSettings::ADLIB_ALWAYS,
+         GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_AUDIOTRACKS, "00.LFL"},
         {"indy3", "Indiana Jones and the Last Crusade (256)", GID_INDY3_256, 3, VersionSettings::ADLIB_ALWAYS,
          GF_SMALL_HEADER | GF_SMALL_NAMES | GF_NO_SCALLING | GF_OLD256 | GF_ADLIB_DEFAULT, "00.LFL"},
         {"zak256", "Zak McKracken and the Alien Mindbenders (256)", GID_ZAK256, 3, VersionSettings::ADLIB_ALWAYS,
@@ -567 +569 @@
         _hexdumpScripts = false;
         _showStack = false;
 
-        if (_gameId == GID_ZAK256) {    // FmTowns is 320x240
+        if (_gameId == GID_ZAK256 || _gameId == GID_INDY3_TOWNS) {      // FmTowns is 320x240
                 _screenWidth = 320;
                 _screenHeight = 240;
         } else if (_gameId == GID_CMI) {

/cygdrive/c/scummvm

@@ -384 +384 @@
                         WA probably again contains audio data?
                         */
 #endif
-                        rate = 11000;
+                        rate = 11025;
                         int type = *(ptr + 0x0D);
 
                         switch(type) {
@@ -392 +392 @@
                                         int waveSize = READ_LE_UINT32(ptr + 0x22);
                                         int loopStart = READ_LE_UINT32(ptr + 0x26);
                                         int loopEnd = READ_LE_UINT32(ptr + 0x2A);
+                                        rate = (READ_LE_UINT32(ptr + 0x32) == 60) ? 11025 : 22050;      // 48 means 22050
 
                                         if (size - 0x36 < waveSize) {
                                                 warning("Wrong wave size in sound #%i: %i", soundID, waveSize);
@@ -415 +416 @@
                                                 }
                                         }
 
-                                        _scumm->_mixer->playRaw(NULL, sound, waveSize, 11000, flags, soundID);
+                                        _scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, soundID);
                                         break;
                                 }
 
@@ -803 +804 @@
                 stopCD();
         }
 
-        if (_scumm->_gameId == GID_ZAK256) {
+        if (_scumm->_gameId == GID_ZAK256 || _scumm->_gameId == GID_INDY3_TOWNS) {
                 _scumm->_mixer->stopID(a);
         } else if (_scumm->_imuseDigital) {
                 _scumm->_imuseDigital->stopSound(a);