Added a ton of new sprite options

mcgrew · Jul 30, 2018 · 593b523 · 593b523
1 parent edc3ea7
commit 593b523
Show file tree

Hide file tree

Showing 5 changed files with 2,496 additions and 89 deletions.
diff --git a/cli/main.c b/cli/main.c
@@ -48,7 +48,11 @@ static void print_usage(const char *command, char *default_flags)
     printf("\n");
     printf("Sprite should be one of: ");
     for(i=0; i < sizeof(dwr_sprite_names) / sizeof(char *); i++) {
-        printf("%s ", dwr_sprite_names[i]);
+        if (i) {
+            printf(", %s", dwr_sprite_names[i]);
+        } else {
+            printf("%s", dwr_sprite_names[i]);
+        }
     }
     printf("\n");
 }

diff --git a/common/build.h b/common/build.h
@@ -1,2 +1,2 @@
 /* This file is generated by git */
-#define BUILD "346"
+#define BUILD "347"
diff --git a/common/map.c b/common/map.c
@@ -407,16 +407,16 @@ static uint8_t place_tantegel(dw_map *map, int largest, int next)
 
     map->love_calc->x = x;
     map->love_calc->y = y;
-    if (tile_is_walkable(map->tiles[x][y+1])) { 
+    if (y < 119 && tile_is_walkable(map->tiles[x][y+1])) { 
         map->return_point->x = x;
         map->return_point->y = y+1;
-    } else if (tile_is_walkable(map->tiles[x][y-1])) { 
+    } else if (y > 0 && tile_is_walkable(map->tiles[x][y-1])) { 
         map->return_point->x = x;
         map->return_point->y = y-1;
-    } else if (tile_is_walkable(map->tiles[x-1][y])) { 
+    } else if (x > 0 && tile_is_walkable(map->tiles[x-1][y])) { 
         map->return_point->x = x-1;
         map->return_point->y = y;
-    } else if (tile_is_walkable(map->tiles[x+1][y])) { 
+    } else if (x < 119 && tile_is_walkable(map->tiles[x+1][y])) { 
         map->return_point->x = x+1;
         map->return_point->y = y;
     }