Skip to content

Commit e1374d2

Browse files
committed
dsda: fix 3 missing params for boom demos
the rest may have to be implemented in the first place, like initial seed
1 parent b2c33aa commit e1374d2

File tree

1 file changed

+11
-9
lines changed

1 file changed

+11
-9
lines changed

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

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,17 @@ protected override void RunImport()
179179
episode = input[i++];
180180
map = input[i++];
181181
multiplayerMode = (DSDA.MultiplayerMode) input[i++];
182-
i++; // DisplayPlayer is a non-sync setting so importers can't set it
182+
i++; // DisplayPlayer is a non-sync setting so importers can't set it
183+
i += 6; // skip settings we can't parse yet
184+
monstersRespawn = input[i++] is not 0;
185+
fastMonsters = input[i++] is not 0;
186+
noMonsters = input[i++] is not 0;
187+
188+
var optionsSize = compLevel == DSDA.CompatibilityLevel.MBF21 ? 21 + 25 : 64;
189+
i += optionsSize - 9; // subtract the options we already parsed
190+
191+
if (version == DemoVersion.Boom_2_00)
192+
i += 256 - optionsSize;
183193
}
184194

185195
DSDA.DoomSyncSettings syncSettings = new()
@@ -197,14 +207,6 @@ protected override void RunImport()
197207
RenderWipescreen = false,
198208
};
199209

200-
if (version >= DemoVersion.Boom_2_00)
201-
{
202-
var optionsSize = compLevel == DSDA.CompatibilityLevel.MBF21 ? 21 + 25 : 64;
203-
i += optionsSize;
204-
if (version == DemoVersion.Boom_2_00)
205-
i += 256 - optionsSize;
206-
}
207-
208210
syncSettings.Player1Present = input[i++] is not 0;
209211
syncSettings.Player2Present = input[i++] is not 0;
210212
syncSettings.Player3Present = input[i++] is not 0;

0 commit comments

Comments
 (0)