From ceaa1327d23c658288116a6961f9e5df929f272b Mon Sep 17 00:00:00 2001 From: Wengier Date: Thu, 27 Aug 2020 18:52:23 -0400 Subject: [PATCH] update ref and timestamp --- dosbox-x.reference.conf | 48 +++++++++++++++++++++++----------- include/build_timestamp.h | 4 +-- update-dosbox-x-reference-conf | 6 ++--- 3 files changed, 38 insertions(+), 20 deletions(-) diff --git a/dosbox-x.reference.conf b/dosbox-x.reference.conf index f95030e7c..e5ace01a6 100644 --- a/dosbox-x.reference.conf +++ b/dosbox-x.reference.conf @@ -149,7 +149,9 @@ fileio = false [dosbox] # language: Select another language file. -# title: Additional text to place in the title bar of the window +# title: Additional text to place in the title bar of the window. +# fastbioslogo: If set, DOSBox-X will enable fast BIOS logo mode (skip 1-second pause). +# startbanner: If set (default), DOSBox-X will display the welcome banner when it starts. # enable 8-bit dac: If set, allow VESA BIOS calls in IBM PC mode to set DAC width. Has no effect in PC-98 mode. # dpi aware: Set this option (auto by default) to indicate to your OS that DOSBox-X is DPI aware. # If it is not set, Windows Vista/7/8/10 and higher may upscale the DOSBox-X window @@ -164,7 +166,7 @@ fileio = false # machine: The type of machine DOSBox-X tries to emulate. # Possible values: hercules, cga, cga_mono, cga_rgb, cga_composite, cga_composite2, tandy, pcjr, ega, vgaonly, svga_s3, svga_et3000, svga_et4000, svga_paradise, vesa_nolfb, vesa_oldvbe, amstrad, pc98, pc9801, pc9821, fm_towns, mcga, mda. # svga lfb base: If nonzero, define the physical memory address of the linear framebuffer. -# pci vga: If set, SVGA is emulated as if a PCI device (when enable pci bus=true) +# pci vga: If set, SVGA is emulated as if a PCI device (when enable pci bus=true). # vmemdelay: VGA Memory I/O delay in nanoseconds. Set to -1 to use default, 0 to disable. # Default off. Enable this option (-1 or nonzero) if you are running a game or # demo that needs slower VGA memory (like that of older ISA hardware) to work properly. @@ -183,7 +185,7 @@ fileio = false # For build engine games, use more memory than in the list above so it can # use triple buffering and thus won't flicker. # -# vmemsizekb: Amount of video memory in kilobytes, in addition to vmemsize +# vmemsizekb: Amount of video memory in kilobytes, in addition to vmemsize. # captures: Directory where things like wave, midi, screenshot get captured. # saveslot: Select the default save slot (1-100) to save/load states. # skip encoding unchanged frames: Unchanged frames will not be sent to the video codec as a possible performance and bandwidth optimization. @@ -410,6 +412,11 @@ fileio = false # Some games or demoscene productions assume that they can render into the next SVGA window/bank # by writing to video memory beyond the current SVGA window address and will not appear correctly # without this option. +# ega per scanline hpel: If set, EGA emulation allows changing hpel per scanline. This is reportedly the behavior +# of IBM EGA hardware according to DOSBox SVN and on by default. If clear, EGA emulation +# latches hpel on vertical retrace end (like VGA does), which may have been EGA clone behavior +# that some games were written against. Commander Keen episodes 4-6 need this option set to false when machine=ega. +# This option affects only EGA emulation. To change VGA hpel behavior, use the 'allow hpel effects' setting instead. # allow hpel effects: If set, allow the DOS demo or program to change the horizontal pel (panning) register per scanline. # Some early DOS demos use this to create waving or sinus effects on the picture. Not very many VGA # chipsets allow this, so far, only ATI chipsets are known to support this effect. Disabled by default. @@ -480,6 +487,8 @@ fileio = false # Setting this option can correct for that. Needed for Mr. Blobby. language = title = +fastbioslogo = false +startbanner = true enable 8-bit dac = true dpi aware = auto quit warning = auto @@ -564,6 +573,7 @@ vesa bank switching window range check = true vesa zero buffer on get information = true vesa lfb base scanline adjust = 0 vesa map non-lfb modes to 128kb region = false +ega per scanline hpel = true allow hpel effects = false allow hretrace effects = false hretrace effect weight = 4.00 @@ -859,17 +869,21 @@ allow output port reset = true controllertype = auto auxdevice = intellimouse -[pci] -# voodoo: Enable VOODOO support. -# Possible values: false, software, opengl, auto. -# glide: Enable Glide emulation (requires glide2x.dll/libglide2x.so/libglide2x.dylib). -# lfb: Enable LFB access for Glide. OpenGlide does not support locking aux buffer, please use _noaux modes. -# Possible values: full, full_noaux, read, read_noaux, write, write_noaux, none. -# splash: Show 3dfx splash screen (Windows; requires 3dfxSpl2.dll). -voodoo = auto -glide = false -lfb = full_noaux -splash = true +[voodoo] +# voodoo_card: Enable VOODOO card support. +# Possible values: false, software, opengl, auto. +# voodoo_maxmem: Specify whether to enable maximum memory size for the VOODOO card. +# If set (on by default), the memory size will be 12MB (4MB front buffer + 2x4MB texture units) +# Otherwise, the memory size will be the standard 4MB (2MB front buffer + 1x2MB texture unit) +# glide: Enable Glide emulation (requires glide2x.dll/libglide2x.so/libglide2x.dylib). +# lfb: Enable LFB access for Glide. OpenGlide does not support locking aux buffer, please use _noaux modes. +# Possible values: full, full_noaux, read, read_noaux, write, write_noaux, none. +# splash: Show 3dfx splash screen (Windows; requires 3dfxSpl2.dll). +voodoo_card = auto +voodoo_maxmem = true +glide = false +lfb = full_noaux +splash = true [mixer] # nosound: Enable silent mode, sound is still emulated though. @@ -990,7 +1004,7 @@ mt32.partials = 32 fluid.driver = default fluid.soundfont = fluid.samplerate = 48000 -fluid.gain = .6 +fluid.gain = .2 fluid.polyphony = 256 fluid.cores = default fluid.periods = default @@ -1027,6 +1041,9 @@ fluid.chorus.type = 0 # Possible values: 1, 5, 0, 3, 6, 7. # hdma: The High DMA number of the Sound Blaster. Set to -1 to start DOSBox-X with the High DMA unassigned # Possible values: 1, 5, 0, 3, 6, 7. +# dsp command aliases: If set (on by default), emulation will support known undocumented aliases +# of common Sound Blaster DSP commands. Some broken DOS games and demos rely on these aliases. +# For more information: https://www.vogons.org/viewtopic.php?f=62&t=61098&start=280 # pic unmask irq: Start the DOS virtual machine with the Sound Blaster IRQ already unmasked at the PIC. # Some early DOS games/demos that support Sound Blaster expect the IRQ to fire but make # no attempt to unmask the IRQ. If audio cuts out no matter what IRQ you try, then try @@ -1124,6 +1141,7 @@ mindma = -1 irq hack = none dma = 1 hdma = 5 +dsp command aliases = true pic unmask irq = false enable speaker = false enable asp = false diff --git a/include/build_timestamp.h b/include/build_timestamp.h index 3e8575369..deedcccad 100644 --- a/include/build_timestamp.h +++ b/include/build_timestamp.h @@ -1,4 +1,4 @@ /*auto-generated*/ -#define UPDATED_STR "Aug 25, 2020 10:27:03am" -#define GIT_COMMIT_HASH "e58a6d2" +#define UPDATED_STR "Aug 27, 2020 6:42:48pm" +#define GIT_COMMIT_HASH "8fc4bca" #define COPYRIGHT_END_YEAR "2020" diff --git a/update-dosbox-x-reference-conf b/update-dosbox-x-reference-conf index 75ac4912b..107939f0e 100755 --- a/update-dosbox-x-reference-conf +++ b/update-dosbox-x-reference-conf @@ -1,6 +1,6 @@ #!/bin/bash -src/dosbox-x -c 'config -all -wc dosbox-x.reference.conf' -c 'exit' || exit 1 +src/dosbox-x -fastlaunch -defaultdir . -c 'config -all -wcp dosbox-x.reference.conf' -c 'exit' || exit 1 -# FIXME: Adding ./ to the beginning of the path should revert to storing the config in the current working directory again. -mv -v ~/.config/dosbox-x/dosbox-x.reference.conf dosbox-x.reference.conf || exit 1 +# Not really needed if command config -wcp [configfile] is used instead of config -wc [configfile] +# mv -v ~/.config/dosbox-x/dosbox-x.reference.conf dosbox-x.reference.conf || exit 1