diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | src/common.hpp | 9 | ||||
| -rw-r--r-- | src/game/assets.cpp (renamed from src/assets.cpp) | 2 | ||||
| -rw-r--r-- | src/game/game.cpp (renamed from src/game.cpp) | 2 | ||||
| -rw-r--r-- | src/game/game.hpp | 14 | ||||
| -rw-r--r-- | src/game/interface.cpp (renamed from src/interface.cpp) | 2 | ||||
| -rw-r--r-- | src/render.cpp | 4 |
7 files changed, 22 insertions, 17 deletions
@@ -9,9 +9,9 @@ PP_CC := $(PP_BOLD)$(shell tput setf 6)CC$(PP_RESET) PP_LD := $(PP_BOLD)$(shell tput setf 2)LD$(PP_RESET) PP_RM := $(PP_BOLD)$(shell tput setf 4)RM$(PP_RESET) -SRC := src/assets.cpp \ - src/game.cpp \ - src/interface.cpp \ +SRC := src/game/assets.cpp \ + src/game/game.cpp \ + src/game/interface.cpp \ src/main.cpp \ src/path_finder.cpp \ src/procgen.cpp \ diff --git a/src/common.hpp b/src/common.hpp index 259c458..e3bd19c 100644 --- a/src/common.hpp +++ b/src/common.hpp @@ -292,15 +292,6 @@ namespace render { extern render::state_t *debug_render; namespace assets { - typedef struct { - render::oriented_sprite_4M_t head_idle, body_idle; - render::oriented_sprite_4M2_t legs_idle, legs_walking; - } human_assets_t; - - extern human_assets_t human; - extern sf::Texture tile_dirt; - extern sf::Texture tile_wall; - void load(void); }; diff --git a/src/assets.cpp b/src/game/assets.cpp index 94651c6..32eff81 100644 --- a/src/assets.cpp +++ b/src/game/assets.cpp @@ -1,4 +1,4 @@ -#include "common.hpp" +#include "game.hpp" namespace assets { diff --git a/src/game.cpp b/src/game/game.cpp index fd119f8..eb3966d 100644 --- a/src/game.cpp +++ b/src/game/game.cpp @@ -1,4 +1,4 @@ -#include "common.hpp" +#include "game.hpp" namespace game { diff --git a/src/game/game.hpp b/src/game/game.hpp new file mode 100644 index 0000000..3e10bbb --- /dev/null +++ b/src/game/game.hpp @@ -0,0 +1,14 @@ +#include "../common.hpp" + +namespace assets { + typedef struct { + render::oriented_sprite_4M_t head_idle, body_idle; + render::oriented_sprite_4M2_t legs_idle, legs_walking; + } human_assets_t; + + extern human_assets_t human; + extern sf::Texture tile_dirt; + extern sf::Texture tile_wall; + + void load(void); +}; diff --git a/src/interface.cpp b/src/game/interface.cpp index 3a6a294..c89cdad 100644 --- a/src/interface.cpp +++ b/src/game/interface.cpp @@ -1,4 +1,4 @@ -#include "common.hpp" +#include "game.hpp" namespace interface { diff --git a/src/render.cpp b/src/render.cpp index 7e90190..0952343 100644 --- a/src/render.cpp +++ b/src/render.cpp @@ -14,13 +14,13 @@ static void draw_tile(sf::RenderWindow *window, v2f_t x, world::tile_t *tile, default: return; - case world::TILE_DIRT: + /*case world::TILE_DIRT: texture = &assets::tile_dirt; break; case world::TILE_WALL: texture = &assets::tile_wall; - break; + break;*/ } wot_rect.setTexture(texture, true); |