X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=vrlugburz;a=blobdiff_plain;f=src%2Flevel.h;fp=src%2Flevel.h;h=3a31af67d5ac51df1778529f20eedff1199938a4;hp=dd1c9881857c16dc6ad4d287b42347aed03a3090;hb=7a1a5aa446fcf3d2b0bb26f6f7465e4f3d116e47;hpb=8c3ae60742d38e2dbcd9811b16966933df0a5c29

diff --git a/src/level.h b/src/level.h
index dd1c988..3a31af6 100644
--- a/src/level.h
+++ b/src/level.h
@@ -6,10 +6,12 @@
 #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
 };
 
 enum {
@@ -21,7 +23,6 @@ enum {
 struct tile {
 	char *name;
 	int type;
-	struct scenefile scn;
 	struct tile *next;
 };
 
@@ -44,7 +45,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