diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc5280..2df8aa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,8 +20,8 @@ add_executable(PixelDefense game/ai_actions.c game/ai_actions.h - game/buildings.c - game/buildings.h + game/building_factory.c + game/building_factory.h game/components.c game/components.h game/constants.h diff --git a/game/ai_actions.c b/game/ai_actions.c index 9baae27..04af2e3 100644 --- a/game/ai_actions.c +++ b/game/ai_actions.c @@ -2,7 +2,7 @@ #include "game_state.h" #include "components.h" #include "systems/systems.h" -#include "buildings.h" +#include "building_factory.h" #include diff --git a/game/buildings.c b/game/building_factory.c similarity index 99% rename from game/buildings.c rename to game/building_factory.c index 3b202a6..556ae3b 100644 --- a/game/buildings.c +++ b/game/building_factory.c @@ -1,4 +1,4 @@ -#include "buildings.h" +#include "building_factory.h" #include "components.h" #include "entity_factory.h" diff --git a/game/buildings.h b/game/building_factory.h similarity index 81% rename from game/buildings.h rename to game/building_factory.h index 418917a..0308311 100644 --- a/game/buildings.h +++ b/game/building_factory.h @@ -1,5 +1,5 @@ -#ifndef PIXELDEFENSE_BUILDINGS_H -#define PIXELDEFENSE_BUILDINGS_H +#ifndef PIXELDEFENSE_BUILDING_FACTORY_H +#define PIXELDEFENSE_BUILDING_FACTORY_H #include #include @@ -19,4 +19,4 @@ bool canAffordBuilding(BuildingType type, PlayerResources res); Vector2 getPositionNearBuilding(ecs_entity_t building, Vector2 fromPos); -#endif //PIXELDEFENSE_BUILDINGS_H +#endif //PIXELDEFENSE_BUILDING_FACTORY_H diff --git a/game/main.c b/game/main.c index 801d20e..e0ea045 100644 --- a/game/main.c +++ b/game/main.c @@ -10,7 +10,7 @@ #include "input.h" #include "map_init.h" #include "map_layers.h" -#include "buildings.h" +#include "building_factory.h" #include "ui_widgets.h" #include "utils.h" diff --git a/game/map_init.c b/game/map_init.c index 2153509..8f79e51 100644 --- a/game/map_init.c +++ b/game/map_init.c @@ -2,7 +2,7 @@ #include -#include "buildings.h" +#include "building_factory.h" #include "components.h" #include "entity_factory.h" #include "game_state.h" diff --git a/game/systems/s_input.c b/game/systems/s_input.c index a249897..2cb3fc3 100644 --- a/game/systems/s_input.c +++ b/game/systems/s_input.c @@ -2,7 +2,7 @@ #include "../game_state.h" #include "../input.h" -#include "../buildings.h" +#include "../building_factory.h" #include "../pathfinding.h" #include diff --git a/game/systems/s_ui.c b/game/systems/s_ui.c index 1c1e7ca..8d8c0d3 100644 --- a/game/systems/s_ui.c +++ b/game/systems/s_ui.c @@ -4,7 +4,7 @@ #include "../input.h" #include "../map_init.h" #include "../ui_widgets.h" -#include "../buildings.h" +#include "../building_factory.h" #include "../utils.h" #include "../entity_factory.h" @@ -189,7 +189,8 @@ void drawGameUI(Game *game, f32 dt) { (building.pos.x + building.size.x * 0.5f) * 16.0f, (building.pos.y + building.size.y + 0.5f) * 16.0f }; - //placePos = GetWorldToScreen2D(placePos, game->camera); + placePos.x += GetRandomValue(-16, 16); + placePos.y += GetRandomValue(-4, 4); PlayerResources playerRes = game->playerResources[game->player]; switch (building.type) { case BUILDING_KEEP: {