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

Merge branch 'master' of https://github.com/stella-emu/stella

This commit is contained in:
thrust26 2017-10-13 11:18:07 +02:00
parent c6a5b96796 1707a8f167
commit 576773f837
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Changes.txt
View File

@ -2680,7 +2680,7 @@
* Fixed crash when adding one-shot cheats. * Fixed crash when adding one-shot cheats.
* Fixed bug in RAM comparitive searches in the debugger. * Fixed bug in RAM comparative searches in the debugger.
* Fixed bug with setting snapshot naming type from the GUI (it was * Fixed bug with setting snapshot naming type from the GUI (it was
always being set to 'romname'). always being set to 'romname').

2
docs/debugger.html
View File

@ -957,7 +957,7 @@ and the input is empty, all RAM locations are highlighted.</p>
<p>The 'Compare' button is used to compare the given value using all <p>The 'Compare' button is used to compare the given value using all
addresses currently highlighted. This may be an absolute number (such as 2), addresses currently highlighted. This may be an absolute number (such as 2),
or a comparitive number (such as -1). Using a '+' or '-' operator or a comparative number (such as -1). Using a '+' or '-' operator
means 'search addresses for values that have changed by that amount'.</p> means 'search addresses for values that have changed by that amount'.</p>
<p>The 'Reset' button resets the entire operation; it clears the highlighted <p>The 'Reset' button resets the entire operation; it clears the highlighted
addresses and allows another search.</p> addresses and allows another search.</p>

10
src/debugger/gui/RamWidget.cxx
View File

@ -383,11 +383,11 @@ string RamWidget::doSearch(const string& str)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
string RamWidget::doCompare(const string& str) string RamWidget::doCompare(const string& str)
{ {
bool comparitiveSearch = false; bool comparativeSearch = false;
int searchVal = 0, offset = 0; int searchVal = 0, offset = 0;
if(str.length() == 0) if(str.length() == 0)
return "Enter an absolute or comparitive value"; return "Enter an absolute or comparative value";
// Do some pre-processing on the string // Do some pre-processing on the string
string::size_type pos = str.find_first_of("+-", 0); string::size_type pos = str.find_first_of("+-", 0);
@ -397,11 +397,11 @@ string RamWidget::doCompare(const string& str)
return "Input must be [+|-]NUM"; return "Input must be [+|-]NUM";
} }
// A comparitive search searches memory for locations that have changed by // A comparative search searches memory for locations that have changed by
// the specified amount, vs. for exact values // the specified amount, vs. for exact values
if(str[0] == '+' || str[0] == '-') if(str[0] == '+' || str[0] == '-')
{ {
comparitiveSearch = true; comparativeSearch = true;
bool negative = false; bool negative = false;
if(str[0] == '-') if(str[0] == '-')
negative = true; negative = true;
@ -425,7 +425,7 @@ string RamWidget::doCompare(const string& str)
for(uInt32 i = 0; i < mySearchAddr.size(); ++i) for(uInt32 i = 0; i < mySearchAddr.size(); ++i)
{ {
if(comparitiveSearch) if(comparativeSearch)
{ {
searchVal = mySearchValue[i] + offset; searchVal = mySearchValue[i] + offset;
if(searchVal < 0 || searchVal > 255) if(searchVal < 0 || searchVal > 255)

10
src/emucore/EventHandler.cxx
View File

@ -1445,8 +1445,7 @@ bool EventHandler::addJoyAxisMapping(Event::Type event, EventMode mode,
const StellaJoystick* joy = myJoyHandler->joy(stick); const StellaJoystick* joy = myJoyHandler->joy(stick);
if(joy) if(joy)
{ {
if(axis >= 0 && axis < joy->numAxes && if(axis >= 0 && axis < joy->numAxes && event < Event::LastType)
event >= 0 && event < Event::LastType)
{ {
// This confusing code is because each axis has two associated values, // This confusing code is because each axis has two associated values,
// but analog events only affect one of the axis. // but analog events only affect one of the axis.
@ -1481,8 +1480,7 @@ bool EventHandler::addJoyButtonMapping(Event::Type event, EventMode mode,
const StellaJoystick* joy = myJoyHandler->joy(stick); const StellaJoystick* joy = myJoyHandler->joy(stick);
if(joy) if(joy)
{ {
if(button >= 0 && button < joy->numButtons && if(button >= 0 && button < joy->numButtons && event < Event::LastType)
event >= 0 && event < Event::LastType)
{ {
joy->btnTable[button][mode] = event; joy->btnTable[button][mode] = event;
if(updateMenus) if(updateMenus)
@ -1503,8 +1501,8 @@ bool EventHandler::addJoyHatMapping(Event::Type event, EventMode mode,
const StellaJoystick* joy = myJoyHandler->joy(stick); const StellaJoystick* joy = myJoyHandler->joy(stick);
if(joy) if(joy)
{ {
if(hat >= 0 && hat < joy->numHats && if(hat >= 0 && hat < joy->numHats && event < Event::LastType &&
event >= 0 && event < Event::LastType && value != EVENT_HATCENTER) value != EVENT_HATCENTER)
{ {
joy->hatTable[hat][value][mode] = event; joy->hatTable[hat][value][mode] = event;
if(updateMenus) if(updateMenus)

2
src/emucore/Settings.cxx
View File

@ -555,7 +555,7 @@ void Settings::saveConfig()
<< "; Format MUST be as follows:" << endl << "; Format MUST be as follows:" << endl
<< "; command = value" << endl << "; command = value" << endl
<< ";" << endl << ";" << endl
<< "; Commmands are the same as those specified on the commandline," << endl << "; Commands are the same as those specified on the commandline," << endl
<< "; without the '-' character." << endl << "; without the '-' character." << endl
<< ";" << endl << ";" << endl
<< "; Values are the same as those allowed on the commandline." << endl << "; Values are the same as those allowed on the commandline." << endl