summaryrefslogtreecommitdiff
path: root/src/game/assets.cpp
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2017-12-19 19:27:06 +0100
committerPaweł Redman <pawel.redman@gmail.com>2017-12-19 19:27:06 +0100
commit297524c8ec41b585c4812494791772406653e479 (patch)
tree40e91994daeb073051e7b3f40465f76b9f54ed36 /src/game/assets.cpp
parentbbed2cb38638e51bc19a50464ec818ea96524c2c (diff)
Introduce tall tiles.
Some features are still missing but the commit is large enough as it is. TODO: render layers and fix minor artifacts.
Diffstat (limited to 'src/game/assets.cpp')
-rw-r--r--src/game/assets.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/game/assets.cpp b/src/game/assets.cpp
index 1bc8948..046934b 100644
--- a/src/game/assets.cpp
+++ b/src/game/assets.cpp
@@ -38,11 +38,11 @@ void load(void)
unit_selected.load("assets/units/selected_", 1);
world::register_tile(TILE_DIRT, 0);
- render::register_tile(TILE_DIRT, "assets/tiles/dirt.png");
+ render::register_tile(TILE_DIRT, "assets/tiles/dirt.png", NULL, 0.0f);
world::register_tile(TILE_STONE, CF_SOLID);
- render::register_tile(TILE_STONE, "assets/tiles/stone.png");
+ render::register_tile(TILE_STONE, "assets/tiles/stone.png", "assets/tiles/stone_side.png", 1.0f);
world::register_tile(TILE_WATER, CF_WATER);
- render::register_tile(TILE_WATER, "assets/tiles/water.png");
+ render::register_tile(TILE_WATER, "assets/tiles/water.png", NULL, 0.0f);
}
} // namespace game::assets