celisej567/mcpe
1
0
Fork 0
mirror of https://github.com/celisej567/mcpe.git synced 2026-01-05 18:10:09 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Mac OS X 10.6 & More C++03 Support (#68)

Browse Source 
* 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:
Brent
2023-08-27 03:46:15 -05:00
committed by GitHub
parent 0c38c01c28
commit f7915a1dab
57 changed files with 1736 additions and 1534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/player/input/Keyboard.cpp
View File

@@ -52,7 +52,7 @@ bool Keyboard::isKeyDown(int keyCode)
if (keyCode < 0 || keyCode >= KEYBOARD_STATES_SIZE)
return false;
return _states[keyCode] == KeyState::DOWN;
return _states[keyCode] == DOWN;
}
void Keyboard::reset()

2
source/client/player/input/Keyboard.hpp
View File

@@ -12,7 +12,7 @@
#endif
#include <vector>
#include <cstdint>
#include <stdint.h>
#define KEYBOARD_STATES_SIZE (256)

12
source/client/player/input/Mouse.cpp
View File

@@ -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];
}

12
source/client/player/input/Mouse.hpp
View File

@@ -55,7 +55,7 @@ private:
static int _index;
static int _x, _y;
static int _xOld, _yOld;
static ButtonState _buttonStates[Mouse::ButtonType::COUNT];
static ButtonState _buttonStates[Mouse::COUNT];
};
struct MouseAction
@@ -67,8 +67,8 @@ struct MouseAction
MouseAction()
{
_buttonType = Mouse::ButtonType::NONE;
_buttonState = Mouse::ButtonState::UP;
_buttonType = Mouse::NONE;
_buttonState = Mouse::UP;
_posX = 0;
_posY = 0;
}
@@ -84,8 +84,8 @@ struct MouseAction
bool isButton()
{
return
_buttonType == Mouse::ButtonType::LEFT ||
_buttonType == Mouse::ButtonType::RIGHT ||
_buttonType == Mouse::ButtonType::MIDDLE;
_buttonType == Mouse::LEFT ||
_buttonType == Mouse::RIGHT ||
_buttonType == Mouse::MIDDLE;
}
};