diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset_defs.c | 6 | ||||
| -rw-r--r-- | src/map.c | 8 |
2 files changed, 13 insertions, 1 deletions
diff --git a/src/asset_defs.c b/src/asset_defs.c index 5d4b2cd..38cddd4 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -119,6 +119,12 @@ void load_assets() { // Assets loaded at match start. img_tile_funk = assets_load_image_from_file("data/imgs/tiles/tile_funk.png"); img_tile_wood1 = assets_load_image_from_file("data/imgs/tiles/tile_wood1.png"); img_tile_gym = assets_load_image_from_file("data/imgs/tiles/tile_gym.png"); + img_tile_flowers = assets_load_image_from_file("data/imgs/tiles/tile_flowers.png"); + img_tile_carpet1 = assets_load_image_from_file("data/imgs/tiles/tile_carpet1.png"); + img_tile_carpet2 = assets_load_image_from_file("data/imgs/tiles/tile_carpet2.png"); + img_tile_carpet3 = assets_load_image_from_file("data/imgs/tiles/tile_carpet3.png"); + img_tile_carpet4 = assets_load_image_from_file("data/imgs/tiles/tile_carpet4.png"); + img_tile_carpet5 = assets_load_image_from_file("data/imgs/tiles/tile_carpet5.png"); // sounds wav_throwable_bounce = Mix_LoadWAV("data/sounds/throwable_bounce.wav"); @@ -384,7 +384,7 @@ bool is_in_bounds(float x, float y) { } image* get_image_from_tiletype(tile_type tile) { - switch (tile) + switch (tile) // @NEWTILE { case TILE_FLOOR1: return img_tile_floor1; case TILE_FLOOR2: return img_tile_floor2; @@ -392,6 +392,12 @@ image* get_image_from_tiletype(tile_type tile) { case TILE_FUNK: return img_tile_funk; case TILE_WOOD1: return img_tile_wood1; case TILE_GYM: return img_tile_gym; + case TILE_FLOWERS: return img_tile_flowers; + case TILE_CARPET1: return img_tile_carpet1; + case TILE_CARPET2: return img_tile_carpet2; + case TILE_CARPET3: return img_tile_carpet3; + case TILE_CARPET4: return img_tile_carpet4; + case TILE_CARPET5: return img_tile_carpet5; default: return 0; } } |