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

minor fixes

This commit is contained in:
thrust26 2023-06-14 09:51:37 +02:00
parent e06ca50b13
commit cd59144999
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/PJoystickHandler.cxx
View File

@ -489,7 +489,7 @@ void PhysicalJoystickHandler::defineControllerMappings(const Controller::Type ty
const Properties& properties) const Properties& properties)
{ {
// Determine controller events to use // Determine controller events to use
if(type == Controller::Type::QuadTari) if(type == Controller::Type::QuadTari)
{ {
if(port == Controller::Jack::Left) if(port == Controller::Jack::Left)
{ {
@ -501,7 +501,7 @@ void PhysicalJoystickHandler::defineControllerMappings(const Controller::Type ty
myRightMode = getMode(properties, PropType::Controller_Right1); myRightMode = getMode(properties, PropType::Controller_Right1);
myRight2ndMode = getMode(properties, PropType::Controller_Right2); myRight2ndMode = getMode(properties, PropType::Controller_Right2);
} }
} }
else else
{ {
const EventMode mode = getMode(type); const EventMode mode = getMode(type);
@ -729,7 +729,7 @@ bool PhysicalJoystickHandler::isDrivingEvent(const Event::Type event)
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
bool PhysicalJoystickHandler::isCommonEvent(const Event::Type event) bool PhysicalJoystickHandler::isCommonEvent(const Event::Type event)
{ {
return !(isJoystickEvent(event) || isPaddleEvent(event) return !(isJoystickEvent(event) || isPaddleEvent(event)
|| isKeyboardEvent(event) || isDrivingEvent(event)); || isKeyboardEvent(event) || isDrivingEvent(event));
} }

6
src/debugger/CartDebug.cxx
View File

@ -1333,13 +1333,13 @@ string CartDebug::saveDisassembly(string path)
out << "\n"; out << "\n";
out << ALIGN(16) << ourZPMnemonic[addr - 0x80] << "= $" out << ALIGN(16) << ourZPMnemonic[addr - 0x80] << "= $"
<< Base::HEX2 << right << (addr) << Base::HEX2 << right << (addr)
<< ((stackUsed|codeUsed) ? "; (" : "") << ((stackUsed || codeUsed) ? "; (" : "")
<< (codeUsed ? "c" : "") << (codeUsed ? "c" : "")
<< (stackUsed ? "s" : "") << (stackUsed ? "s" : "")
<< ((stackUsed | codeUsed) ? ")" : "") << ((stackUsed || codeUsed) ? ")" : "")
<< "\n"; << "\n";
addLine = false; addLine = false;
} else if (ramUsed|codeUsed|stackUsed) { } else if (ramUsed || codeUsed || stackUsed) {
if (addLine) if (addLine)
out << "\n"; out << "\n";
out << ALIGN(18) << ";" << "$" out << ALIGN(18) << ";" << "$"