almost done with the level reorganization

[vrlugburz] / src / level.h

diff --git a/src/level.h b/src/level.h
index dd1c988..d1e9931 100644 (file)
--- a/src/level.h
+++ b/src/level.h
@@ -2,14 +2,18 @@
 #define LEVEL_H_
 
 #include "scenefile.h"
+#include "tileset.h"
 
 #define DEF_CELL_SIZE  3.0f
 
 enum {
-       TILE_EMPTY,
-       TILE_STRAIGHT,
+       TILE_OPEN,
+       TILE_STR,
        TILE_CORNER,
-       TILE_DOOR
+       TILE_TEE,
+       TILE_CROSS,
+       TILE_STR2OPEN,
+       TILE_STROPEN
 };
 
 enum {
@@ -21,15 +25,19 @@ enum {
 struct tile {
        char *name;
        int type;
-       struct scenefile scn;
+
+       struct meshgroup mgrp;
+
        struct tile *next;
 };
 
 struct cell {
        int type;
+       int tiletype, tilerot;
        int wall[4];
        int floor, ceil;
 
+       struct tile *tile;
        struct meshgroup *mgrp;
        int num_mgrp;
 
@@ -44,7 +52,7 @@ struct level {
        float cell_size;
        struct cell *cells;
 
-       struct tile *tiles;
+       struct tileset *tset;
 
        /* meshes owned by the level, constructed during geometry generation or
         * loaded, excluding meshes in tiles scenefiles