mirror of
https://github.com/celisej567/mcpe.git
synced 2026-09-23 20:09:46 +03:00
Mac OS X 10.6 & More C++03 Support (#68)
* Mac OS X 10.6 & More C++03 Support * Fix SDL2 options.txt loading for C++03 --------- Co-authored-by: Brent Da Mage <BrentDaMage@users.noreply.github.com>
This commit is contained in:
@@ -12,18 +12,18 @@
|
||||
std::vector<MouseAction> Mouse::_inputs;
|
||||
int Mouse::_index, Mouse::_x, Mouse::_y;
|
||||
int Mouse::_xOld, Mouse::_yOld;
|
||||
Mouse::ButtonState Mouse::_buttonStates[Mouse::ButtonType::COUNT];
|
||||
Mouse::ButtonState Mouse::_buttonStates[Mouse::COUNT];
|
||||
|
||||
void Mouse::feed(ButtonType buttonType, ButtonState buttonState, int posX, int posY)
|
||||
{
|
||||
if (buttonType != ButtonType::NONE)
|
||||
if (buttonType != NONE)
|
||||
_inputs.push_back(MouseAction(buttonType, buttonState, posX, posY));
|
||||
|
||||
// Make sure button type is valid
|
||||
if (buttonType < ButtonType::COUNT)
|
||||
if (buttonType < COUNT)
|
||||
{
|
||||
// Check if we're processing a button-state update
|
||||
if (buttonType != ButtonType::NONE)
|
||||
if (buttonType != NONE)
|
||||
_buttonStates[buttonType] = buttonState;
|
||||
|
||||
_xOld = _x;
|
||||
@@ -75,8 +75,8 @@ MouseAction* Mouse::getEvent()
|
||||
|
||||
Mouse::ButtonState Mouse::getButtonState(ButtonType btn)
|
||||
{
|
||||
if (btn < ButtonType::MIN || btn >= ButtonType::COUNT)
|
||||
return ButtonState::UP;
|
||||
if (btn < MIN || btn >= COUNT)
|
||||
return UP;
|
||||
|
||||
return _buttonStates[btn];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user