diff options
Diffstat (limited to 'engine/player.cpp')
| -rw-r--r-- | engine/player.cpp | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/engine/player.cpp b/engine/player.cpp index c9a4ee2..091f874 100644 --- a/engine/player.cpp +++ b/engine/player.cpp @@ -1,10 +1,5 @@ -#ifndef __APPLE__ -#include <GL/gl.h> -#else -#include <OpenGL/gl.h> -#endif +#include <SFML/Window.hpp> #include <cmath> -#include <SDL/SDL.h> #include "player.h" #include <wriggle/texturesdl.h> @@ -33,11 +28,12 @@ void Player::draw() { } void Player::update() { - Uint8 *keystate = SDL_GetKeyState(NULL); - float factor = move_factor * (SDL_GetModState() & KMOD_SHIFT ? focus_factor : 1); + sf::Input input; + + float factor = move_factor * (input.IsKeyDown(sf::Key::LShift) ? focus_factor : 1); - float x_speed = factor * keystate[SDLK_RIGHT] - factor * keystate[SDLK_LEFT]; - float y_speed = factor * keystate[SDLK_UP] - factor * keystate[SDLK_DOWN]; + float x_speed = factor * input.IsKeyDown(sf::Key::Right) - factor * input.IsKeyDown(sf::Key::Left); + float y_speed = factor * input.IsKeyDown(sf::Key::Up) - factor * input.IsKeyDown(sf::Key::Down); if(x_speed && y_speed) { x_speed /= sqrtf(2); |