mirror of
https://github.com/libretro/scummvm.git
synced 2025-01-10 11:51:52 +00:00
3303a88139
This patch includes enhancements to the ScummVM integration with SCI engine, with particular focus on SCI32 support. 1. Fixes audio volumes syncing erroneously to ScummVM in games that modify the audio volume without user action (e.g. SCI1.1 talkies that reduce music volume during speech playback). Now, volumes will only be synchronised when the user interacts with the game's audio settings. This mechanism works by looking for a known volume control object in the stack, and only syncing when the control object is present. (Ports and planes were researched and found unreliable.) 2. Fixes audio syncing in SCI32 games that do not set game volumes through kDoSoundMasterVolume/kDoAudioVolume, like GK1, GK2, Phant1, and Torin. 3. Fixes speech/subtitles syncing in SCI32 games that do not use global 90, like LSL6hires. 4. Fixes in-game volume controls in SCI32 games reflecting outdated audio volumes when a change is made during the game from the ScummVM launcher. 5. Fixes SCI32 games that would restore volumes from save games or reset volumes on startup, which caused game volumes to be out-of-sync with ScummVM when started. 6. ScummVM integration code for audio sync has been abstracted into a new GuestAdditions class. This keeps the ScummVM- specific code all in one place, with only small hooks into the engine code. ScummVM integrated save/load code should probably also go here in the future. Fixes Trac#9700.
110 lines
2.1 KiB
Makefile
110 lines
2.1 KiB
Makefile
MODULE := engines/sci
|
|
|
|
MODULE_OBJS := \
|
|
console.o \
|
|
decompressor.o \
|
|
detection.o \
|
|
event.o \
|
|
resource.o \
|
|
resource_audio.o \
|
|
sci.o \
|
|
util.o \
|
|
engine/features.o \
|
|
engine/file.o \
|
|
engine/gc.o \
|
|
engine/guest_additions.o \
|
|
engine/kernel.o \
|
|
engine/kevent.o \
|
|
engine/kfile.o \
|
|
engine/kgraphics.o \
|
|
engine/klists.o \
|
|
engine/kmath.o \
|
|
engine/kmenu.o \
|
|
engine/kmisc.o \
|
|
engine/kmovement.o \
|
|
engine/kparse.o \
|
|
engine/kpathing.o \
|
|
engine/kscripts.o \
|
|
engine/ksound.o \
|
|
engine/kstring.o \
|
|
engine/kvideo.o \
|
|
engine/message.o \
|
|
engine/object.o \
|
|
engine/savegame.o \
|
|
engine/script.o \
|
|
engine/scriptdebug.o \
|
|
engine/script_patches.o \
|
|
engine/selector.o \
|
|
engine/seg_manager.o \
|
|
engine/segment.o \
|
|
engine/state.o \
|
|
engine/static_selectors.o \
|
|
engine/vm.o \
|
|
engine/vm_types.o \
|
|
engine/workarounds.o \
|
|
graphics/animate.o \
|
|
graphics/cache.o \
|
|
graphics/compare.o \
|
|
graphics/controls16.o \
|
|
graphics/coordadjuster.o \
|
|
graphics/cursor.o \
|
|
graphics/font.o \
|
|
graphics/fontsjis.o \
|
|
graphics/maciconbar.o \
|
|
graphics/menu.o \
|
|
graphics/paint16.o \
|
|
graphics/palette.o \
|
|
graphics/picture.o \
|
|
graphics/portrait.o \
|
|
graphics/ports.o \
|
|
graphics/remap.o \
|
|
graphics/screen.o \
|
|
graphics/text16.o \
|
|
graphics/transitions.o \
|
|
graphics/view.o \
|
|
parser/grammar.o \
|
|
parser/said.o \
|
|
parser/vocabulary.o \
|
|
sound/audio.o \
|
|
sound/midiparser_sci.o \
|
|
sound/music.o \
|
|
sound/soundcmd.o \
|
|
sound/sync.o \
|
|
sound/drivers/adlib.o \
|
|
sound/drivers/amigamac.o \
|
|
sound/drivers/cms.o \
|
|
sound/drivers/fb01.o \
|
|
sound/drivers/fmtowns.o \
|
|
sound/drivers/midi.o \
|
|
sound/drivers/pcjr.o \
|
|
video/seq_decoder.o
|
|
|
|
|
|
ifdef ENABLE_SCI32
|
|
MODULE_OBJS += \
|
|
engine/kgraphics32.o \
|
|
graphics/celobj32.o \
|
|
graphics/controls32.o \
|
|
graphics/frameout.o \
|
|
graphics/paint32.o \
|
|
graphics/plane32.o \
|
|
graphics/palette32.o \
|
|
graphics/remap32.o \
|
|
graphics/screen_item32.o \
|
|
graphics/text32.o \
|
|
graphics/transitions32.o \
|
|
graphics/video32.o \
|
|
graphics/cursor32.o \
|
|
sound/audio32.o \
|
|
sound/decoders/sol.o \
|
|
video/robot_decoder.o
|
|
endif
|
|
|
|
# This module can be built as a plugin
|
|
ifeq ($(ENABLE_SCI), DYNAMIC_PLUGIN)
|
|
PLUGIN := 1
|
|
endif
|
|
|
|
# Include common rules
|
|
include $(srcdir)/rules.mk
|