TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixed demo playback which would not transition to Descent 2 secret levels due to interpolated playback triggering ND_STATE_PAUSED and skipping oder ND_EVENT_SECRET_THINGY

Browse source
This commit is contained in:
zico 2015-12-04 21:01:37 +01:00
parent 60e6c23ccc
commit d493912bcc
1 changed files with 30 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
similar/main/newdemo.cpp
View file

@ -2177,35 +2177,38 @@ static int newdemo_read_frame_information(int rewrite)
nd_write_int(shot);
#endif
}
if (Newdemo_vcr_state != ND_STATE_PAUSED)
{
const auto &&segp = vsegptridx(segnum);
/* Demo recording is buggy. Descent records
* ND_EVENT_TRIGGER for every segment transition, even
* if there is no wall.
*/
if (segp->sides[side].wall_num != wall_none)
{
#if defined(DXX_BUILD_DESCENT_II)
if (Triggers[Walls[segp->sides[side].wall_num].trigger].type == TT_SECRET_EXIT) {
int truth;
nd_read_byte(&c);
Assert(c == ND_EVENT_SECRET_THINGY);
nd_read_int(&truth);
if (rewrite)
{
nd_write_byte(c);
nd_write_int(truth);
break;
}
if (!truth)
check_trigger(segp, side, objnum,shot);
} else if (!rewrite)
const auto &&segp = vsegptridx(segnum);
/* Demo recording is buggy. Descent records
* ND_EVENT_TRIGGER for every segment transition, even
* if there is no wall.
*/
if (segp->sides[side].wall_num != wall_none)
{
#if defined(DXX_BUILD_DESCENT_II)
if (Triggers[Walls[segp->sides[side].wall_num].trigger].type == TT_SECRET_EXIT) {
int truth;
nd_read_byte(&c);
Assert(c == ND_EVENT_SECRET_THINGY);
nd_read_int(&truth);
if (Newdemo_vcr_state == ND_STATE_PAUSED)
break;
if (rewrite)
{
nd_write_byte(c);
nd_write_int(truth);
break;
}
if (!truth)
check_trigger(segp, side, objnum,shot);
} else if (!rewrite)
#endif
check_trigger(segp, side, objnum,shot);
}
}
{
if (Newdemo_vcr_state != ND_STATE_PAUSED)
check_trigger(segp, side, objnum,shot);
}
}
}
break;