aboutsummaryrefslogtreecommitdiff
path: root/src/world.odin
diff options
context:
space:
mode:
Diffstat (limited to 'src/world.odin')
-rw-r--r--src/world.odin7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/world.odin b/src/world.odin
index d9848c6..85a85f0 100644
--- a/src/world.odin
+++ b/src/world.odin
@@ -13,11 +13,13 @@ object_spawners := [Object_Type]Object_Spawner{
.Player_Spawn = object_spawner_player_spawn,
.Collision = object_spawner_collision,
.Upgrade = object_spawner_upgrade,
+ .Prop = object_spawner_prop,
}
room_open_cb := []Room_Change_Callback{
on_room_open_platforms,
on_room_open_bullets,
+ on_room_open_props,
}
room_close_cb := []Room_Change_Callback{
@@ -96,9 +98,8 @@ open_room :: proc(id: Room_Id) -> bool {
draw_room :: proc(id: Room_Id) {
draw_tile :: proc(x: i32, y: i32, tile_id: u32) {
tile := tiles[tile_id]
- tileset := tilesets[tile.tileset]
rl.DrawTexturePro(
- get_image(tileset.image),
+ get_image(tile.image),
rl.Rectangle {
x = f32(tile.rect.start.x),
y = f32(tile.rect.start.y),
@@ -131,7 +132,7 @@ iterate_room_tiles :: proc(id: Room_Id, callback: Room_Iterate_Callback) {
for cell, i in layer {
if cell > 0 {
- callback(x, y, cell - 1)
+ callback(x, y, cell)
}
x += room.tile_width