From ce46866403fdcc479cf9d67e4d430409b15dadc3 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 21 Aug 2002 16:07:07 +0000 Subject: [PATCH] Initial revision svn-id: r4785 --- .cvsignore | 6 - .indent.pro | 15 -- copying.txt => COPYING | 0 Makefile | 18 +-- Makefile.common | 67 +++++---- Makefile.irix | 21 --- Makefile.mingw | 45 ------ Makefile.qtopia | 20 --- whatsnew.txt => NEWS | 0 readme.txt => README | 0 {dc => backends/dc}/.cvsignore | 0 {dc => backends/dc}/Makefile | 0 {dc => backends/dc}/README | 0 {dc => backends/dc}/audio.cpp | 0 {dc => backends/dc}/dc.h | 0 {dc => backends/dc}/dcmain.cpp | 0 {dc => backends/dc}/display.cpp | 0 {dc => backends/dc}/icon.cpp | 0 {dc => backends/dc}/icon.h | 0 {dc => backends/dc}/input.cpp | 0 {dc => backends/dc}/label.cpp | 0 {dc => backends/dc}/label.h | 0 {dc => backends/dc}/portdefs.h | 0 {dc => backends/dc}/selector.cpp | 0 {dc => backends/dc}/vmsave.cpp | 0 {mac => backends/mac}/Carbon.r | 0 {mac => backends/mac}/CarbonPort-ReadMe.txt | 0 {mac => backends/mac}/mac.cpp | 0 {mac => backends/mac}/macos.h | 0 backends/mac/scummvm.icns | Bin 0 -> 38332 bytes {mac => backends/mac}/scummvm.mcp | Bin 158716 -> 158716 bytes {morphos => backends/morphos}/Makefile | 11 +- {morphos => backends/morphos}/MorphOS.readme | 0 {morphos => backends/morphos}/morphos.cpp | 0 {morphos => backends/morphos}/morphos.h | 0 .../morphos}/morphos_scaler.cpp | 0 .../morphos}/morphos_scaler.h | 0 .../morphos}/morphos_sound.cpp | 0 .../morphos}/morphos_start.cpp | 0 .../morphos}/morphos_timer.cpp | 0 {morphos => backends/morphos}/morphos_timer.h | 0 fb2opengl.h => backends/sdl/fb2opengl.h | 0 sdl.cpp => backends/sdl/sdl.cpp | 0 sdl_gl.cpp => backends/sdl/sdl_gl.cpp | 0 {wince => backends/wince}/MenuTitle.bmp | Bin 11482 -> 11482 bytes {wince => backends/wince}/PocketSCUMM.rc | 0 {wince => backends/wince}/PocketSCUMM.vcc | 0 {wince => backends/wince}/PocketSCUMM.vcp | 0 {wince => backends/wince}/PocketSCUMM.vcw | 0 {wince => backends/wince}/bitmaps.cpp | 0 {wince => backends/wince}/findgame.cpp | 0 {wince => backends/wince}/gapi_keys.cpp | 0 gapi_keys.h => backends/wince/gapi_keys.h | 0 {wince => backends/wince}/missing/assert.h | 0 {wince => backends/wince}/missing/conio.h | 0 {wince => backends/wince}/missing/dir.h | 0 {wince => backends/wince}/missing/direct.h | 0 {wince => backends/wince}/missing/dirent.h | 0 {wince => backends/wince}/missing/errno.h | 0 {wince => backends/wince}/missing/fcntl.h | 0 {wince => backends/wince}/missing/io.h | 0 {wince => backends/wince}/missing/missing.cpp | 0 {wince => backends/wince}/missing/signal.h | 0 {wince => backends/wince}/missing/sys/stat.h | 0 {wince => backends/wince}/missing/sys/time.h | 0 {wince => backends/wince}/missing/sys/types.h | 0 {wince => backends/wince}/missing/time.h | 0 {wince => backends/wince}/missing/unistd.h | 0 {wince => backends/wince}/newres.h | 0 {wince => backends/wince}/pocketpc.cpp | 0 {wince => backends/wince}/pocketscumm.ico | Bin {wince => backends/wince}/resource.h | 0 {wince => backends/wince}/screen.cpp | 0 {wince => backends/wince}/screen.h | 0 x11.cpp => backends/x11/x11.cpp | 0 config-file.cpp => common/config-file.cpp | 0 config-file.h => common/config-file.h | 0 gameDetector.cpp => common/gameDetector.cpp | 8 +- gameDetector.h => common/gameDetector.h | 0 main.cpp => common/main.cpp | 0 scummsys.h => common/scummsys.h | 0 stdafx.cpp => common/stdafx.cpp | 0 stdafx.h => common/stdafx.h | 3 + system.h => common/system.h | 0 timer.cpp => common/timer.cpp | 0 timer.h => common/timer.h | 0 util.cpp => common/util.cpp | 0 util.h => common/util.h | 0 debian/.cvsignore | 6 - debian/README.Debian | 9 -- debian/changelog.cvs | 8 -- debian/changelog.debian | 22 --- debian/changelog.debian_official | 23 --- debian/control | 15 -- debian/copyright | 16 --- debian/prepare | 20 --- debian/rules | 48 ------- debian/scummvm.dirs | 3 - debian/scummvm.docs | 2 - gui/dialog.cpp | 22 ++- gui/dialog.h | 2 + gui.cpp => gui/gui.cpp | 2 +- gui.h => gui/gui.h | 0 guimaps.h => gui/guimaps.h | 0 newgui.cpp => gui/newgui.cpp | 0 newgui.h => gui/newgui.h | 0 mac/ScummVM_Mac_Prefix.h | 7 - actor.cpp => scumm/actor.cpp | 0 actor.h => scumm/actor.h | 0 akos.cpp => scumm/akos.cpp | 0 akos.h => scumm/akos.h | 0 boxes.cpp => scumm/boxes.cpp | 0 boxes.h => scumm/boxes.h | 0 bundle.cpp => scumm/bundle.cpp | 0 bundle.h => scumm/bundle.h | 0 costume.cpp => scumm/costume.cpp | 0 costume.h => scumm/costume.h | 0 debug.cpp => scumm/debug.cpp | 0 debug.h => scumm/debug.h | 0 debugrl.cpp => scumm/debugrl.cpp | 0 debugrl.h => scumm/debugrl.h | 0 engine.cpp => scumm/engine.cpp | 0 engine.h => scumm/engine.h | 0 gfx.cpp => scumm/gfx.cpp | 4 +- gfx.h => scumm/gfx.h | 0 {sound => scumm}/imuse.cpp | 8 +- {sound => scumm}/imuse.h | 0 insane.cpp => scumm/insane.cpp | 0 object.cpp => scumm/object.cpp | 0 object.h => scumm/object.h | 0 resource.cpp => scumm/resource.cpp | 0 resource.h => scumm/resource.h | 0 {v3 => scumm}/resource_v3.cpp | 0 {v4 => scumm}/resource_v4.cpp | 0 saveload.cpp => scumm/saveload.cpp | 2 +- saveload.h => scumm/saveload.h | 0 scaler.cpp => scumm/scaler.cpp | 0 scaler.h => scumm/scaler.h | 0 script.cpp => scumm/script.cpp | 0 script_v1.cpp => scumm/script_v1.cpp | 0 script_v2.cpp => scumm/script_v2.cpp | 2 +- scumm.h => scumm/scumm.h | 0 scummvm.cpp => scumm/scummvm.cpp | 6 +- smush.h => scumm/smush.h | 0 sound.h => scumm/sound.h | 0 string.cpp => scumm/string.cpp | 0 sys.cpp => scumm/sys.cpp | 0 vars.cpp => scumm/vars.cpp | 0 verbs.cpp => scumm/verbs.cpp | 0 simon/{simondebug.cpp => debug.cpp} | 4 +- simon/{simonintern.h => intern.h} | 0 simon/{simonitems.cpp => items.cpp} | 4 +- simon/midi.cpp | 8 +- simon/{simonres.cpp => res.cpp} | 4 +- simon/simon.cpp | 6 +- simon/{simonsys.cpp => sys.cpp} | 2 +- simon/{simonverb.cpp => verb.cpp} | 4 +- simon/{simonvga.cpp => vga.cpp} | 4 +- sound.cpp => sound/sound.cpp | 6 +- sound/sound.h | 136 ++++++++++++++++++ 160 files changed, 250 insertions(+), 369 deletions(-) delete mode 100644 .cvsignore delete mode 100644 .indent.pro rename copying.txt => COPYING (100%) delete mode 100644 Makefile.irix delete mode 100644 Makefile.mingw delete mode 100644 Makefile.qtopia rename whatsnew.txt => NEWS (100%) rename readme.txt => README (100%) rename {dc => backends/dc}/.cvsignore (100%) rename {dc => backends/dc}/Makefile (100%) rename {dc => backends/dc}/README (100%) rename {dc => backends/dc}/audio.cpp (100%) rename {dc => backends/dc}/dc.h (100%) rename {dc => backends/dc}/dcmain.cpp (100%) rename {dc => backends/dc}/display.cpp (100%) rename {dc => backends/dc}/icon.cpp (100%) rename {dc => backends/dc}/icon.h (100%) rename {dc => backends/dc}/input.cpp (100%) rename {dc => backends/dc}/label.cpp (100%) rename {dc => backends/dc}/label.h (100%) rename {dc => backends/dc}/portdefs.h (100%) rename {dc => backends/dc}/selector.cpp (100%) rename {dc => backends/dc}/vmsave.cpp (100%) rename {mac => backends/mac}/Carbon.r (100%) rename {mac => backends/mac}/CarbonPort-ReadMe.txt (100%) rename {mac => backends/mac}/mac.cpp (100%) rename {mac => backends/mac}/macos.h (100%) mode change 100755 => 100644 create mode 100644 backends/mac/scummvm.icns rename {mac => backends/mac}/scummvm.mcp (89%) rename {morphos => backends/morphos}/Makefile (74%) rename {morphos => backends/morphos}/MorphOS.readme (100%) rename {morphos => backends/morphos}/morphos.cpp (100%) rename {morphos => backends/morphos}/morphos.h (100%) rename {morphos => backends/morphos}/morphos_scaler.cpp (100%) rename {morphos => backends/morphos}/morphos_scaler.h (100%) rename {morphos => backends/morphos}/morphos_sound.cpp (100%) rename {morphos => backends/morphos}/morphos_start.cpp (100%) rename {morphos => backends/morphos}/morphos_timer.cpp (100%) rename {morphos => backends/morphos}/morphos_timer.h (100%) rename fb2opengl.h => backends/sdl/fb2opengl.h (100%) rename sdl.cpp => backends/sdl/sdl.cpp (100%) rename sdl_gl.cpp => backends/sdl/sdl_gl.cpp (100%) rename {wince => backends/wince}/MenuTitle.bmp (78%) mode change 100755 => 100644 rename {wince => backends/wince}/PocketSCUMM.rc (100%) rename {wince => backends/wince}/PocketSCUMM.vcc (100%) mode change 100755 => 100644 rename {wince => backends/wince}/PocketSCUMM.vcp (100%) rename {wince => backends/wince}/PocketSCUMM.vcw (100%) mode change 100755 => 100644 rename {wince => backends/wince}/bitmaps.cpp (100%) mode change 100755 => 100644 rename {wince => backends/wince}/findgame.cpp (100%) rename {wince => backends/wince}/gapi_keys.cpp (100%) rename gapi_keys.h => backends/wince/gapi_keys.h (100%) rename {wince => backends/wince}/missing/assert.h (100%) rename {wince => backends/wince}/missing/conio.h (100%) rename {wince => backends/wince}/missing/dir.h (100%) rename {wince => backends/wince}/missing/direct.h (100%) rename {wince => backends/wince}/missing/dirent.h (100%) rename {wince => backends/wince}/missing/errno.h (100%) rename {wince => backends/wince}/missing/fcntl.h (100%) rename {wince => backends/wince}/missing/io.h (100%) rename {wince => backends/wince}/missing/missing.cpp (100%) rename {wince => backends/wince}/missing/signal.h (100%) rename {wince => backends/wince}/missing/sys/stat.h (100%) rename {wince => backends/wince}/missing/sys/time.h (100%) rename {wince => backends/wince}/missing/sys/types.h (100%) rename {wince => backends/wince}/missing/time.h (100%) rename {wince => backends/wince}/missing/unistd.h (100%) rename {wince => backends/wince}/newres.h (100%) rename {wince => backends/wince}/pocketpc.cpp (100%) rename {wince => backends/wince}/pocketscumm.ico (100%) rename {wince => backends/wince}/resource.h (100%) rename {wince => backends/wince}/screen.cpp (100%) rename {wince => backends/wince}/screen.h (100%) rename x11.cpp => backends/x11/x11.cpp (100%) rename config-file.cpp => common/config-file.cpp (100%) rename config-file.h => common/config-file.h (100%) rename gameDetector.cpp => common/gameDetector.cpp (99%) rename gameDetector.h => common/gameDetector.h (100%) rename main.cpp => common/main.cpp (100%) rename scummsys.h => common/scummsys.h (100%) rename stdafx.cpp => common/stdafx.cpp (100%) rename stdafx.h => common/stdafx.h (98%) rename system.h => common/system.h (100%) rename timer.cpp => common/timer.cpp (100%) rename timer.h => common/timer.h (100%) rename util.cpp => common/util.cpp (100%) rename util.h => common/util.h (100%) delete mode 100644 debian/.cvsignore delete mode 100644 debian/README.Debian delete mode 100644 debian/changelog.cvs delete mode 100644 debian/changelog.debian delete mode 100644 debian/changelog.debian_official delete mode 100644 debian/control delete mode 100644 debian/copyright delete mode 100755 debian/prepare delete mode 100755 debian/rules delete mode 100644 debian/scummvm.dirs delete mode 100644 debian/scummvm.docs rename gui.cpp => gui/gui.cpp (99%) rename gui.h => gui/gui.h (100%) rename guimaps.h => gui/guimaps.h (100%) rename newgui.cpp => gui/newgui.cpp (100%) rename newgui.h => gui/newgui.h (100%) delete mode 100644 mac/ScummVM_Mac_Prefix.h rename actor.cpp => scumm/actor.cpp (100%) rename actor.h => scumm/actor.h (100%) rename akos.cpp => scumm/akos.cpp (100%) rename akos.h => scumm/akos.h (100%) rename boxes.cpp => scumm/boxes.cpp (100%) rename boxes.h => scumm/boxes.h (100%) rename bundle.cpp => scumm/bundle.cpp (100%) rename bundle.h => scumm/bundle.h (100%) rename costume.cpp => scumm/costume.cpp (100%) rename costume.h => scumm/costume.h (100%) rename debug.cpp => scumm/debug.cpp (100%) rename debug.h => scumm/debug.h (100%) rename debugrl.cpp => scumm/debugrl.cpp (100%) rename debugrl.h => scumm/debugrl.h (100%) rename engine.cpp => scumm/engine.cpp (100%) rename engine.h => scumm/engine.h (100%) rename gfx.cpp => scumm/gfx.cpp (99%) rename gfx.h => scumm/gfx.h (100%) rename {sound => scumm}/imuse.cpp (99%) rename {sound => scumm}/imuse.h (100%) rename insane.cpp => scumm/insane.cpp (100%) rename object.cpp => scumm/object.cpp (100%) rename object.h => scumm/object.h (100%) rename resource.cpp => scumm/resource.cpp (100%) rename resource.h => scumm/resource.h (100%) rename {v3 => scumm}/resource_v3.cpp (100%) rename {v4 => scumm}/resource_v4.cpp (100%) rename saveload.cpp => scumm/saveload.cpp (99%) rename saveload.h => scumm/saveload.h (100%) rename scaler.cpp => scumm/scaler.cpp (100%) rename scaler.h => scumm/scaler.h (100%) rename script.cpp => scumm/script.cpp (100%) rename script_v1.cpp => scumm/script_v1.cpp (100%) rename script_v2.cpp => scumm/script_v2.cpp (99%) rename scumm.h => scumm/scumm.h (100%) rename scummvm.cpp => scumm/scummvm.cpp (99%) rename smush.h => scumm/smush.h (100%) rename sound.h => scumm/sound.h (100%) rename string.cpp => scumm/string.cpp (100%) rename sys.cpp => scumm/sys.cpp (100%) rename vars.cpp => scumm/vars.cpp (100%) rename verbs.cpp => scumm/verbs.cpp (100%) rename simon/{simondebug.cpp => debug.cpp} (99%) rename simon/{simonintern.h => intern.h} (100%) rename simon/{simonitems.cpp => items.cpp} (99%) rename simon/{simonres.cpp => res.cpp} (99%) rename simon/{simonsys.cpp => sys.cpp} (98%) rename simon/{simonverb.cpp => verb.cpp} (99%) rename simon/{simonvga.cpp => vga.cpp} (99%) rename sound.cpp => sound/sound.cpp (99%) create mode 100644 sound/sound.h diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 605f60dabd95..000000000000 --- a/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -.deps -.DS_Store -.gdb_history -*.s[0-9][0-9] -*.c[0-9][0-9] -scummvm diff --git a/.indent.pro b/.indent.pro deleted file mode 100644 index afb9cd1c3347..000000000000 --- a/.indent.pro +++ /dev/null @@ -1,15 +0,0 @@ --br -bap -nbc -lp -ce -cdw -brs -nbad -nbc -npsl -nip -ts2 -ncs -nbs --npcs -nbap -l105 --Tbool -Tbyte -Tvoid -Tuint32 -Tuint8 -Tuint16 -Tint -Tint8 -Tint16 -Tint32 --TFILE --TOSystem -TScumm -TThreadProc -TSoundProc -TEvent -TProperty --TConfig -Thashconfig -TGameDetector -TSaveLoadEntry -TScummPoint --TGui -TGuiWidget -TNewGui -TWidget -TDialog --TArrayHeader -TMemBlkHeader -TVerbSlot -TObjectData -TImageHeader -TRoomHeader --TCodeHeader -TResHdr -TBompHeader -TBompDrawData -TBlastObject -TLoadedCostume --TActor -TBox -TBoxCoords -TVirtScreen -TPathVertex -TPathNode -TFindObjectInRoom --TMidiChannelAdl -TSoundEngine -TPart -TPlayer -TSong --TSerializer -TMidiDriver -TIMuseInternal -TIMuseDriver -TStreamCallback --TSoundMixer -TPlayingSoundHandle -TPremixProc -TMIDIEVENT -TFM_OPL --TItem -TChild -TChild1 -TChild2 -TTimeEvent -TSubroutine -TSubroutineLine --TFillOrCopyStruct -TTrack -TNoteRec -TMidiEvent diff --git a/copying.txt b/COPYING similarity index 100% rename from copying.txt rename to COPYING diff --git a/Makefile b/Makefile index 9320484c29a4..b7746c1bfc2d 100644 --- a/Makefile +++ b/Makefile @@ -1,15 +1,15 @@ # $Header$ -CC = g++ +CXX = c++ CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar DEFINES = LDFLAGS := -INCLUDES:= -I./ -I./sound +INCLUDES:= -I. -Icommon -Iscumm -Isound LIBS = -lncurses # Uncomment this to activate the MAD lib for compressed sound files -# DEFINES += -DCOMPRESSED_SOUND_FILE -# LIBS += -lmad +DEFINES += -DCOMPRESSED_SOUND_FILE +LIBS += -lmad # Uncomment this to activate the ALSA lib for midi # DEFINES += -DUSE_ALSA @@ -19,23 +19,23 @@ LIBS = -lncurses # Beware, only define one of them, otherwise the compilation will blow up. # Comment this if you want to disable SDL output -OBJS = sdl.o +OBJS = backends/sdl/sdl.o INCLUDES += `sdl-config --cflags` LIBS += `sdl-config --libs` DEFINES += -DUNIX # Uncomment this (instead of the above) to activate the SDL with OpenGL output -# OBJS = sdl_gl.o +# OBJS = backends/sdl/sdl_gl.o # INCLUDES += `sdl-config --cflags` # LIBS += `sdl-config --libs` -lGL # DEFINES += -DUNIX # Uncomment this in addition to the above if you compile on Mac OS X -# LIBS += -framework QuickTime -framework AudioUnit -# DEFINES += -DMACOSX +LIBS += -framework QuickTime -framework AudioUnit +DEFINES += -DMACOSX # Uncomment this if you rather want X11 output -# OBJS = x11.o +# OBJS = backends/x11/x11.o # DEFINES += -DUNIX -DX11_BACKEND # LDFLAGS := -L/usr/X11R6/lib -L/usr/local/lib # INCLUDES+= -I/usr/X11R6/include diff --git a/Makefile.common b/Makefile.common index 84256ef67403..6fe2133ff40d 100644 --- a/Makefile.common +++ b/Makefile.common @@ -4,31 +4,44 @@ ZIPFILE := scummvm-`date '+%Y-%m-%d'`.zip -INCS = scumm.h scummsys.h stdafx.h - -OBJS += util.o newgui.o gui/widget.o gui/dialog.o \ - gui/ListWidget.o gui/ScrollBarWidget.o \ - actor.o akos.o boxes.o bundle.o config-file.o costume.o debug.o \ - debugrl.o engine.o gameDetector.o gfx.o gui.o insane.o main.o object.o \ - resource.o saveload.o scaler.o script.o script_v1.o script_v2.o \ - scummvm.o sound.o string.o sys.o timer.o vars.o verbs.o \ - sound/imuse.o sound/fmopl.o sound/mixer.o \ - v3/resource_v3.o v4/resource_v4.o \ - simon/midi.o simon/simon.o simon/simonsys.o simon/simonvga.o \ - simon/simondebug.o simon/simonres.o simon/simonitems.o simon/simonverb.o \ - sound/mididrv.o - -DISTFILES=$(OBJS:.o=.cpp) Makefile scummvm.dsp scummvm.dsw stdafx.cpp \ - whatsnew.txt readme.txt copying.txt \ - actor.h akos.h boxes.h bundle.h cmdline.h config-file.h costume.h debug.h \ - debugrl.h engine.h fb2opengl.h gameDetector.h gapi_keys.h gfx.h gui.h guimaps.h \ - newgui.h object.h resource.h saveload.h scaler.h scumm.h scummsys.h smush.h \ - sound.h stdafx.h system.h timer.h util.h sound/fmopl.h +INCS = scumm/scumm.h common/scummsys.h common/stdafx.h + +COMMON_OBJS = common/config-file.o common/gameDetector.o common/main.o \ + common/timer.o common/util.o + +GUI_OBJS = gui/gui.o gui/newgui.o gui/widget.o gui/dialog.o gui/ListWidget.o \ + gui/ScrollBarWidget.o + +SCUMM_OBJS = scumm/actor.o scumm/akos.o scumm/boxes.o scumm/bundle.o \ + scumm/costume.o scumm/debug.o scumm/debugrl.o scumm/engine.o scumm/gfx.o \ + scumm/imuse.o scumm/insane.o scumm/object.o scumm/resource.o \ + scumm/resource_v3.o scumm/resource_v4.o scumm/saveload.o scumm/scaler.o \ + scumm/script.o scumm/script_v1.o scumm/script_v2.o scumm/scummvm.o \ + scumm/string.o scumm/sys.o scumm/vars.o scumm/verbs.o + +SIMON_OBJS = simon/debug.o simon/items.o simon/midi.o simon/res.o simon/simon.o \ + simon/sys.o simon/verb.o simon/vga.o + +SOUND_OBJS = sound/fmopl.o sound/mididrv.o sound/mixer.o sound/sound.o + +OBJS += $(COMMON_OBJS) $(GUI_OBJS) scumm/libscumm.a simon/libsimon.a $(SOUND_OBJS) + +DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \ + debugrl.h whatsnew.txt readme.txt copying.txt \ + scummvm.dsp scummvm.dsw sound/fmopl.h gui.h sound.h all: scummvm$(EXEEXT) scummvm$(EXEEXT): $(OBJS) - $(CC) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) + $(CXX) $(LDFLAGS) -o $(@) $(OBJS) $(LIBS) + +scumm/libscumm.a: $(SCUMM_OBJS) + ar cru $@ $+ + ranlib $@ + +simon/libsimon.a: $(SIMON_OBJS) + ar cru $@ $+ + ranlib $@ clean: rm -f $(OBJS) scummvm$(EXEEXT) @@ -37,7 +50,7 @@ clean: # Default (dumb) compile & dependcy rules .cpp.o: - $(CC) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o + $(CXX) $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o $(OBJS): $(INCS) @@ -45,10 +58,10 @@ $(OBJS): $(INCS) # dependency tracking. #DEPDIR := .deps #.cpp.o: -# mkdir -p $(DEPDIR) -# $(CC) -Wp,-MMD,"$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o -# echo -n "$(*D)/" > $(DEPDIR)/$(*F).d -# cat "$(DEPDIR)/$(*F).d2" >> "$(DEPDIR)/$(*F).d" -# rm -f "$(DEPDIR)/$(*F).d2" +# mkdir -p $(*D)/$(DEPDIR) +# $(CXX) -Wp,-MMD,"$(*D)/$(DEPDIR)/$(*F).d2" $(CFLAGS) $(CPPFLAGS) -c $(<) -o $*.o +# echo -n "$(*D)/" > $(*D)/$(DEPDIR)/$(*F).d +# cat "$(*D)/$(DEPDIR)/$(*F).d2" >> "$(*D)/$(DEPDIR)/$(*F).d" +# rm -f "$(*D)/$(DEPDIR)/$(*F).d2" # #-include $(DEPDIR)/*.d diff --git a/Makefile.irix b/Makefile.irix deleted file mode 100644 index 1cd508ec04b4..000000000000 --- a/Makefile.irix +++ /dev/null @@ -1,21 +0,0 @@ -# $Header$ - -CC = CC -CFLAGS = -O2 -Olimit 9000 -mips2 -#CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -# Remove -DHAVE_NO_BOOL if your compiler has a builtin bool type -DEFINES = -DUNIX -DHAVE_NO_BOOL -DCOMPRESSED_SOUND_FILE -LDFLAGS := -INCLUDES:= `sdl-config --cflags` -I./ -I./sound -CPPFLAGS= $(DEFINES) $(INCLUDES) - -# Add -lmad for -DCOMPRESSED_SOUND_FILE -LIBS = `sdl-config --libs` -lmad -lm - -OBJS = sdl.o - -include Makefile.common - -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) diff --git a/Makefile.mingw b/Makefile.mingw deleted file mode 100644 index 5c56fa5d57c6..000000000000 --- a/Makefile.mingw +++ /dev/null @@ -1,45 +0,0 @@ -# Where is scummvm will be installed -SCUMMVMPATH=C:/scummvm -SRC=. -VPATH=$(SRC) - -### Modify these paths -SDL_CFLAGS=-I$(SRC)/sdl/include -SDL_LIBS=-L$(SRC)/sdl/lib -lSDLmain -lSDL - -# If MAD (MPEG Audio Decoder) header and library isn't installed remove -lmad and -DCOMPRESSED_SOUND_FILE -CC = g++ -CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DEFINES = -DCOMPRESSED_SOUND_FILE -LDFLAGS :=-mwindows -mconsole -INCLUDES:= $(SDL_CFLAGS) -I./ -I./sound -CPPFLAGS= $(DEFINES) $(INCLUDES) -LIBS = -lmingw32 -lwinmm -lmad $(SDL_LIBS) -EXEEXT :=.exe - -# Uncomment this for SDL normal output -OBJS = sdl.o scummvmico.o -# Or uncomment this for SDL with OpenGL output -#OBJS = sdl_gl.o scummvmico.o -#LIBS += -lopengl32 - -include Makefile.common - -scummvmico.o: scummvm.ico - windres scummvm.rc scummvmico.o - - -# Some additional targets -install: scummvm$(EXEEXT) - mkdir -p $(SCUMMVMPATH) - strip scummvm$(EXEEXT) -o $(SCUMMVMPATH)/scummvm$(EXEEXT) - -dist: install - cp copying.txt $(SCUMMVMPATH) - cp readme.txt $(SCUMMVMPATH) - cp whatsnew.txt $(SCUMMVMPATH) - cp SDL/README-SDL.txt $(SCUMMVMPATH) - cp SDL/lib/SDL.dll $(SCUMMVMPATH) - u2d $(SCUMMVMPATH)/*.txt - -.PHONY: install dist diff --git a/Makefile.qtopia b/Makefile.qtopia deleted file mode 100644 index e33cf8451f88..000000000000 --- a/Makefile.qtopia +++ /dev/null @@ -1,20 +0,0 @@ -# $Header$ - -CC = arm-linux-g++ -CFLAGS = -g -O -Wall -Wstrict-prototypes -Wuninitialized -Wno-long-long -Wno-multichar -DEFINES = -DUNIX -DCOMPRESSED_SOUND_FILE -DBYPASS_COPY_PROT -DQTOPIA -DSCUMM_NEED_ALIGNMENT -LDFLAGS := -INCLUDES:= `/opt/Qtopia/sharp/bin/sdl-config --cflags` -I./ -I./sound -CPPFLAGS= $(DEFINES) $(INCLUDES) - -# Add -lmad for -DCOMPRESSED_SOUND_FILE -LIBS = `/opt/Qtopia/sharp/bin/sdl-config --libs` -lmad -#-lncurses - -OBJS = sdl.o - -include Makefile.common - -dist: - rm -f $(ZIPFILE) - zip -q $(ZIPFILE) $(DISTFILES) diff --git a/whatsnew.txt b/NEWS similarity index 100% rename from whatsnew.txt rename to NEWS diff --git a/readme.txt b/README similarity index 100% rename from readme.txt rename to README diff --git a/dc/.cvsignore b/backends/dc/.cvsignore similarity index 100% rename from dc/.cvsignore rename to backends/dc/.cvsignore diff --git a/dc/Makefile b/backends/dc/Makefile similarity index 100% rename from dc/Makefile rename to backends/dc/Makefile diff --git a/dc/README b/backends/dc/README similarity index 100% rename from dc/README rename to backends/dc/README diff --git a/dc/audio.cpp b/backends/dc/audio.cpp similarity index 100% rename from dc/audio.cpp rename to backends/dc/audio.cpp diff --git a/dc/dc.h b/backends/dc/dc.h similarity index 100% rename from dc/dc.h rename to backends/dc/dc.h diff --git a/dc/dcmain.cpp b/backends/dc/dcmain.cpp similarity index 100% rename from dc/dcmain.cpp rename to backends/dc/dcmain.cpp diff --git a/dc/display.cpp b/backends/dc/display.cpp similarity index 100% rename from dc/display.cpp rename to backends/dc/display.cpp diff --git a/dc/icon.cpp b/backends/dc/icon.cpp similarity index 100% rename from dc/icon.cpp rename to backends/dc/icon.cpp diff --git a/dc/icon.h b/backends/dc/icon.h similarity index 100% rename from dc/icon.h rename to backends/dc/icon.h diff --git a/dc/input.cpp b/backends/dc/input.cpp similarity index 100% rename from dc/input.cpp rename to backends/dc/input.cpp diff --git a/dc/label.cpp b/backends/dc/label.cpp similarity index 100% rename from dc/label.cpp rename to backends/dc/label.cpp diff --git a/dc/label.h b/backends/dc/label.h similarity index 100% rename from dc/label.h rename to backends/dc/label.h diff --git a/dc/portdefs.h b/backends/dc/portdefs.h similarity index 100% rename from dc/portdefs.h rename to backends/dc/portdefs.h diff --git a/dc/selector.cpp b/backends/dc/selector.cpp similarity index 100% rename from dc/selector.cpp rename to backends/dc/selector.cpp diff --git a/dc/vmsave.cpp b/backends/dc/vmsave.cpp similarity index 100% rename from dc/vmsave.cpp rename to backends/dc/vmsave.cpp diff --git a/mac/Carbon.r b/backends/mac/Carbon.r similarity index 100% rename from mac/Carbon.r rename to backends/mac/Carbon.r diff --git a/mac/CarbonPort-ReadMe.txt b/backends/mac/CarbonPort-ReadMe.txt similarity index 100% rename from mac/CarbonPort-ReadMe.txt rename to backends/mac/CarbonPort-ReadMe.txt diff --git a/mac/mac.cpp b/backends/mac/mac.cpp similarity index 100% rename from mac/mac.cpp rename to backends/mac/mac.cpp diff --git a/mac/macos.h b/backends/mac/macos.h old mode 100755 new mode 100644 similarity index 100% rename from mac/macos.h rename to backends/mac/macos.h diff --git a/backends/mac/scummvm.icns b/backends/mac/scummvm.icns new file mode 100644 index 0000000000000000000000000000000000000000..5f5e10d732317ebd37508dc4a3d411da49a2e9ee GIT binary patch literal 38332 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 P%<3z_nxElsS~mWFK5qWc literal 0 HcmV?d00001 diff --git a/mac/scummvm.mcp b/backends/mac/scummvm.mcp similarity index 89% rename from mac/scummvm.mcp rename to backends/mac/scummvm.mcp index a0c11c76429202c01363bb32b77161f70523ff43..41a29050f4286f368c690257b70c28d1a344a8b4 100644 GIT binary patch delta 327 zcmex!o%7Fi&JE2>j9i;rn1Y#s)D718K;GmEj`u)L2B)bIkeVmW%m}0w$&|AIrKA)e z13CW`zim(Rewy)x2jNA_7 zupDFb2g-#UV|>PB%f-yVzz_t)K)|IBB!aeiIE@ZrR^fu7_~v(0J{7T$XD$v*D-D1_=53R1<>A#M5Z*L-2FtR`#`nR_op!d TgJ%2sbf)D%4@?iwW?BjW9@$x5 delta 327 zcmex!o%7Fi&JE2>jJ%s$n1Y#s)D718K;GmEj`u)L2B)bIkeVmW%m}0w$&|AIrKA)e z13CW`zim(Rewy)x2jNA_7 zupDFb2g-#UV|>PB%gfBbzz_t)K)|aHB!aeiIE@ZrR^fu7_~v(0J{7T$XD$v*D-D1_=53R1<>A#M5Z*L-2FtR`#`nR_op!d TgJ%2sbf)D%4@?iwW?BjWVyaok diff --git a/morphos/Makefile b/backends/morphos/Makefile similarity index 74% rename from morphos/Makefile rename to backends/morphos/Makefile index abd5a5c99416..00fd3992d151 100644 --- a/morphos/Makefile +++ b/backends/morphos/Makefile @@ -14,15 +14,14 @@ INCS = scumm.h scummsys.h stdafx.h GUIOBJS = widget.o dialog.o newgui.o ListWidget.o ScrollBarWidget.o -SCUMMOBJS = actor.o akos.o boxes.o bundle.o costume.o debug.o debugrl.o gfx.o \ - object.o saveload.o script.o scummvm.o sound.o string.o sys.o vars.o verbs.o \ - script_v1.o script_v2.o gui.o imuse.o insane.o resource.o resource_v3.o resource_v4.o - SIMONOBJS = midi.o simon.o simondebug.o simonitems.o simonres.o simonsys.o simonverb.o simonvga.o -OBJS = config-file.o engine.o gameDetector.o fmopl.o mixer.o mididrv.o util.o main.o \ +OBJS = actor.o akos.o boxes.o config-file.o costume.o gfx.o object.o resource.o \ + saveload.o script.o scummvm.o sound.o string.o sys.o verbs.o \ morphos.o morphos_scaler.o morphos_sound.o morphos_start.o morphos_timer.o \ - $(GUIOBJS) $(SCUMMOBJS) $(SIMONOBJS) + script_v1.o script_v2.o debug.o gui.o imuse.o fmopl.o mixer.o mididrv.o \ + debugrl.o vars.o insane.o gameDetector.o resource_v3.o resource_v4.o \ + util.o main.o bundle.o $(GUIOBJS) $(SIMONOBJS) DISTFILES=$(OBJS:.o=.cpp) Makefile scumm.h scummsys.h stdafx.h stdafx.cpp \ windows.cpp debugrl.h whatsnew.txt readme.txt copying.txt \ diff --git a/morphos/MorphOS.readme b/backends/morphos/MorphOS.readme similarity index 100% rename from morphos/MorphOS.readme rename to backends/morphos/MorphOS.readme diff --git a/morphos/morphos.cpp b/backends/morphos/morphos.cpp similarity index 100% rename from morphos/morphos.cpp rename to backends/morphos/morphos.cpp diff --git a/morphos/morphos.h b/backends/morphos/morphos.h similarity index 100% rename from morphos/morphos.h rename to backends/morphos/morphos.h diff --git a/morphos/morphos_scaler.cpp b/backends/morphos/morphos_scaler.cpp similarity index 100% rename from morphos/morphos_scaler.cpp rename to backends/morphos/morphos_scaler.cpp diff --git a/morphos/morphos_scaler.h b/backends/morphos/morphos_scaler.h similarity index 100% rename from morphos/morphos_scaler.h rename to backends/morphos/morphos_scaler.h diff --git a/morphos/morphos_sound.cpp b/backends/morphos/morphos_sound.cpp similarity index 100% rename from morphos/morphos_sound.cpp rename to backends/morphos/morphos_sound.cpp diff --git a/morphos/morphos_start.cpp b/backends/morphos/morphos_start.cpp similarity index 100% rename from morphos/morphos_start.cpp rename to backends/morphos/morphos_start.cpp diff --git a/morphos/morphos_timer.cpp b/backends/morphos/morphos_timer.cpp similarity index 100% rename from morphos/morphos_timer.cpp rename to backends/morphos/morphos_timer.cpp diff --git a/morphos/morphos_timer.h b/backends/morphos/morphos_timer.h similarity index 100% rename from morphos/morphos_timer.h rename to backends/morphos/morphos_timer.h diff --git a/fb2opengl.h b/backends/sdl/fb2opengl.h similarity index 100% rename from fb2opengl.h rename to backends/sdl/fb2opengl.h diff --git a/sdl.cpp b/backends/sdl/sdl.cpp similarity index 100% rename from sdl.cpp rename to backends/sdl/sdl.cpp diff --git a/sdl_gl.cpp b/backends/sdl/sdl_gl.cpp similarity index 100% rename from sdl_gl.cpp rename to backends/sdl/sdl_gl.cpp diff --git a/wince/MenuTitle.bmp b/backends/wince/MenuTitle.bmp old mode 100755 new mode 100644 similarity index 78% rename from wince/MenuTitle.bmp rename to backends/wince/MenuTitle.bmp index bcd8c68d14fdda0ff0a229d30d9d7985e5ecd050..34faf3fbb218f01cb7861e5836895310cc96aaac GIT binary patch delta 118 zcmcZ=c`I_mHbzFS$=ez2CAp&KGYG`4X5fz9#vl^6mw_wl1cN~MH3qKD{7mXBj9i<| z*)9XsZsz8=zzo!Khg%WI`N#dA4MYiDWD((Flr1&km#BJ{Ix&A@l8dLOuP4{$$Ko99 QKm~8)vY3EWxMDLm0A+9^y#N3J delta 118 zcmcZ=c`I_mHbzF?$=ez2C3&OgGYG`4X5fz9#vl^6mw_wl1cN~MH3r_z{7mXBjJ%u8 z*)9XsZsz8=zzo!Khg%WI`N#dA4MYiDWD((Ilr1&km#BJ{Ix&A@l8dLOuP5*3$Ko99 QKm~8)vY3EWxMDLm0BuJj;Q#;t diff --git a/wince/PocketSCUMM.rc b/backends/wince/PocketSCUMM.rc similarity index 100% rename from wince/PocketSCUMM.rc rename to backends/wince/PocketSCUMM.rc diff --git a/wince/PocketSCUMM.vcc b/backends/wince/PocketSCUMM.vcc old mode 100755 new mode 100644 similarity index 100% rename from wince/PocketSCUMM.vcc rename to backends/wince/PocketSCUMM.vcc diff --git a/wince/PocketSCUMM.vcp b/backends/wince/PocketSCUMM.vcp similarity index 100% rename from wince/PocketSCUMM.vcp rename to backends/wince/PocketSCUMM.vcp diff --git a/wince/PocketSCUMM.vcw b/backends/wince/PocketSCUMM.vcw old mode 100755 new mode 100644 similarity index 100% rename from wince/PocketSCUMM.vcw rename to backends/wince/PocketSCUMM.vcw diff --git a/wince/bitmaps.cpp b/backends/wince/bitmaps.cpp old mode 100755 new mode 100644 similarity index 100% rename from wince/bitmaps.cpp rename to backends/wince/bitmaps.cpp diff --git a/wince/findgame.cpp b/backends/wince/findgame.cpp similarity index 100% rename from wince/findgame.cpp rename to backends/wince/findgame.cpp diff --git a/wince/gapi_keys.cpp b/backends/wince/gapi_keys.cpp similarity index 100% rename from wince/gapi_keys.cpp rename to backends/wince/gapi_keys.cpp diff --git a/gapi_keys.h b/backends/wince/gapi_keys.h similarity index 100% rename from gapi_keys.h rename to backends/wince/gapi_keys.h diff --git a/wince/missing/assert.h b/backends/wince/missing/assert.h similarity index 100% rename from wince/missing/assert.h rename to backends/wince/missing/assert.h diff --git a/wince/missing/conio.h b/backends/wince/missing/conio.h similarity index 100% rename from wince/missing/conio.h rename to backends/wince/missing/conio.h diff --git a/wince/missing/dir.h b/backends/wince/missing/dir.h similarity index 100% rename from wince/missing/dir.h rename to backends/wince/missing/dir.h diff --git a/wince/missing/direct.h b/backends/wince/missing/direct.h similarity index 100% rename from wince/missing/direct.h rename to backends/wince/missing/direct.h diff --git a/wince/missing/dirent.h b/backends/wince/missing/dirent.h similarity index 100% rename from wince/missing/dirent.h rename to backends/wince/missing/dirent.h diff --git a/wince/missing/errno.h b/backends/wince/missing/errno.h similarity index 100% rename from wince/missing/errno.h rename to backends/wince/missing/errno.h diff --git a/wince/missing/fcntl.h b/backends/wince/missing/fcntl.h similarity index 100% rename from wince/missing/fcntl.h rename to backends/wince/missing/fcntl.h diff --git a/wince/missing/io.h b/backends/wince/missing/io.h similarity index 100% rename from wince/missing/io.h rename to backends/wince/missing/io.h diff --git a/wince/missing/missing.cpp b/backends/wince/missing/missing.cpp similarity index 100% rename from wince/missing/missing.cpp rename to backends/wince/missing/missing.cpp diff --git a/wince/missing/signal.h b/backends/wince/missing/signal.h similarity index 100% rename from wince/missing/signal.h rename to backends/wince/missing/signal.h diff --git a/wince/missing/sys/stat.h b/backends/wince/missing/sys/stat.h similarity index 100% rename from wince/missing/sys/stat.h rename to backends/wince/missing/sys/stat.h diff --git a/wince/missing/sys/time.h b/backends/wince/missing/sys/time.h similarity index 100% rename from wince/missing/sys/time.h rename to backends/wince/missing/sys/time.h diff --git a/wince/missing/sys/types.h b/backends/wince/missing/sys/types.h similarity index 100% rename from wince/missing/sys/types.h rename to backends/wince/missing/sys/types.h diff --git a/wince/missing/time.h b/backends/wince/missing/time.h similarity index 100% rename from wince/missing/time.h rename to backends/wince/missing/time.h diff --git a/wince/missing/unistd.h b/backends/wince/missing/unistd.h similarity index 100% rename from wince/missing/unistd.h rename to backends/wince/missing/unistd.h diff --git a/wince/newres.h b/backends/wince/newres.h similarity index 100% rename from wince/newres.h rename to backends/wince/newres.h diff --git a/wince/pocketpc.cpp b/backends/wince/pocketpc.cpp similarity index 100% rename from wince/pocketpc.cpp rename to backends/wince/pocketpc.cpp diff --git a/wince/pocketscumm.ico b/backends/wince/pocketscumm.ico similarity index 100% rename from wince/pocketscumm.ico rename to backends/wince/pocketscumm.ico diff --git a/wince/resource.h b/backends/wince/resource.h similarity index 100% rename from wince/resource.h rename to backends/wince/resource.h diff --git a/wince/screen.cpp b/backends/wince/screen.cpp similarity index 100% rename from wince/screen.cpp rename to backends/wince/screen.cpp diff --git a/wince/screen.h b/backends/wince/screen.h similarity index 100% rename from wince/screen.h rename to backends/wince/screen.h diff --git a/x11.cpp b/backends/x11/x11.cpp similarity index 100% rename from x11.cpp rename to backends/x11/x11.cpp diff --git a/config-file.cpp b/common/config-file.cpp similarity index 100% rename from config-file.cpp rename to common/config-file.cpp diff --git a/config-file.h b/common/config-file.h similarity index 100% rename from config-file.h rename to common/config-file.h diff --git a/gameDetector.cpp b/common/gameDetector.cpp similarity index 99% rename from gameDetector.cpp rename to common/gameDetector.cpp index 9152c4b9c560..421dfd782ea1 100644 --- a/gameDetector.cpp +++ b/common/gameDetector.cpp @@ -22,11 +22,11 @@ #include "stdafx.h" -#include "scumm.h" +#include "scumm/scumm.h" #include "sound/mididrv.h" -#include "sound/imuse.h" -#include "gameDetector.h" -#include "config-file.h" +#include "scumm/imuse.h" +#include "common/gameDetector.h" +#include "common/config-file.h" #define CHECK_OPTION() if ((current_option != NULL) || (*s != '\0')) goto ShowHelpAndExit diff --git a/gameDetector.h b/common/gameDetector.h similarity index 100% rename from gameDetector.h rename to common/gameDetector.h diff --git a/main.cpp b/common/main.cpp similarity index 100% rename from main.cpp rename to common/main.cpp diff --git a/scummsys.h b/common/scummsys.h similarity index 100% rename from scummsys.h rename to common/scummsys.h diff --git a/stdafx.cpp b/common/stdafx.cpp similarity index 100% rename from stdafx.cpp rename to common/stdafx.cpp diff --git a/stdafx.h b/common/stdafx.h similarity index 98% rename from stdafx.h rename to common/stdafx.h index a3daba0b545e..de4f0156ce97 100644 --- a/stdafx.h +++ b/common/stdafx.h @@ -2,6 +2,9 @@ * $Id$ * * $Log$ + * Revision 1.1 2002/08/21 16:07:23 fingolfin + * Initial revision + * * Revision 1.18 2002/07/08 13:33:10 fingolfin * two more small QNX fixes * diff --git a/system.h b/common/system.h similarity index 100% rename from system.h rename to common/system.h diff --git a/timer.cpp b/common/timer.cpp similarity index 100% rename from timer.cpp rename to common/timer.cpp diff --git a/timer.h b/common/timer.h similarity index 100% rename from timer.h rename to common/timer.h diff --git a/util.cpp b/common/util.cpp similarity index 100% rename from util.cpp rename to common/util.cpp diff --git a/util.h b/common/util.h similarity index 100% rename from util.h rename to common/util.h diff --git a/debian/.cvsignore b/debian/.cvsignore deleted file mode 100644 index 2ac039bcbd49..000000000000 --- a/debian/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -changelog -files -scummvm -scummvm.postinst.debhelper -scummvm.prerm.debhelper -scummvm.substvars diff --git a/debian/README.Debian b/debian/README.Debian deleted file mode 100644 index 5394ccae2648..000000000000 --- a/debian/README.Debian +++ /dev/null @@ -1,9 +0,0 @@ -scummvm for Debian ------------------- - - There is no documentation for the configuration file. For now you can use: - scummvm -w -p[path] [options] game - it will write a config file in ~/.scummvmrc and from then on you can just - run 'scummvm game' and it will remember your options - - -- Bastien Nocera , Friday 10 May 2002 diff --git a/debian/changelog.cvs b/debian/changelog.cvs deleted file mode 100644 index 7cdd91fadaab..000000000000 --- a/debian/changelog.cvs +++ /dev/null @@ -1,8 +0,0 @@ -scummvm (@VERSION@-1) unstable; urgency=low - - * This is a CVS snapshot, don't file bugs on the Debian BTS if you use - this package. Instead use the Sourceforge bug tracker: - http://sourceforge.net/tracker/?group_id=37116 - - -- Bastien Nocera Fri, 5 Apr 2002 16:37:09 +0100 - diff --git a/debian/changelog.debian b/debian/changelog.debian deleted file mode 100644 index e46253fe48bd..000000000000 --- a/debian/changelog.debian +++ /dev/null @@ -1,22 +0,0 @@ -scummvm (0.2.0) unstable; urgency=low - - * Release of ScummVM 0.2.0 - - -- James Brown Tue, 14 May 2002 18:16:02 +0800 - -scummvm (0.1.0b-2) unstable; urgency=low - - * Moved the scummvm main bin under /usr/lib, the wrapper script under - /usr/games - * Fixed bug in the script that made it not work if the path was relative - - -- Bastien Nocera Wed, 10 Apr 2002 19:27:05 +0100 - -scummvm (0.1.0b-1) unstable; urgency=low - - * Initial Release. - * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba ! - Ole ! - - -- Bastien Nocera Fri, 5 Apr 2002 16:37:09 +0100 - diff --git a/debian/changelog.debian_official b/debian/changelog.debian_official deleted file mode 100644 index 55fc446a3872..000000000000 --- a/debian/changelog.debian_official +++ /dev/null @@ -1,23 +0,0 @@ -scummvm (0.2.0) unstable; urgency=low - - * New upstream version (Closes: #143281) - * Killed the wrapper script, see upstream changelog - - -- Bastien Nocera Wed, 15 May 2002 03:27:11 +0100 - -scummvm (0.1.0b-2) unstable; urgency=low - - * Moved the scummvm main bin under /usr/lib, the wrapper script under - /usr/games - * Fixed bug in the script that made it not work if the path was relative - - -- Bastien Nocera Wed, 10 Apr 2002 19:27:05 +0100 - -scummvm (0.1.0b-1) unstable; urgency=low - - * Initial Release. - * Packaged made under the influence of beer at GUAD3C in Sevilla ! Arriba ! - Ole ! - - -- Bastien Nocera Fri, 5 Apr 2002 16:37:09 +0100 - diff --git a/debian/control b/debian/control deleted file mode 100644 index f2ffa3a00327..000000000000 --- a/debian/control +++ /dev/null @@ -1,15 +0,0 @@ -Source: scummvm -Section: contrib/games -Priority: optional -Maintainer: Bastien Nocera -Build-Depends: debhelper (>> 3.0.0), libsdl1.2-dev, libreadline4-dev, libncurses5-dev -Standards-Version: 3.5.2 - -Package: scummvm -Architecture: any -Depends: ${shlibs:Depends} -Description: Engine to run some LucasArts adventure games - The "Script Creation Utility for Maniac Mansion Virtual Machine" (scummvm for - short) is an engine used to run a lot of LucasArts adventure games. - . - You will also need the data files from the game to be able to play it. diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index ef0334474298..000000000000 --- a/debian/copyright +++ /dev/null @@ -1,16 +0,0 @@ -This package was debianized by Bastien Nocera on -Fri, 5 Apr 2002 16:37:09 +0100. - -It was downloaded from http://prdownloads.sourceforge.net/scummvm/ - -Upstream Author(s): ScummVM team - -Copyright: - -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, or (at your option) any -later version. - -On Debian GNU/Linux systems, the complete text of the GNU General -Public License can be found in `/usr/share/common-licenses/GPL'. diff --git a/debian/prepare b/debian/prepare deleted file mode 100755 index 0698be11846a..000000000000 --- a/debian/prepare +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -if [ ! -e debian/rules ] ; then - echo "Run from the top-level source directory as debian/prepare" - exit 1 -fi - -if [ -d CVS/ ] && [ $1 != "--nocvs" ]; then - TODATE=`date +%Y%m%d` - NEXT_VERSION=`grep SCUMMVM_VERSION scumm.h | sed 's,\#define\ SCUMMVM_VERSION\ \",,gi' | sed 's,\ devel\",,gi'` - cat debian/changelog.cvs | sed s/@VERSION@/$NEXT_VERSION.cvs$TODATE/g \ - > debian/changelog.tmp && mv debian/changelog.tmp debian/changelog - exit 0 -else - if [ x$USER = xhadess ]; then - cp debian/changelog.debian_official debian/changelog - else - cp debian/changelog.debian debian/changelog - fi -fi diff --git a/debian/rules b/debian/rules deleted file mode 100755 index b05473cabc7e..000000000000 --- a/debian/rules +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/make -f - -export DH_COMPAT=3 - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -build: - dh_testdir - $(MAKE) - -clean: - dh_testdir - dh_testroot - -$(MAKE) clean - dh_clean - -install: build - dh_testdir - dh_testroot - dh_clean -k - dh_installdirs - install -m0777 scummvm $(CURDIR)/debian/scummvm/usr/games/scummvm - install -m0644 scummvm.6 \ - $(CURDIR)/debian/scummvm/usr/share/man/man6 - -binary-arch: build install - dh_testdir - dh_testroot - dh_installdocs - dh_installchangelogs - dh_installmanpages scummvm.6 - dh_link - dh_strip - dh_compress - dh_fixperms - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-arch -.PHONY: build clean binary-arch binary install diff --git a/debian/scummvm.dirs b/debian/scummvm.dirs deleted file mode 100644 index 818b207667db..000000000000 --- a/debian/scummvm.dirs +++ /dev/null @@ -1,3 +0,0 @@ -usr/games -usr/lib/scummvm -usr/share/man/man6 diff --git a/debian/scummvm.docs b/debian/scummvm.docs deleted file mode 100644 index 6e88c596f455..000000000000 --- a/debian/scummvm.docs +++ /dev/null @@ -1,2 +0,0 @@ -readme.txt -whatsnew.txt diff --git a/gui/dialog.cpp b/gui/dialog.cpp index ecc444b71d91..71b55f8c802f 100644 --- a/gui/dialog.cpp +++ b/gui/dialog.cpp @@ -28,7 +28,7 @@ #include "ListWidget.h" #include "config-file.h" #include "sound/mididrv.h" -#include "sound/imuse.h" +#include "scumm/imuse.h" /* * TODO list @@ -407,11 +407,29 @@ AboutDialog::AboutDialog(NewGui *gui) } PauseDialog::PauseDialog(NewGui *gui) - : Dialog (gui, 50, 80, 220, 16) + : Dialog (gui, 60, 20, 100, 100) { addResText(4, 4, 220, 16, 10); } +void PauseDialog::draw() +{ + if (_screenBuf) { + _gui->blitFrom(_screenBuf, _x, _y, _w, _h); + } else { + _gui->fillRect(_x, _y, _w, _h, _gui->_bgcolor); + _gui->box(_x, _y, _w, _h); + } + _gui->addDirtyRect(_x, _y, _w, _h); + + _gui->frameRect(10 + _x, 15 + _y, 100, 100, _gui->_color); + for (int y = 0; y < 16; ++y) + for (int x = 0; x < 16; ++x) + _gui->fillRect(10 + _x + x*5, 15 + _y + y*5, 5, 5, y*16 + x); + + +} + SoundDialog::SoundDialog(NewGui *gui) : Dialog (gui, 30, 20, 260, 110) { diff --git a/gui/dialog.h b/gui/dialog.h index 0e9b46222ab8..55fd464a420b 100644 --- a/gui/dialog.h +++ b/gui/dialog.h @@ -116,6 +116,8 @@ class PauseDialog : public Dialog { public: PauseDialog(NewGui *gui); + virtual void draw(); + virtual void handleMouseDown(int x, int y, int button, int clickCount) { close(); } virtual void handleKeyDown(char key, int modifiers) diff --git a/gui.cpp b/gui/gui.cpp similarity index 99% rename from gui.cpp rename to gui/gui.cpp index d80c6948c8a2..270641ae17ac 100644 --- a/gui.cpp +++ b/gui/gui.cpp @@ -22,7 +22,7 @@ #include "stdafx.h" #include "scumm.h" #include "sound/mididrv.h" -#include "sound/imuse.h" +#include "scumm/imuse.h" #include "gui.h" #include "guimaps.h" #include "config-file.h" diff --git a/gui.h b/gui/gui.h similarity index 100% rename from gui.h rename to gui/gui.h diff --git a/guimaps.h b/gui/guimaps.h similarity index 100% rename from guimaps.h rename to gui/guimaps.h diff --git a/newgui.cpp b/gui/newgui.cpp similarity index 100% rename from newgui.cpp rename to gui/newgui.cpp diff --git a/newgui.h b/gui/newgui.h similarity index 100% rename from newgui.h rename to gui/newgui.h diff --git a/mac/ScummVM_Mac_Prefix.h b/mac/ScummVM_Mac_Prefix.h deleted file mode 100644 index ef3f2e6a4bb4..000000000000 --- a/mac/ScummVM_Mac_Prefix.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifdef __cplusplus - #include -#else - #include -#endif - -#define MACOS_CARBON diff --git a/actor.cpp b/scumm/actor.cpp similarity index 100% rename from actor.cpp rename to scumm/actor.cpp diff --git a/actor.h b/scumm/actor.h similarity index 100% rename from actor.h rename to scumm/actor.h diff --git a/akos.cpp b/scumm/akos.cpp similarity index 100% rename from akos.cpp rename to scumm/akos.cpp diff --git a/akos.h b/scumm/akos.h similarity index 100% rename from akos.h rename to scumm/akos.h diff --git a/boxes.cpp b/scumm/boxes.cpp similarity index 100% rename from boxes.cpp rename to scumm/boxes.cpp diff --git a/boxes.h b/scumm/boxes.h similarity index 100% rename from boxes.h rename to scumm/boxes.h diff --git a/bundle.cpp b/scumm/bundle.cpp similarity index 100% rename from bundle.cpp rename to scumm/bundle.cpp diff --git a/bundle.h b/scumm/bundle.h similarity index 100% rename from bundle.h rename to scumm/bundle.h diff --git a/costume.cpp b/scumm/costume.cpp similarity index 100% rename from costume.cpp rename to scumm/costume.cpp diff --git a/costume.h b/scumm/costume.h similarity index 100% rename from costume.h rename to scumm/costume.h diff --git a/debug.cpp b/scumm/debug.cpp similarity index 100% rename from debug.cpp rename to scumm/debug.cpp diff --git a/debug.h b/scumm/debug.h similarity index 100% rename from debug.h rename to scumm/debug.h diff --git a/debugrl.cpp b/scumm/debugrl.cpp similarity index 100% rename from debugrl.cpp rename to scumm/debugrl.cpp diff --git a/debugrl.h b/scumm/debugrl.h similarity index 100% rename from debugrl.h rename to scumm/debugrl.h diff --git a/engine.cpp b/scumm/engine.cpp similarity index 100% rename from engine.cpp rename to scumm/engine.cpp diff --git a/engine.h b/scumm/engine.h similarity index 100% rename from engine.h rename to scumm/engine.h diff --git a/gfx.cpp b/scumm/gfx.cpp similarity index 99% rename from gfx.cpp rename to scumm/gfx.cpp index e16b7662b5c6..5b4e43f1cf42 100644 --- a/gfx.cpp +++ b/scumm/gfx.cpp @@ -22,8 +22,8 @@ #include "stdafx.h" #include "scumm.h" #include "actor.h" -#include "gui.h" -#include "newgui.h" +#include "gui/gui.h" +#include "gui/newgui.h" #include "resource.h" void Scumm::getGraphicsPerformance() diff --git a/gfx.h b/scumm/gfx.h similarity index 100% rename from gfx.h rename to scumm/gfx.h diff --git a/sound/imuse.cpp b/scumm/imuse.cpp similarity index 99% rename from sound/imuse.cpp rename to scumm/imuse.cpp index a0df85aa70dc..93f2f9959700 100644 --- a/sound/imuse.cpp +++ b/scumm/imuse.cpp @@ -316,7 +316,7 @@ class IMuseDriver { class IMuseInternal { friend struct Player; private: - IMuseDriver * _driver; + IMuseDriver * _driver; byte **_base_sounds; @@ -325,8 +325,7 @@ class IMuseInternal { private: - - bool _paused; + bool _paused; bool _active_volume_faders; bool _initialized; byte _volume_fader_counter; @@ -1930,9 +1929,6 @@ byte *Player::parse_midi(byte *s) case 93: /* chorus */ part->set_chorus(value); break; - case 123: /* unhold pedal */ - part->set_pedal(false); - break; default: warning("parse_midi: invalid control %d", control); } diff --git a/sound/imuse.h b/scumm/imuse.h similarity index 100% rename from sound/imuse.h rename to scumm/imuse.h diff --git a/insane.cpp b/scumm/insane.cpp similarity index 100% rename from insane.cpp rename to scumm/insane.cpp diff --git a/object.cpp b/scumm/object.cpp similarity index 100% rename from object.cpp rename to scumm/object.cpp diff --git a/object.h b/scumm/object.h similarity index 100% rename from object.h rename to scumm/object.h diff --git a/resource.cpp b/scumm/resource.cpp similarity index 100% rename from resource.cpp rename to scumm/resource.cpp diff --git a/resource.h b/scumm/resource.h similarity index 100% rename from resource.h rename to scumm/resource.h diff --git a/v3/resource_v3.cpp b/scumm/resource_v3.cpp similarity index 100% rename from v3/resource_v3.cpp rename to scumm/resource_v3.cpp diff --git a/v4/resource_v4.cpp b/scumm/resource_v4.cpp similarity index 100% rename from v4/resource_v4.cpp rename to scumm/resource_v4.cpp diff --git a/saveload.cpp b/scumm/saveload.cpp similarity index 99% rename from saveload.cpp rename to scumm/saveload.cpp index 16200bee9a9d..0f3011721b02 100644 --- a/saveload.cpp +++ b/scumm/saveload.cpp @@ -23,7 +23,7 @@ #include "stdafx.h" #include "scumm.h" #include "sound/mididrv.h" -#include "sound/imuse.h" +#include "scumm/imuse.h" #include "actor.h" #include "config-file.h" #include "resource.h" diff --git a/saveload.h b/scumm/saveload.h similarity index 100% rename from saveload.h rename to scumm/saveload.h diff --git a/scaler.cpp b/scumm/scaler.cpp similarity index 100% rename from scaler.cpp rename to scumm/scaler.cpp diff --git a/scaler.h b/scumm/scaler.h similarity index 100% rename from scaler.h rename to scumm/scaler.h diff --git a/script.cpp b/scumm/script.cpp similarity index 100% rename from script.cpp rename to scumm/script.cpp diff --git a/script_v1.cpp b/scumm/script_v1.cpp similarity index 100% rename from script_v1.cpp rename to scumm/script_v1.cpp diff --git a/script_v2.cpp b/scumm/script_v2.cpp similarity index 99% rename from script_v2.cpp rename to scumm/script_v2.cpp index e402495943c0..5f85f746c20a 100644 --- a/script_v2.cpp +++ b/scumm/script_v2.cpp @@ -27,7 +27,7 @@ #include "smush.h" #include "sound/mididrv.h" -#include "sound/imuse.h" +#include "scumm/imuse.h" void Scumm::setupOpcodes2() { diff --git a/scumm.h b/scumm/scumm.h similarity index 100% rename from scumm.h rename to scumm/scumm.h diff --git a/scummvm.cpp b/scumm/scummvm.cpp similarity index 99% rename from scummvm.cpp rename to scumm/scummvm.cpp index 2471d268aad6..845a8fb4d3d3 100644 --- a/scummvm.cpp +++ b/scumm/scummvm.cpp @@ -24,12 +24,12 @@ #include "scumm.h" #include "sound/mixer.h" #include "sound/mididrv.h" -#include "sound/imuse.h" +#include "scumm/imuse.h" #include "actor.h" #include "debug.h" #include "gameDetector.h" -#include "gui.h" -#include "newgui.h" +#include "gui/gui.h" +#include "gui/newgui.h" #include "object.h" #include "resource.h" #include "string.h" diff --git a/smush.h b/scumm/smush.h similarity index 100% rename from smush.h rename to scumm/smush.h diff --git a/sound.h b/scumm/sound.h similarity index 100% rename from sound.h rename to scumm/sound.h diff --git a/string.cpp b/scumm/string.cpp similarity index 100% rename from string.cpp rename to scumm/string.cpp diff --git a/sys.cpp b/scumm/sys.cpp similarity index 100% rename from sys.cpp rename to scumm/sys.cpp diff --git a/vars.cpp b/scumm/vars.cpp similarity index 100% rename from vars.cpp rename to scumm/vars.cpp diff --git a/verbs.cpp b/scumm/verbs.cpp similarity index 100% rename from verbs.cpp rename to scumm/verbs.cpp diff --git a/simon/simondebug.cpp b/simon/debug.cpp similarity index 99% rename from simon/simondebug.cpp rename to simon/debug.cpp index ed7febe739bd..6b1902c6b7ca 100644 --- a/simon/simondebug.cpp +++ b/simon/debug.cpp @@ -21,8 +21,8 @@ // Simon debug functions #include "stdafx.h" -#include "simon.h" -#include "simonintern.h" +#include "simon/simon.h" +#include "simon/intern.h" #ifdef SIMONDEBUG #define SIMON2 diff --git a/simon/simonintern.h b/simon/intern.h similarity index 100% rename from simon/simonintern.h rename to simon/intern.h diff --git a/simon/simonitems.cpp b/simon/items.cpp similarity index 99% rename from simon/simonitems.cpp rename to simon/items.cpp index 39e95d3a70c5..4baeae0ec866 100644 --- a/simon/simonitems.cpp +++ b/simon/items.cpp @@ -21,8 +21,8 @@ // Item script opcodes for Simon1/Simon2 #include "stdafx.h" -#include "simon.h" -#include "simonintern.h" +#include "simon/simon.h" +#include "simon/intern.h" #ifdef _WIN32_WCE diff --git a/simon/midi.cpp b/simon/midi.cpp index b9cf3ac867de..a55ab0f3ec04 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -22,10 +22,10 @@ #include "stdafx.h" #include "scummsys.h" -#include "system.h" -#include "../sound/mididrv.h" -#include "../sound/mixer.h" -#include "simon.h" +#include "common/system.h" +#include "sound/mididrv.h" +#include "sound/mixer.h" +#include "simon/simon.h" void MidiPlayer::read_from_file(void *dst, uint size) { diff --git a/simon/simonres.cpp b/simon/res.cpp similarity index 99% rename from simon/simonres.cpp rename to simon/res.cpp index 7b36d1f770c8..8a059486bd01 100644 --- a/simon/simonres.cpp +++ b/simon/res.cpp @@ -21,8 +21,8 @@ // Resource file routines for Simon1/Simon2 #include "stdafx.h" -#include "simon.h" -#include "simonintern.h" +#include "simon/simon.h" +#include "simon/intern.h" // Script opcodes to load into memory static const char *const opcode_arg_table_simon1win[256] = { diff --git a/simon/simon.cpp b/simon/simon.cpp index a60234d7a290..d3b8a8391f52 100644 --- a/simon/simon.cpp +++ b/simon/simon.cpp @@ -20,9 +20,9 @@ */ #include "stdafx.h" -#include "simon.h" -#include "simonintern.h" -#include "gameDetector.h" +#include "simon/simon.h" +#include "simon/intern.h" +#include "common/gameDetector.h" #include #include diff --git a/simon/simonsys.cpp b/simon/sys.cpp similarity index 98% rename from simon/simonsys.cpp rename to simon/sys.cpp index 0bef2567641c..5086ba954731 100644 --- a/simon/simonsys.cpp +++ b/simon/sys.cpp @@ -20,7 +20,7 @@ */ #include "stdafx.h" -#include "simon.h" +#include "simon/simon.h" uint fileReadByte(FILE *in) { diff --git a/simon/simonverb.cpp b/simon/verb.cpp similarity index 99% rename from simon/simonverb.cpp rename to simon/verb.cpp index 662237cd68c6..a81627bff266 100644 --- a/simon/simonverb.cpp +++ b/simon/verb.cpp @@ -21,8 +21,8 @@ // Verb and hitarea handling #include "stdafx.h" -#include "simon.h" -#include "simonintern.h" +#include "simon/simon.h" +#include "simon/intern.h" void SimonState::defocusHitarea() { diff --git a/simon/simonvga.cpp b/simon/vga.cpp similarity index 99% rename from simon/simonvga.cpp rename to simon/vga.cpp index 1c56d5295d8c..39d56d0c85c9 100644 --- a/simon/simonvga.cpp +++ b/simon/vga.cpp @@ -21,8 +21,8 @@ // Video script opcodes for Simon1/Simon2 #include "stdafx.h" -#include "simon.h" -#include "simonintern.h" +#include "simon/simon.h" +#include "simon/intern.h" typedef void (SimonState::*VgaOpcodeProc) (); static const uint16 vc_get_out_of_code = 0; diff --git a/sound.cpp b/sound/sound.cpp similarity index 99% rename from sound.cpp rename to sound/sound.cpp index 2f947a7148da..69bdfc8143fc 100644 --- a/sound.cpp +++ b/sound/sound.cpp @@ -21,10 +21,10 @@ */ #include "stdafx.h" -#include "scumm.h" +#include "scumm/scumm.h" #include "sound/mididrv.h" -#include "sound/imuse.h" -#include "actor.h" +#include "scumm/imuse.h" +#include "scumm/actor.h" #include "config-file.h" #include "util.h" diff --git a/sound/sound.h b/sound/sound.h new file mode 100644 index 000000000000..4d2a554d6cfa --- /dev/null +++ b/sound/sound.h @@ -0,0 +1,136 @@ +/* ScummVM - Scumm Interpreter + * Copyright (C) 2002 The ScummVM project + * + * 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. + * + * $Header$ + */ + +#ifndef SOUND_H +#define SOUND_H + +#include "scummsys.h" +#include "sound/mixer.h" + +class Scumm; + +class Sound { + +private: + +enum { + SOUND_HEADER_SIZE = 26, + SOUND_HEADER_BIG_SIZE = 26 + 8, + +}; + + int16 _soundQuePos, _soundQue[0x100]; + byte _soundQue2Pos, _soundQue2[10]; + bool _soundsPaused2; + bool _soundVolumePreset; + + int32 _numberBundleMusic; + int32 _currentSampleBundleMusic; + int32 _numberSamplesBundleMusic; + int32 _offsetSampleBundleMusic; + int32 _offsetBufBundleMusic; + byte * _musicBundleBufFinal; + byte * _musicBundleBufOutput; + bool _pauseBundleMusic; + + + int _talkChannel; /* Mixer channel actor is talking on */ + void *_sfxFile; + uint32 _talk_sound_a, _talk_sound_b; + byte _talk_sound_mode; + bool _mouthSyncMode; + bool _endOfMouthSync; + uint16 _mouthSyncTimes[52]; + uint _curSoundPos; + + MP3OffsetTable *offset_table; // SO3 MP3 compressed audio + int num_sound_effects; // SO3 MP3 compressed audio +#ifdef COMPRESSED_SOUND_FILE + + #define CACHE_TRACKS 10 + + /* used for mp3 CD music */ + + int _cached_tracks[CACHE_TRACKS]; + struct mad_header _mad_header[CACHE_TRACKS]; + long _mp3_size[CACHE_TRACKS]; + FILE *_mp3_tracks[CACHE_TRACKS]; + int _mp3_index; + bool _mp3_cd_playing; +#endif + + Scumm * _scumm; + +public: + +#ifdef COMPRESSED_SOUND_FILE + + int _current_cache; + +#endif + + bool _soundsPaused; + int16 _sound_volume_master, _sound_volume_music, _sound_volume_sfx; + byte _sfxMode; + + Sound(Scumm *parent); + ~Sound(); + void addSoundToQueue(int sound); + void addSoundToQueue2(int sound); + void processSoundQues(); + void playSound(int sound); + void processSfxQueues(); + int startTalkSound(uint32 offset, uint32 b, int mode); + void stopTalkSound(); + bool isMouthSyncOff(uint pos); + int isSoundRunning(int sound); + bool isSoundInQueue(int sound); + void stopSound(int a); + void stopAllSounds(); + void clearSoundQue(); + void soundKludge(int16 * list); + void talkSound(uint32 a, uint32 b, int mode); + void setupSound(); + void pauseSounds(bool pause); + int startSfxSound(void *file, int file_size); + void * openSfxFile(); + void stopSfxSound(); + bool isSfxFinished(); + uint32 decode12BitsSample(byte * src, byte ** dst, uint32 size); + void playBundleMusic(int32 song); + void pauseBundleMusic(bool state); + void bundleMusicHandler(Scumm * scumm); + void stopBundleMusic(); + void playBundleSound(char *sound); + int playSfxSound(void *sound, uint32 size, uint rate, bool isUnsigned); + int playSfxSound_MP3(void *sound, uint32 size); + +#ifdef COMPRESSED_SOUND_FILE + int getCachedTrack(int track); + int playMP3CDTrack(int track, int num_loops, int start, int delay); + int stopMP3CD(); + int pollMP3CD(); + int updateMP3CD(); +#endif + +}; + +#endif +