mirror of https://github.com/stella-emu/stella.git
Fix callback usage.
This commit is contained in:
parent
2921bc29de
commit
6bb055a159
|
@ -144,10 +144,10 @@ class Cartridge : public Device
|
||||||
/**
|
/**
|
||||||
Set the callback for displaying messages
|
Set the callback for displaying messages
|
||||||
*/
|
*/
|
||||||
void setMessageCallback(const messageCallback& callback)
|
void setMessageCallback(messageCallback callback)
|
||||||
{
|
{
|
||||||
if(myMsgCallback == nullptr)
|
if(!myMsgCallback)
|
||||||
myMsgCallback = &callback;
|
myMsgCallback = callback;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef DEBUGGER_SUPPORT
|
#ifdef DEBUGGER_SUPPORT
|
||||||
|
@ -415,7 +415,7 @@ class Cartridge : public Device
|
||||||
uInt32 myAccessSize;
|
uInt32 myAccessSize;
|
||||||
|
|
||||||
// Callback to output messages
|
// Callback to output messages
|
||||||
const messageCallback* myMsgCallback{nullptr};
|
messageCallback myMsgCallback{nullptr};
|
||||||
|
|
||||||
private:
|
private:
|
||||||
// The startup bank to use (where to look for the reset vector address)
|
// The startup bank to use (where to look for the reset vector address)
|
||||||
|
|
|
@ -306,7 +306,7 @@ void CartridgeAR::loadIntoRAM(uInt8 load)
|
||||||
if(checksum(myHeader.data(), 8) != 0x55)
|
if(checksum(myHeader.data(), 8) != 0x55)
|
||||||
{
|
{
|
||||||
cerr << "WARNING: The Supercharger header checksum is invalid...\n";
|
cerr << "WARNING: The Supercharger header checksum is invalid...\n";
|
||||||
(*myMsgCallback)("Supercharger load #" + std::to_string(load) + " done with hearder checksum error");
|
myMsgCallback("Supercharger load #" + std::to_string(load) + " done with hearder checksum error");
|
||||||
success = false;
|
success = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -322,7 +322,7 @@ void CartridgeAR::loadIntoRAM(uInt8 load)
|
||||||
if(!invalidPageChecksumSeen && (sum != 0x55))
|
if(!invalidPageChecksumSeen && (sum != 0x55))
|
||||||
{
|
{
|
||||||
cerr << "WARNING: Some Supercharger page checksums are invalid...\n";
|
cerr << "WARNING: Some Supercharger page checksums are invalid...\n";
|
||||||
(*myMsgCallback)("Supercharger load #" + std::to_string(load) + " done with page #"
|
myMsgCallback("Supercharger load #" + std::to_string(load) + " done with page #"
|
||||||
+ std::to_string(j) + " checksum error");
|
+ std::to_string(j) + " checksum error");
|
||||||
invalidPageChecksumSeen = true;
|
invalidPageChecksumSeen = true;
|
||||||
}
|
}
|
||||||
|
@ -341,7 +341,7 @@ void CartridgeAR::loadIntoRAM(uInt8 load)
|
||||||
|
|
||||||
myBankChanged = true;
|
myBankChanged = true;
|
||||||
if(success)
|
if(success)
|
||||||
(*myMsgCallback)("Supercharger load #" + std::to_string(load) + " done");
|
myMsgCallback("Supercharger load #" + std::to_string(load) + " done");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue