File tree Expand file tree Collapse file tree 1 file changed +11
-9
lines changed
src/BizHawk.Client.Common/movie/import Expand file tree Collapse file tree 1 file changed +11
-9
lines changed Original file line number Diff line number Diff line change @@ -179,7 +179,17 @@ protected override void RunImport()
179
179
episode = input [ i ++ ] ;
180
180
map = input [ i ++ ] ;
181
181
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 ;
183
193
}
184
194
185
195
DSDA . DoomSyncSettings syncSettings = new ( )
@@ -197,14 +207,6 @@ protected override void RunImport()
197
207
RenderWipescreen = false ,
198
208
} ;
199
209
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
-
208
210
syncSettings . Player1Present = input [ i ++ ] is not 0 ;
209
211
syncSettings . Player2Present = input [ i ++ ] is not 0 ;
210
212
syncSettings . Player3Present = input [ i ++ ] is not 0 ;
You can’t perform that action at this time.
0 commit comments