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

Cherry-picked some commits from master.

This commit is contained in:
Stephen Anthony 2018-01-20 20:45:56 -03:30
parent 2e51511c80
commit 9441cc43c4
3 changed files with 8 additions and 4 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. * Fixed swapped ports being displayed wrong in System Logs and debugger.
* Added options to erase the AtariVox/Savekey flash memory, either for * 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 * Moved various developer related settings in new Developer Settings
dialog. These settings now come in two groups (player/developer) and dialog. These settings now come in two groups (player/developer) and

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 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, const int buttonWidth = BUTTON_W + 8,
buttonHeight = BUTTON_H + 10, buttonHeight = BUTTON_H + 10,
rowHeight = font.getLineHeight(); rowHeight = font.getLineHeight();
@ -351,7 +351,10 @@ void TimeMachineDialog::handleWinds(Int32 numWinds)
if(numWinds) if(numWinds)
{ {
uInt64 startCycles = instance().console().tia().cycles(); 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); string message = r.getUnitString(instance().console().tia().cycles() - startCycles);
myMessageWidget->setLabel((numWinds < 0 ? "(-" : "(+") + message + ")"); myMessageWidget->setLabel((numWinds < 0 ? "(-" : "(+") + message + ")");

2
src/gui/TimeMachineDialog.hxx
View File

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