Ticket #7930: mi1_cdmusic.diff

CVS/Entries

@@ -34 +34 @@
 /verbs.cpp/1.12/Thu Dec 27 17:51:58 2001//
 /whatsnew.txt/1.3/Sun Jan 13 19:49:26 2002//
 /windows.cpp/1.24/Fri Dec 28 15:26:28 2001//
-D
+D/PocketSCUMM////
+D/debian////
+D/sound////
+D/wince////
+D/scummvm////

CVS/Entries.Log

@@ -1 @@
-A D/PocketSCUMM////
-A D/debian////
-A D/sound////
-A D/wince////

Makefile

@@ -15 +15 @@
         saveload.o script.o scummvm.o sound.o string.o \
         sys.o verbs.o sdl.o script_v1.o script_v2.o debug.o gui.o \
         sound/imuse.o sound/fmopl.o sound/adlib.o sound/gmidi.o debugrl.o \
-        akos.o
+        akos.o sound/cdmusic.o
 
 DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \
         windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \

PocketSCUMM/CVS/Entries

@@ -1 @@
-D
+D/gapi////
+D/missing////

PocketSCUMM/CVS/Entries.Log

@@ -1 @@
-A D/gapi////
-A D/missing////

PocketSCUMM/missing/CVS/Entries

@@ -1 @@
-D
+D/sys////

PocketSCUMM/missing/CVS/Entries.Log

@@ -1 @@
-A D/sys////

debug.cpp

@@ -26 +26 @@
 #include "stdafx.h"
 #include "scumm.h"
 
+#include "cdmusic.h"
+
 #ifdef HAVE_READLINE
 #include "debugrl.h"
 #endif
@@ -38 +40 @@
         CMD_ACTOR,
         CMD_SCRIPTS,
         CMD_LOAD_ROOM,
+        CMD_CD_INFO,
         CMD_EXIT
 };
 
@@ -68 +71 @@
                                 "(a)ctor [actornum] -> show actor information\n"
                                 "(r)oom roomnum -> load room\n"
                                 "(s)cripts -> show running scripts\n"
+                                "(c)dinfo -> show cd and track info\n"
                                 "(e)xit -> exit game\n"
                            );
                 return true;
@@ -102 +106 @@
                 }
                 return true;
 
+/*-------------------------------------------------------------------------*/
+/*CD Music related commands added by realmz for use with Monkey Island 1
+and for Loom (When Loom support is added and it SHOULD be sooner!) */
+
+        case CMD_CD_INFO:
+                cd_print_info();
+        return true;
+
+/*-------------------------------------------------------------------------*/
+
         case CMD_EXIT:
                 exit(1);
         }
@@ -144 +158 @@
         { "a", 1, CMD_ACTOR },
         { "s", 1, CMD_SCRIPTS },
         { "r", 1, CMD_LOAD_ROOM },
+        { "c", 1, CMD_CD_INFO },
         { "e", 1, CMD_EXIT },
         { 0, 0, 0 },
 };

debugrl.cpp

@@ -10 +10 @@
   "go",
   "actor",
   "scripts",
+  "cdinfo",
   "exit",
   (char *)NULL
 };

scummvm.cpp

@@ -23 +23 @@
 #include "scumm.h"
 #include "gui.h"
 
+#include "cdmusic.h"
+
 void Scumm::initRandSeeds() {
         _randSeed1 = 0xA943DE35;
         _randSeed2 = 0x37A9ED27;
@@ -202 +204 @@
 //      if (_gameId==GID_MONKEY2 && _bootParam==0) {
 //              _bootParam = 10001;
 //      }
+
+        //Init CD Music if Monkey Island 1
+        if(_gameId==GID_MONKEY) {
+                cd_init(0); //Init for MI1
+
+        }
 
         initGraphics(this, _fullScreen);
 

sdl.cpp

@@ -27 +27 @@
 #include "sound.h"
 #include "SDL_thread.h"
 
+#include "cdmusic.h"
+
 #define SCALEUP_2x2
 
 Scumm scumm;
@@ -98 +100 @@
                                                 s->_saveLoadFlag = 2;
                                         s->_saveLoadCompatible = false;
                                 } else if (event.key.keysym.sym=='z' && event.key.keysym.mod&KMOD_CTRL) {
+                                        cd_stop(); //Stop music on exit
                                         exit(1);
                                 } else if (event.key.keysym.sym=='f' && event.key.keysym.mod&KMOD_CTRL) {
                                         s->_fastMode ^= 1;
@@ -149 +152 @@
                                 break;
 
                         case SDL_QUIT:
+                                cd_stop(); //Stop music on exit
                                 exit(1);
                                 break;
                         }
                 }
+
+                cd_music_loop(); //Loop CD Music
 
                 if (SDL_GetTicks() >= start_time + msec_delay)
                         break;

sound/cdmusic.cpp

@@ +1 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * -------------------------------------------------------------------------
+ *
+ * The Secret of Monkey Island uses audio tracks from a CD-ROM for music.
+ * This file adds FULL support for CD music for Monkey Island through
+ * custom mapping of sounds to tracks. There is NO purpose and mabye
+ * no way to know how SCUMM originally mapped the sounds.
+ * This will also be used to support music and voice for Loom WHEN
+ * Loom is supported.
+ *
+ * By: realmz <realmi2@yahoo.com>
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#include <SDL.h>
+
+#include "cdmusic.h"
+
+
+#define MAX_MI1_TRACKS 26 //Maximum number of tracks for MI1
+
+//Stores a sound number for each track
+int mi1_sound[MAX_MI1_TRACKS*2] =
+{
+        1,115,  //Voodoo
+        2,114,  //Jail
+        2,107,  //Saving Elaine (Unsure if correct track)
+        3,109,  //Forest
+        3,107,  //Saving Elaine (Unsure if correct track)
+        4,103,  //Chapel
+        5,112,  //Melee Island Map
+        6,104,  //Part x (room changed too fast to hear all)
+        7,117,  //Guybrush & Elaine
+        8,101,  //SCUMM Bar
+        10,119,  //Meanwhile... (Returned to MI)
+        9,111,  //On LeCheck's Ship
+        10,100, //Meanwhile... (A Problem...)
+        11,113, //Circus
+        14,116, //Monkey Island Map
+        14,128, //Monkey Island Map
+        15,105, //Voyage
+//      15,102, //Voyage (Commented out to prevent restarting track)
+        17,110, //Intro
+        17,108, //Intro - Lookout
+        18,121, //Stan's Used Ships
+        19,129, //LeChuck Leaving Melee (Kidnapping)
+        21,127, //Village
+        22,122, //Dock Sounds
+        23,126, //Night Sounds
+        24,123  //Jungle Sounds
+
+        //00,106, // ???
+};
+
+int cd_current_track, current_sound;
+
+SDL_CD *cdrom;
+
+int start_frame,length; //For Loom Support
+
+int game_type;
+
+int cd_init(int game)
+{
+
+        if (SDL_Init (SDL_INIT_CDROM) < 0)
+        {
+              printf ("Failed to open CD-ROM: %s\n", SDL_GetError ());
+                return -1;
+        }
+
+        if(!SDL_CDNumDrives()){
+          printf("No CDROM devices available\n");
+        return -1;
+        }
+
+        cdrom=SDL_CDOpen(0);
+
+        if(cdrom == NULL)
+        {
+          printf("Couldn't open drive: %s\n", SDL_GetError());
+          exit(-1);
+        }
+
+cd_current_track = -1;
+
+current_sound = -1;
+
+start_frame = 0;
+length = 0;
+
+game_type = game; // 0 is MI1 and 1 is Loom
+
+return 0;
+}
+
+int cd_print_info()
+{
+int min,sec,frame;
+
+if(!cdrom)
+{
+printf("No CD Music support for this game.\n");
+return -1;
+}
+
+FRAMES_TO_MSF(cdrom->cur_frame, &min, &sec, &frame);
+
+
+printf("| Track # | M:S:F  |\n");
+printf("|   %d    | %d:%d:%d |\n",cd_current_track,min,sec,frame);
+
+printf(
+        "Sound Map:\n"
+        "|---------------|\n"
+        "| Sound | Track |\n"
+        "|---------------|\n");
+
+for(int i = 0;i<MAX_MI1_TRACKS*2;i+=2)
+{
+if(mi1_sound[i] < 10)
+printf("|  %d    |   %d |\n",mi1_sound[i+1],mi1_sound[i]);
+else
+printf("|  %d    |  %d |\n",mi1_sound[i+1],mi1_sound[i]);
+}
+
+printf( "|---------------|\n");
+
+return 0;
+}
+
+int cd_stop()
+{
+if(!cdrom)
+return -1;
+
+SDL_CDStop(cdrom);
+
+cd_current_track = -1;
+current_sound = -1;
+
+return 0;
+}
+
+int cd_stop(int sound)
+{
+
+if(sound == current_sound)
+return cd_stop();
+
+return -1;
+}
+
+int cd_play()
+{
+if(!cdrom)
+return -1;
+
+//cd_stop();
+
+SDL_CDStatus (cdrom); //Update SDL_CD
+
+if(current_sound == 108 && game_type == 0) //Play specific section of track 17
+{ 
+SDL_CDPlayTracks(cdrom,cd_current_track,96*CD_FPS,0,0);
+return 0;
+}
+
+SDL_CDPlayTracks(cdrom,cd_current_track,start_frame,0,length);
+
+return 0;
+}
+
+int cd_track_set(int track)
+{
+
+cd_current_track = track;
+
+return 0;
+}
+
+int cd_set_sound(int sound)
+{
+
+if(!cdrom)
+        return -1;
+
+if(game_type == 0) //MI1
+{
+
+if(sound == current_sound) //Don't restart the same sound
+return 0;
+
+        for(int i = 0;i<MAX_MI1_TRACKS*2;i+=2)
+        {
+
+                if(mi1_sound[i+1] == sound)
+                {
+                        current_sound = sound;
+                        cd_track_set(mi1_sound[i]);
+                        cd_play();
+                        return 0;
+                }
+        }
+
+return -1;
+}
+
+else //game_type == 1 which is Loom
+{
+        //No loom support yet :(
+}
+
+}
+
+int cd_music_loop()
+{
+if(!cdrom)
+return 0;
+
+SDL_CDStatus (cdrom); //Update SDL_CD
+
+if(cdrom->cur_track != cd_current_track)
+{
+cd_play();
+}
+
+return 0;
+}

sound/cdmusic.h

@@ +1 @@
+/* ScummVM - Scumm Interpreter
+ * Copyright (C) 2001  Ludvig Strigeus
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ *
+ * -------------------------------------------------------------------------
+ *
+ * The Secret of Monkey Island uses audio tracks from a CD-ROM for music.
+ * This file adds FULL support for CD music for Monkey Island through
+ * custom mapping of sounds to tracks. There is NO purpose and mabye
+ * no way to know how SCUMM originally mapped the sounds.
+ * This will also be used to support music and voice for Loom WHEN
+ * Loom is supported.
+ *
+ * By: realmz <realmi2@yahoo.com>
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#ifndef CD_MUSIC_H
+#define CD_MUSIC_H
+
+int cd_init(int game);
+int cd_print_info();
+int cd_stop();
+int cd_stop(int sound);
+int cd_play();
+int cd_track_set(int track);
+int cd_set_sound(int sound);
+int cd_music_loop();
+
+#endif
+

sound.cpp

@@ -23 +23 @@
 #include "scumm.h"
 #include "sound.h"
 
+#include "cdmusic.h"
+
 void Scumm::addSoundToQueue(int sound) {
 #if !defined(FULL_THROTTLE)
         _vars[VAR_LAST_SOUND] = sound;
@@ -90 +92 @@
 
 void Scumm::playSound(int sound) {
         SoundEngine *se = (SoundEngine*)_soundEngine;
+
+        //Set the sound for CD Music, if it's not for music then uses resources.
+        if(cd_set_sound(sound) == 0)
+                return;
+
         if (se) {
                 getResourceAddress(rtSound, sound);
                 se->start_sound(sound);
@@ -239 +246 @@
         for (i=0; i<10; i++)
                 if (_soundQue2[i] == (byte)a)
                         _soundQue2[i] = 0;
+
+        cd_stop(a);
+
 }
 
 void Scumm::stopAllSounds() {

wince/CVS/Entries

@@ -7 +7 @@
 /screen.cpp/1.1.1.1/Sun Nov 18 10:24:47 2001//
 /screen.h/1.1.1.1/Sun Nov 18 10:24:47 2001//
 /sdl.h/1.1.1.1/Sun Nov 18 10:24:47 2001//
-D
+D/missing////

wince/CVS/Entries.Log

@@ -1 @@
-A D/missing////

wince/missing/CVS/Entries

@@ -10 +10 @@
 /signal.h/1.1.1.1/Sun Nov 18 10:24:48 2001//
 /time.h/1.1.1.1/Sun Nov 18 10:24:48 2001//
 /unistd.h/1.1.1.1/Sun Nov 18 10:24:48 2001//
-D
+D/sys////

wince/missing/CVS/Entries.Log

@@ -1 @@
-A D/sys////