A bit of cleanup

[shadowclad.git] / src / game / level.h

diff --git a/src/game/level.h b/src/game/level.h
index 4d6992ede5631eabcc79fb5190732e1ea75194d7..097b73acdda82744d0ae81ef70f4d1f43b384292 100644 (file)
--- a/src/game/level.h
+++ b/src/game/level.h
@@ -4,40 +4,32 @@
 #include <stdint.h>
 
 #include "engine/asset.h"
-#include "engine/tga.h"
 
-typedef enum {
+enum BlockType {
        BLOCKTYPE_SPACE,
        BLOCKTYPE_OBSTACLE_X,
        BLOCKTYPE_OBSTACLE_Z,
        BLOCKTYPE_OBSTACLE
-} BlockType;
+};
 
-typedef struct {
-       const BlockType type;
+typedef enum BlockType BlockType;
+typedef struct Block Block;
+typedef struct BlockGrid BlockGrid;
+
+struct Block {
+       BlockType type;
        const Solid* solid;
-} Block;
+};
 
-typedef struct {
+struct BlockGrid {
        size_t width;
        size_t depth;
        Block** blocks;
-} BlockGrid;
-
-#define BLOCKGRID_CELL_SIZE 2.5f
+};
 
 extern BlockGrid levelGrid;
 
 void initLevel();
 void startLevel();
-void buildLevelFromImage(TgaImage* image);
-
-static inline Block* getBlockFromGrid(BlockGrid grid, size_t x, size_t z) {
-       return grid.blocks[(z * grid.width) + x];
-}
-
-static inline void setBlockInGrid(BlockGrid grid, size_t x, size_t z, Block* block) {
-       grid.blocks[(z * grid.width) + x] = block;
-}
 
 #endif // LEVEL_H_