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

Fix warning in Visual Studio. 

Fix formatting to match other classes.
This commit is contained in:
Stephen Anthony 2020-01-31 23:47:27 -03:30
parent 990176d41d
commit fb347a7b3e
3 changed files with 42 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/emucore/Cart2K.cxx
View File

@ -46,7 +46,7 @@ Cartridge2K::Cartridge2K(const ByteBuffer& image, size_t size,
else
{
// Manually 'mirror' the ROM image into the buffer
for(int i = 0; i < System::PAGE_SIZE; i += mySize)
for(size_t i = 0; i < System::PAGE_SIZE; i += mySize)
std::copy_n(image.get(), mySize, myImage.get() + i);
mySize = System::PAGE_SIZE;
}

2
src/emucore/Lightgun.cxx
View File

@ -29,7 +29,7 @@
Lightgun::Lightgun(Jack jack, const Event& event, const System& system,
const string& romMd5, const FrameBuffer& frameBuffer)
: Controller(jack, event, system, Controller::Type::Lightgun),
myFrameBuffer(frameBuffer)
myFrameBuffer(frameBuffer)
{
// Right now, there are only three games and a test ROM that use the light gun
if (romMd5 == "8da51e0c4b6b46f7619425119c7d018e" ||

80
src/emucore/Lightgun.hxx
View File

@ -26,56 +26,56 @@
class Lightgun : public Controller
{
public:
/**
Create a new lightgun controller plugged into the specified jack
public:
/**
Create a new lightgun controller plugged into the specified jack
@param jack The jack the controller is plugged into
@param event The event object to use for events
@param system The system using this controller
@param romMd5 The md5 of the ROM using this controller
@param frameBuffer The frame buffer
@param jack The jack the controller is plugged into
@param event The event object to use for events
@param system The system using this controller
@param romMd5 The md5 of the ROM using this controller
@param frameBuffer The frame buffer
*/
Lightgun(Jack jack, const Event& event, const System& system,
const string& romMd5, const FrameBuffer& frameBuffer);
virtual ~Lightgun() = default;
*/
Lightgun(Jack jack, const Event& event, const System& system,
const string& romMd5, const FrameBuffer& frameBuffer);
virtual ~Lightgun() = default;
public:
using Controller::read;
public:
using Controller::read;
/**
Read the value of the specified digital pin for this controller.
/**
Read the value of the specified digital pin for this controller.
@param pin The pin of the controller jack to read
@return The state of the pin
*/
bool read(DigitalPin pin) override;
@param pin The pin of the controller jack to read
@return The state of the pin
*/
bool read(DigitalPin pin) override;
/**
Update the entire digital and analog pin state according to the
events currently set.
*/
void update() override;
/**
Update the entire digital and analog pin state according to the
events currently set.
*/
void update() override;
/**
Returns the name of this controller.
*/
string name() const override { return "Lightgun"; }
/**
Returns the name of this controller.
*/
string name() const override { return "Lightgun"; }
private:
const FrameBuffer& myFrameBuffer;
private:
const FrameBuffer& myFrameBuffer;
// targetting compensation values
Int32 myOfsX{0}, myOfsY{0};
// targetting compensation values
Int32 myOfsX{0}, myOfsY{0};
private:
// Following constructors and assignment operators not supported
Lightgun() = delete;
Lightgun(const Lightgun&) = delete;
Lightgun(Lightgun&&) = delete;
Lightgun& operator=(const Lightgun&) = delete;
Lightgun& operator=(Lightgun&&) = delete;
private:
// Following constructors and assignment operators not supported
Lightgun() = delete;
Lightgun(const Lightgun&) = delete;
Lightgun(Lightgun&&) = delete;
Lightgun& operator=(const Lightgun&) = delete;
Lightgun& operator=(Lightgun&&) = delete;
};
#endif