Remove some duplication.
Signed-off-by: Andrea Odetti <mariofutire@gmail.com>
This commit is contained in:
parent
7acac5cd22
commit
9282c5ddb9
2 changed files with 6 additions and 7 deletions
|
@ -21,8 +21,6 @@ std::shared_ptr<const Paddle> & Paddle::instance()
|
|||
return singleton;
|
||||
}
|
||||
|
||||
const int Paddle::ourOpenApple = 0x61;
|
||||
const int Paddle::ourClosedApple = 0x62;
|
||||
std::set<int> Paddle::ourButtons;
|
||||
|
||||
void Paddle::setButtonPressed(int i)
|
||||
|
@ -73,13 +71,13 @@ BYTE __stdcall JoyReadButton(WORD pc, WORD addr, BYTE bWrite, BYTE d, ULONG uExe
|
|||
{
|
||||
switch (addr)
|
||||
{
|
||||
case 0x61:
|
||||
case Paddle::ourOpenApple:
|
||||
pressed = paddle->getButton(0);
|
||||
break;
|
||||
case 0x62:
|
||||
case Paddle::ourClosedApple:
|
||||
pressed = paddle->getButton(1);
|
||||
break;
|
||||
case 0x63:
|
||||
case Paddle::ourThirdApple:
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -13,8 +13,9 @@ public:
|
|||
virtual bool getButton(int i) const;
|
||||
virtual int getAxis(int i) const;
|
||||
|
||||
static const int ourOpenApple;
|
||||
static const int ourClosedApple;
|
||||
static constexpr int ourOpenApple = 0x61;
|
||||
static constexpr int ourClosedApple = 0x62;
|
||||
static constexpr int ourThirdApple = 0x63;
|
||||
|
||||
static void setButtonPressed(int i);
|
||||
static void setButtonReleased(int i);
|
||||
|
|
Loading…
Add table
Reference in a new issue