diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/asset_defs.c | 9 | ||||
| -rw-r--r-- | src/editor.c | 3 | ||||
| -rw-r--r-- | src/map.c | 4 | ||||
| -rw-r--r-- | src/objects.c | 6 |
4 files changed, 20 insertions, 2 deletions
diff --git a/src/asset_defs.c b/src/asset_defs.c index 390bf94..7fff980 100644 --- a/src/asset_defs.c +++ b/src/asset_defs.c @@ -62,6 +62,9 @@ void load_assets() { img_big_control_panel = assets_load_image_from_file("data/imgs/objects/big_control_panel.png"); img_computer_rack = assets_load_image_from_file("data/imgs/objects/computer_rack.png"); img_generator = assets_load_image_from_file("data/imgs/objects/generator.png"); + img_school_bench = assets_load_image_from_file("data/imgs/objects/school_bench.png"); + img_school_table = assets_load_image_from_file("data/imgs/objects/school_table.png"); + img_locker = assets_load_image_from_file("data/imgs/objects/locker.png"); // Players img_gunner_black_run = assets_load_image_from_file("data/imgs/players/Black/Gunner_Black_Run.png"); @@ -96,11 +99,15 @@ void load_assets() { img_zombie_chunk_foot = assets_load_image_from_file("data/imgs/zombie_chunk_foot.png"); img_zombie_chunk_blood = assets_load_image_from_file("data/imgs/zombie_chunk_blood.png"); - // Tiles + // Tiles // @NEWTILE img_mars_surface = assets_load_image_from_file("data/imgs/tiles/mars_surface.png"); img_tile_floor1 = assets_load_image_from_file("data/imgs/tiles/floor1.png"); img_tile_floor2 = assets_load_image_from_file("data/imgs/tiles/floor2.png"); img_space_parallax = assets_load_image_from_file("data/imgs/tiles/space_parallax.png"); + img_tile_bathroom = assets_load_image_from_file("data/imgs/tiles/bathroom.png"); + 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"); // sounds wav_throwable_bounce = Mix_LoadWAV("data/sounds/throwable_bounce.wav"); diff --git a/src/editor.c b/src/editor.c index 050d762..9295d14 100644 --- a/src/editor.c +++ b/src/editor.c @@ -40,7 +40,8 @@ static void update_tile_editor(platform_window* window) { case PLACING_TILE: if (is_left_down()) { map_to_load.tiles[pos.y][pos.x] = tile_to_place; - load_mapdata_into_world(); + loaded_map.heightmap[pos.y][pos.x].type = tile_to_place; + //load_mapdata_into_world(); printf("%d %d\n", pos.x, pos.y); } break; @@ -388,6 +388,10 @@ image* get_image_from_tiletype(tile_type tile) { { case TILE_FLOOR1: return img_tile_floor1; case TILE_FLOOR2: return img_tile_floor2; + case TILE_BATHROOM: return img_tile_bathroom; + case TILE_FUNK: return img_tile_funk; + case TILE_WOOD1: return img_tile_wood1; + case TILE_GYM: return img_tile_gym; default: return 0; } } diff --git a/src/objects.c b/src/objects.c index db0295d..14d10d8 100644 --- a/src/objects.c +++ b/src/objects.c @@ -131,6 +131,12 @@ image* get_image_from_objecttype(object_type tile) { return img_computer_rack; case OBJECT_GENERATOR: return img_generator; + case OBJECT_SCHOOL_BENCH: + return img_school_bench; + case OBJECT_SCHOOL_TABLE: + return img_school_table; + case OBJECT_LOCKER: + return img_locker; default: return 0; } |