fixed dunger build, added current cell coordinates readout

[vrlugburz] / src / level.c

diff --git a/src/level.c b/src/level.c
index 70af648..566b1c3 100644 (file)
--- a/src/level.c
+++ b/src/level.c
@@ -10,12 +10,15 @@ static int load_tileset(struct level *lvl, struct ts_node *tsn);
 
 int init_level(struct level *lvl, int xsz, int ysz)
 {
+       memset(lvl, 0, sizeof *lvl);
+
        if(!(lvl->cells = calloc(xsz * ysz, sizeof *lvl->cells))) {
                free(lvl);
                return -1;
        }
        lvl->width = xsz;
        lvl->height = ysz;
+       lvl->cell_size = DEF_CELL_SIZE;
        return 0;
 }
 
@@ -32,10 +35,13 @@ int load_level(struct level *lvl, const char *fname)
        struct ts_node *ts, *node, *iter;
        int i, j, sz, cx, cy;
        struct cell *cell;
+       float *vecptr;
 
        lvl->fname = strdup(fname);
        if((lvl->dirname = malloc(strlen(fname) + 1))) {
+#ifndef LEVEL_EDITOR
                path_dir(lvl->fname, lvl->dirname);
+#endif
        }
 
        if(!(ts = ts_load(fname))) {
@@ -57,6 +63,12 @@ int load_level(struct level *lvl, const char *fname)
                ts_free_tree(ts);
                return -1;
        }
+       lvl->cell_size = ts_get_attr_num(ts, "cellsize", DEF_CELL_SIZE);
+
+       if((vecptr = ts_get_attr_vec(ts, "player", 0))) {
+               lvl->px = vecptr[0];
+               lvl->py = vecptr[1];
+       }
 
        iter = ts->child_list;
        while(iter) {
@@ -184,9 +196,11 @@ err:
        return -1;
 }
 
+#ifndef LEVEL_EDITOR
+
 static int load_tileset(struct level *lvl, struct ts_node *tsn)
 {
-       static const char *tile_types[] = {"straight", "corner", "door", 0};
+       static const char *tile_types[] = {"empty", "straight", "corner", "door", 0};
 
        int i;
        char *path;
@@ -237,11 +251,11 @@ static int load_tileset(struct level *lvl, struct ts_node *tsn)
        return 0;
 }
 
-struct tile *find_level_tile(struct level *lvl, const char *tname)
+struct tile *find_level_tile(struct level *lvl, int type)
 {
        struct tile *tile = lvl->tiles;
        while(tile) {
-               if(strcmp(tile->name, tname) == 0) {
+               if(tile->type == type) {
                        return tile;
                }
                tile = tile->next;
@@ -257,9 +271,7 @@ int gen_cell_geom(struct level *lvl, struct cell *cell)
        struct mesh *mesh, *tmesh;
        float xform[16];
 
-       printf("foo!\n");
-
-       if(!(tstr = find_level_tile(lvl, "straight"))) {
+       if(!(tstr = find_level_tile(lvl, TILE_STRAIGHT))) {
                return -1;
        }
 
@@ -318,6 +330,7 @@ int gen_level_geom(struct level *lvl)
                        cell = lvl->cells + i * lvl->width + j;
                        if(cell->type != CELL_SOLID) {
                                if(gen_cell_geom(lvl, cell) == -1) {
+                                       printf("failed to generate cell\n");
                                        return -1;
                                }
                        }
@@ -325,3 +338,12 @@ int gen_level_geom(struct level *lvl)
        }
        return 0;
 }
+
+#else
+
+static int load_tileset(struct level *lvl, struct ts_node *tsn)
+{
+       return 0;               /* in the level editor we don't need tileset loading */
+}
+
+#endif /* !LEVEL_EDITOR */