Skip to content

Commit b6a2785

Browse files
committed
dsda: descriptive complevel enum values
1 parent 31a867d commit b6a2785

File tree

4 files changed

+27
-27
lines changed

4 files changed

+27
-27
lines changed

src/BizHawk.Client.Common/movie/import/DoomLmpImport.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,15 +24,15 @@ protected override void RunImport()
2424
{
2525
// there is no signature, the first byte is the skill level, so don't advance
2626
Console.WriteLine("Reading DOOM LMP demo version: <=1.12");
27-
presumedCompatibilityLevel = DSDA.CompatibilityLevel.C0;
27+
presumedCompatibilityLevel = DSDA.CompatibilityLevel.Doom_12;
2828
}
2929
else
3030
{
3131
i++;
3232
Console.WriteLine("Reading DOOM LMP demo version: {0}", signature);
3333
presumedCompatibilityLevel = signature < 109
34-
? DSDA.CompatibilityLevel.C1 // 1.666
35-
: DSDA.CompatibilityLevel.C2; // 1.9
34+
? DSDA.CompatibilityLevel.Doom_1666
35+
: DSDA.CompatibilityLevel.Doom2_19;
3636
}
3737

3838
DSDA.DoomSyncSettings syncSettings = new()

src/BizHawk.Client.Common/movie/import/HereticLmpImport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected override void RunImport()
2323
MonstersRespawn = false,
2424
FastMonsters = false,
2525
NoMonsters = false,
26-
CompatibilityLevel = DSDA.CompatibilityLevel.C0,
26+
CompatibilityLevel = DSDA.CompatibilityLevel.Doom_12,
2727
SkillLevel = (DSDA.SkillLevel) (1 + input[i++]),
2828
InitialEpisode = input[i++],
2929
InitialMap = input[i++],

src/BizHawk.Client.Common/movie/import/HexenLmpImport.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ protected override void RunImport()
2323
MonstersRespawn = false,
2424
FastMonsters = false,
2525
NoMonsters = false,
26-
CompatibilityLevel = DSDA.CompatibilityLevel.C0,
26+
CompatibilityLevel = DSDA.CompatibilityLevel.Doom_12,
2727
SkillLevel = (DSDA.SkillLevel) (1 + input[i++]),
2828
InitialEpisode = input[i++],
2929
InitialMap = input[i++],

src/BizHawk.Emulation.Cores/Computers/Doom/DSDA.ISettable.cs

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -12,43 +12,43 @@ public partial class DSDA : ISettable<DSDA.DoomSettings, DSDA.DoomSyncSettings>
1212
public enum CompatibilityLevel : int
1313
{
1414
[Display(Name = "0 - Doom v1.2")]
15-
C0 = 0,
15+
Doom_12 = 0,
1616
[Display(Name = "1 - Doom v1.666")]
17-
C1 = 1,
18-
[Display(Name = "2 - Doom v1.9")]
19-
C2 = 2,
17+
Doom_1666 = 1,
18+
[Display(Name = "2 - Doom & Doom 2 v1.9")]
19+
Doom2_19 = 2,
2020
[Display(Name = "3 - Ultimate Doom & Doom95")]
21-
C3 = 3,
21+
UltimateDoom95 = 3,
2222
[Display(Name = "4 - Final Doom")]
23-
C4 = 4,
23+
FinalDoom = 4,
2424
[Display(Name = "5 - DOSDoom")]
25-
C5 = 5,
25+
DosDoom = 5,
2626
[Display(Name = "6 - TASDoom")]
27-
C6 = 6,
27+
TasDoom = 6,
2828
[Display(Name = "7 - Boom's Inaccurate Vanilla Compatibility Mode")]
29-
C7 = 7,
29+
Boom_Compatibility = 7,
3030
[Display(Name = "8 - Boom v2.01")]
31-
C8 = 8,
31+
Boom_201 = 8,
3232
[Display(Name = "9 - Boom v2.02")]
33-
C9 = 9,
33+
Boom_202 = 9,
3434
[Display(Name = "10 - LxDoom")]
35-
C10 = 10,
35+
LxDoom = 10,
3636
[Display(Name = "11 - MBF")]
37-
C11 = 11,
37+
MBF = 11,
3838
[Display(Name = "12 - PrBoom v2.03beta")]
39-
C12 = 12,
39+
PrBoom_1 = 12,
4040
[Display(Name = "13 - PrBoom v2.1.0")]
41-
C13 = 13,
41+
PrBoom_2 = 13,
4242
[Display(Name = "14 - PrBoom v2.1.1 - 2.2.6")]
43-
C14 = 14,
43+
PrBoom_3 = 14,
4444
[Display(Name = "15 - PrBoom v2.3.x")]
45-
C15 = 15,
45+
PrBoom_4 = 15,
4646
[Display(Name = "16 - PrBoom v2.4.0")]
47-
C16 = 16,
48-
[Display(Name = "17 - PrBoom Latest Default")]
49-
C17 = 17,
47+
PrBoom_5 = 16,
48+
[Display(Name = "17 - PrBoom Latest")]
49+
PrBoom_6 = 17,
5050
[Display(Name = "21 - MBF21")]
51-
C21 = 21
51+
MBF21 = 21
5252
}
5353

5454
public enum SkillLevel : int
@@ -300,7 +300,7 @@ public class DoomSyncSettings
300300

301301
[DisplayName("Compatibility Level")]
302302
[Description("The version of Doom or its ports that this movie is meant to emulate.")]
303-
[DefaultValue(CompatibilityLevel.C2)]
303+
[DefaultValue(CompatibilityLevel.Doom2_19)]
304304
[TypeConverter(typeof(DescribableEnumConverter))]
305305
public CompatibilityLevel CompatibilityLevel { get; set; }
306306

0 commit comments

Comments
 (0)