ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/5.1'

This commit is contained in:
Christian Speckner 2018-01-21 09:38:42 +01:00
parent 40615be9be 1055a4bd06
commit 6fe5f3b197
6 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Changes.txt
View File

@ -69,7 +69,8 @@
* Fixed swapped ports being displayed wrong in System Logs and debugger.
* Added options to erase the AtariVox/Savekey flash memory, either for
all ROMs or only the current one.
all ROMs or only the current one. Also added a message (configurable)
when the flash memory is accessed.
* Moved various developer related settings in new Developer Settings
dialog. These settings now come in two groups (player/developer) and

17
docs/index.html
View File

@ -268,7 +268,7 @@
joysticks or mouse</li>
<li>Emulates the Sega Genesis Controller using your computer's keyboard,
joysticks or mouse</li>
<li>Emulates CX22/CX80 style trakballs and Amiga/Atari Mouse using your
<li>Emulates CX22/CX80 style trackballs and Amiga/Atari Mouse using your
computer's mouse</li>
<li>Emulates <a href="http://en.wikipedia.org/wiki/CompuMate">Spectravideo CompuMate</a> system using your computer's keyboard,
including mapping of CompuMate 'Backspace', 'Space' and 'Enter' functionality to
@ -645,8 +645,8 @@
<tr>
<td>Enter/exit options mode</td>
<td>Tab</td>
<td>Tab</td>
<td>Tab/Escape</td>
<td>Tab/Escape</td>
</tr>
<tr>
@ -1745,12 +1745,12 @@
<td> &#x2713;</td>
</tr>
<tr>
<th> Trakball/Mouse</th>
<th> Trackball/Mouse</th>
<td> &#x2715;</td>
<td> &#x2715;</td>
<td> &#x2713;</td>
<td> &#x2713; (axis ignored)</td>
<td> &#x2715;</td>
<td> &#x2713;</td>
</tr>
<tr>
<th> CompuMate</th>
@ -2103,7 +2103,7 @@
<td><pre>-usemouse &lt;always|analog|never&gt;</pre></td>
<td>Use mouse as a controller as specified by ROM properties in specific case.
Always and never are self-explanatory, analog means only for analog-type devices
(paddles, trakball, etc.).</td>
(paddles, trackball, etc.).</td>
</tr>
<tr>
@ -2995,8 +2995,9 @@
<h2><b><a name="Adaptor">Stelladaptor/2600-daptor Support</a></b></h2>
<blockquote>
<p>Stella supports real Atari 2600 joysticks, paddles and driving controllers
using the <a href="http://www.grandideastudio.com/portfolio/stelladaptor-2600">Stelladaptor</a> and
<p>Stella supports real Atari 2600 joysticks, paddles, driving controllers
and trackballs (CX22/CX80 'Trak-Ball', Atari and Amiga mouse) using the
<a href="http://www.grandideastudio.com/portfolio/stelladaptor-2600">Stelladaptor</a> and
<a href="http://2600-daptor.com">2600-daptor</a> devices.</p>
<p>Stella can use up to <b>two</b> adaptors; any extra ones are ignored.

4
src/emucore/EventHandler.cxx
View File

@ -1271,7 +1271,9 @@ bool EventHandler::eventStateChange(Event::Type type)
break;
case Event::DebuggerMode:
if(myState == EventHandlerState::EMULATION || myState == EventHandlerState::PAUSE)
if(myState == EventHandlerState::EMULATION
|| myState == EventHandlerState::PAUSE
|| myState == EventHandlerState::TIMEMACHINE)
enterDebugMode();
else if(myState == EventHandlerState::DEBUGGER && myOSystem.debugger().canExit())
leaveDebugMode();

7
src/emucore/tia/TIA.cxx
View File

@ -812,10 +812,9 @@ void TIA::update()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool TIA::enableColorLoss(bool enabled)
{
if (consoleTiming() != ConsoleTiming::pal)
return false;
bool allowColorLoss = consoleTiming() == ConsoleTiming::pal;
if(enabled)
if(allowColorLoss && enabled)
{
myColorLossEnabled = true;
myColorLossActive = myFrameManager->scanlinesLastFrame() & 0x1;
@ -833,7 +832,7 @@ bool TIA::enableColorLoss(bool enabled)
myBackground.applyColorLoss();
}
return true;
return allowColorLoss;
}
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

7
src/gui/TimeMachineDialog.cxx
View File

@ -181,7 +181,7 @@ TimeMachineDialog::TimeMachineDialog(OSystem& osystem, DialogContainer& parent,
};
const GUI::Font& font = instance().frameBuffer().font();
const int H_BORDER = 6, BUTTON_GAP = 4, V_BORDER = 4, V_GAP = 4;
const int H_BORDER = 6, BUTTON_GAP = 4, V_BORDER = 4; // FIXME, V_GAP = 4;
const int buttonWidth = BUTTON_W + 8,
buttonHeight = BUTTON_H + 10,
rowHeight = font.getLineHeight();
@ -351,7 +351,10 @@ void TimeMachineDialog::handleWinds(Int32 numWinds)
if(numWinds)
{
uInt64 startCycles = instance().console().tia().cycles();
uInt32 winds = numWinds < 0 ? r.rewindState(-numWinds) : r.unwindState(numWinds);
if(numWinds < 0)
r.rewindState(-numWinds);
else
r.unwindState(numWinds);
string message = r.getUnitString(instance().console().tia().cycles() - startCycles);
myMessageWidget->setLabel((numWinds < 0 ? "(-" : "(+") + message + ")");

2
src/gui/TimeMachineDialog.hxx
View File

@ -55,7 +55,7 @@ class TimeMachineDialog : public Dialog
kUnwind1 = 'TMun',
};
ButtonWidget* myPauseWidget;
// FIXME ButtonWidget* myPauseWidget;
ButtonWidget* myPlayWidget;
ButtonWidget* myRewindAllWidget;
ButtonWidget* myRewind10Widget;