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

Merge branch 'rr1-maint'

Browse source
This commit is contained in:
Ilari Liusvaara 2012-03-10 21:23:24 +02:00
commit 389a6eca43
4 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -1 +1 @@
1-Δ5 1-Δ5ε1

12
manual.lyx
View file

@ -5933,5 +5933,17 @@ Optimize rendering a bit.
Bsnes v087 support. Bsnes v087 support.
\end_layout \end_layout
\begin_layout Subsection
rr1-delta5epsilon1
\end_layout
\begin_layout Itemize
Movieinfo: Fix display of port #2 type.
\end_layout
\begin_layout Itemize
Call on_input() after loadstate.
\end_layout
\end_body \end_body
\end_document \end_document

27
manual.txt
View file

@ -1374,14 +1374,26 @@ Get input state for entiere controller. Returns 13 return values.
Set state for entiere controller. args is up to 12 values for Set state for entiere controller. args is up to 12 values for
indices (overriding values in bitmask if specified). indices (overriding values in bitmask if specified).
8.4.5 input.reset([number cycles]) 8.4.5 input.controllertype(number controller)
Get the type of controller as string. Valid values are:
• gamepad
• mouse
• justifier
• superscope
8.4.6 input.reset([number cycles])
Execute reset. If cycles is greater than zero, do delayed reset. Execute reset. If cycles is greater than zero, do delayed reset.
0 (or no value) causes immediate reset. 0 (or no value) causes immediate reset.
• Only available with subframe flag false. • Only available with subframe flag false.
8.4.6 input.raw() 8.4.7 input.raw()
Returns table of tables of all available keys and axes. The first Returns table of tables of all available keys and axes. The first
table is indexed by key name (platform-dependent!), and the inner table is indexed by key name (platform-dependent!), and the inner
@ -1405,7 +1417,7 @@ table has the following fields:
• cal_tolerance: Dead zone tolerance. Only meaningful with axis • cal_tolerance: Dead zone tolerance. Only meaningful with axis
and pressure types. and pressure types.
8.4.7 input.keyhook(key, state) 8.4.8 input.keyhook(key, state)
Requests that keyhook events to be sent for key (state=true) or Requests that keyhook events to be sent for key (state=true) or
not sent (state=false). not sent (state=false).
@ -2891,7 +2903,8 @@ set-axis joystick0axis19 disabled
• New Lua functions: emulator_ready(), utime(), • New Lua functions: emulator_ready(), utime(),
set_idle_timeout(), set_timer_timeout(), bit.extract(), set_idle_timeout(), set_timer_timeout(), bit.extract(),
bit.value(), input.geta(), input.seta() bit.value(), input.geta(), input.seta() and
input.controllertype()
• Wxwidgets: Fix internal focus lost (hotkeys stop working) • Wxwidgets: Fix internal focus lost (hotkeys stop working)
@ -2907,5 +2920,9 @@ set-axis joystick0axis19 disabled
• Bsnes v087 support. • Bsnes v087 support.
• 15.54 rr1-delta5epsilon1
• Movieinfo: Fix display of port #2 type.
• Call on_input() after loadstate.

3
src/core/mainloop.cpp
View file

@ -948,7 +948,8 @@ void main_loop(struct loaded_rom& rom, struct moviefile& initial, bool load_has_
platform::set_paused(amode == ADVANCE_PAUSE); platform::set_paused(amode == ADVANCE_PAUSE);
platform::flush_command_queue(); platform::flush_command_queue();
//We already have done the reset this frame if we are going to do one at all. //We already have done the reset this frame if we are going to do one at all.
movb.get_movie().set_controls(controls.get(movb.get_movie().get_current_frame())); movb.get_movie().set_controls(movb.update_controls(true));
movb.get_movie().set_all_DRDY();
just_did_loadstate = false; just_did_loadstate = false;
} }
frame_irq_time = get_utime() - time_x; frame_irq_time = get_utime() - time_x;