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

Merge branch 'rr1-maint'

Browse source 
Conflicts:
	src/core/rom.cpp
	src/platform/wxwidgets/romselect.cpp
This commit is contained in:
Ilari Liusvaara 2012-03-18 17:31:52 +02:00
commit aebb6c8c6d
4 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

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

5
include/core/controllerframe.hpp
View file

@ -781,10 +781,9 @@ public:
{ {
size_t offset = 0; size_t offset = 0;
offset += system_serialize(backing, buf); offset += system_serialize(backing, buf);
for(size_t i = 0; i < MAX_PORTS; i++) { for(size_t i = 0; i < MAX_PORTS; i++)
offset += pinfo[i]->serialize(backing + offsets[i], buf + offset); offset += pinfo[i]->serialize(backing + offsets[i], buf + offset);
buf[offset++] = (i < MAX_PORTS - 1) ? '|' : '\0'; buf[offset++] = '\0';
}
} }
/** /**
* Return copy with dedicated memory. * Return copy with dedicated memory.

12
manual.lyx
View file

@ -5945,5 +5945,17 @@ Movieinfo: Fix display of port #2 type.
Call on_input() after loadstate. Call on_input() after loadstate.
\end_layout \end_layout
\begin_layout Subsection
rr1-delta5epsilon2
\end_layout
\begin_layout Itemize
Fix writing port2 data to movie.
\end_layout
\begin_layout Itemize
Fix SRAM handling with Bsnes v087.
\end_layout
\end_body \end_body
\end_document \end_document

4
manual.txt
View file

@ -2926,3 +2926,7 @@ set-axis joystick0axis19 disabled
• Call on_input() after loadstate. • Call on_input() after loadstate.
15.55 rr1-delta5epsilon2
• Fix writing port2 data to movie.