git repos / saland

commit 2b2b67e0

Poul Sander · 2019-04-06 16:21
2b2b67e0d64d32ad9fe3ef485c825a27a991f6cc patch · browse files
parent faa0a2a668f1787b5e6d8f0060906cfc610f5ee3 

Moved player controls out globally

Changed files

M src/saland/Game.cpp before
M src/saland/globals.hpp before
diff --git a/src/saland/Game.cpp b/src/saland/Game.cpp index 8a4710c..da0cfdd 100644 --- a/src/saland/Game.cpp +++ b/src/saland/Game.cpp
@@ -43,15 +43,6 @@ https://github.com/sago007/saland
int32 velocityIterations = 6;
int32 positionIterations = 2;
-struct PlayerControls {
- SDL_Scancode move_up = SDL_SCANCODE_UP;
- SDL_Scancode move_down = SDL_SCANCODE_DOWN;
- SDL_Scancode move_left = SDL_SCANCODE_LEFT;
- SDL_Scancode move_right = SDL_SCANCODE_RIGHT;
-};
-
-PlayerControls playerControls;
-
typedef std::pair<float,float> SpawnPoint;
@@ -260,13 +251,15 @@ void Game::ProcessInput(const SDL_Event& event, bool& processed) {
if (event.type == SDL_KEYDOWN) {
int tile_x = data->world_mouse_x/32;
int tile_y = data->world_mouse_y/32;
- if (event.key.keysym.sym == SDLK_w && sago::tiled::tileInBound(data->gameRegion.world.tm, tile_x, tile_y)) {
+ if (event.key.keysym.sym == globalData.playerControls.block_create
+ && sago::tiled::tileInBound(data->gameRegion.world.tm, tile_x, tile_y)) {
int layer_number = 2; // Do not hardcode
uint32_t tile = 607;
sago::tiled::setTileOnLayerNumber(data->gameRegion.world.tm, layer_number, tile_x, tile_y, tile);
data->gameRegion.world.init_physics(data->gameRegion.physicsBox);
}
- if (event.key.keysym.sym == SDLK_e && sago::tiled::tileInBound(data->gameRegion.world.tm, tile_x, tile_y)) {
+ if (event.key.keysym.sym == globalData.playerControls.block_delete
+ && sago::tiled::tileInBound(data->gameRegion.world.tm, tile_x, tile_y)) {
int layer_number = 2; // Do not hardcode
uint32_t tile = 0;
sago::tiled::setTileOnLayerNumber(data->gameRegion.world.tm, layer_number, tile_x, tile_y, tile);
@@ -299,16 +292,16 @@ void Game::Update() {
float deltaX = 0.0f;
float deltaY = 0.0f;
if (!data->console) {
- if (state[playerControls.move_down]) {
+ if (state[globalData.playerControls.move_down]) {
deltaY += 1.0f;
}
- if (state[playerControls.move_up]) {
+ if (state[globalData.playerControls.move_up]) {
deltaY -= 1.0f;
}
- if (state[playerControls.move_right]) {
+ if (state[globalData.playerControls.move_right]) {
deltaX += 1.0f;
}
- if (state[playerControls.move_left]) {
+ if (state[globalData.playerControls.move_left]) {
deltaX -= 1.0f;
}
}
diff --git a/src/saland/globals.hpp b/src/saland/globals.hpp index bbe5247..7e586f3 100644 --- a/src/saland/globals.hpp +++ b/src/saland/globals.hpp
@@ -27,6 +27,16 @@ https://github.com/sago007/saland
#include "../sago/SagoSpriteHolder.hpp"
#include <memory>
+struct PlayerControls {
+ SDL_Scancode move_up = SDL_SCANCODE_W;
+ SDL_Scancode move_down = SDL_SCANCODE_S;
+ SDL_Scancode move_left = SDL_SCANCODE_A;
+ SDL_Scancode move_right = SDL_SCANCODE_D;
+ SDL_Keycode block_create = SDLK_q;
+ SDL_Keycode block_delete = SDLK_e;
+};
+
+
struct GlobalData {
bool isShuttingDown = false;
bool fullscreen = false;
@@ -39,6 +49,7 @@ struct GlobalData {
int mousey = 0;
int xsize = 1024;
int ysize = 768;
+ PlayerControls playerControls;
};
extern GlobalData globalData;