From 11cb444b2c9d002973d0ccf59c96c2b610027c7e Mon Sep 17 00:00:00 2001 From: feos Date: Sun, 2 Mar 2025 11:13:26 +0300 Subject: [PATCH] dsda: fix aspect on 3x+ and add pistolstart --- src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs | 5 +++++ src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs b/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs index 12c516d083..4fd0620b3c 100644 --- a/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs +++ b/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs @@ -239,6 +239,11 @@ namespace BizHawk.Emulation.Cores.Computers.Doom [DefaultValue(false)] public bool NoMonsters { get; set; } + [DisplayName("Pistol Start")] + [Description("Starts every level with a clean slate, with nothing carried over from previus levels. Health is reset to 100% as well.")] + [DefaultValue(false)] + public bool PistolStart { get; set; } + [DisplayName("Player 1 Hexen Class")] [Description("The Hexen class to use for player 1. Has no effect for Doom / Heretic")] [DefaultValue(HexenClass.Fighter)] diff --git a/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs b/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs index c12f327417..9b99fe74f2 100644 --- a/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs +++ b/src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.cs @@ -77,14 +77,16 @@ namespace BizHawk.Emulation.Cores.Computers.Doom _nativeResolution.X * _settings.ScaleFactor}x{ _nativeResolution.Y * _settings.ScaleFactor}\"\n" + $"usegamma {_settings.Gamma}\n" + + "dsda_exhud 0\n" + + "dsda_pistol_start 0\n" + "uncapped_framerate 0\n" + + "render_aspect 3\n" // 4:3, controls FOV on higher resolutions (see SetRatio()) + "render_stretch_hud 0\n" + "render_stretchsky 0\n" + "render_doom_lightmaps 1\n" + "render_stretchsky 0\n" + "map_coordinates 0\n" + "map_totals 0\n" - + "map_time 0\n" ); _elf = new WaterboxHost(new WaterboxOptions @@ -165,6 +167,7 @@ namespace BizHawk.Emulation.Cores.Computers.Doom ConditionalArg(!_syncSettings.StrictMode, "-tas"); ConditionalArg(_syncSettings.MonstersRespawn, "-respawn"); ConditionalArg(_syncSettings.NoMonsters, "-nomonsters"); + ConditionalArg(_syncSettings.PistolStart, "-pistolstart"); ConditionalArg(_syncSettings.ChainEpisodes, "-chain_episodes"); ConditionalArg(_syncSettings.TurningResolution == TurningResolution.Longtics, "-longtics"); ConditionalArg(_syncSettings.MultiplayerMode == MultiplayerMode.Deathmatch, "-deathmatch");