empathicqubit/lsnes
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Advance macros after frame is complete, not before frame starts

Browse source
This commit is contained in:
Ilari Liusvaara 2014-04-14 15:03:26 +03:00
parent 4ffdbdd695
commit 602166c5d3
1 changed files with 3 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/core/mainloop.cpp
View file

@ -1269,13 +1269,13 @@ void main_loop(struct loaded_rom& rom, struct moviefile& initial, bool load_has_
if(!first_round) {
controls.reset_framehold();
movb.get_movie().get_pollcounters().set_framepflag(false);
movb.new_frame_starting(amode == ADVANCE_SKIPLAG);
movb.get_movie().get_pollcounters().set_framepflag(true);
if(!macro_hold_1 && !macro_hold_2) {
controls.advance_macros();
}
macro_hold_2 = false;
movb.get_movie().get_pollcounters().set_framepflag(false);
movb.new_frame_starting(amode == ADVANCE_SKIPLAG);
movb.get_movie().get_pollcounters().set_framepflag(true);
if(amode == ADVANCE_QUIT && queued_saves.empty())
break;
handle_saves();
@ -1311,11 +1311,6 @@ void main_loop(struct loaded_rom& rom, struct moviefile& initial, bool load_has_
movb.get_movie().set_controls(movb.update_controls(true));
movb.get_movie().set_all_DRDY();
just_did_loadstate = false;
//Advance macros to avoid double inputs.
if(!macro_hold_1 && !macro_hold_2) {
controls.advance_macros();
}
macro_hold_2 = false;
}
frame_irq_time = get_utime() - time_x;
our_rom.rtype->emulate();