NEW ASSET SYSTEM WOOOOOOOOHOOOOOOOOOOOOOOOOOOOOOOOOO

1 files changed, 10 insertions, 5 deletions

diff --git a/src/main.odin b/src/main.odin
index 508f97c..bed9861 100644
--- a/src/main.odin
+++ b/src/main.odin
@@ -9,12 +9,13 @@ import "base:runtime"
 import "core:log"
 import "core:fmt"
 import "core:mem"
+import os "core:os/os2"
 
 import rl "vendor:raylib"
 
 import "draw"
 import "phys"
-import "tiled"
+// import "tiled"
 
 Vec2 :: [2]f32
 
@@ -55,6 +56,11 @@ logger: log.Logger
 //   }
 // }
 
+die :: proc(msg: string, args: ..any, #any_int exit_code := 1) {
+  log.fatalf(msg, args)
+  os.exit(exit_code)
+}
+
 init :: proc() {
   state.camera.zoom = 1
   // state.camera.offset = {draw.SCREEN_WIDTH/2, draw.SCREEN_HEIGHT/2}
@@ -71,8 +77,7 @@ init :: proc() {
   // }
   // state.room = room
 
-  tiled.load_world("res/map.world")
-  tiled.open_new_room_at({0, 0})
+  open_room(.ROOM_BEGIN)
 
   setup_map_collisions()
 }
@@ -85,7 +90,7 @@ frame :: proc() {
   rl.BeginMode2D(state.camera)
 
   draw_player()
-  tiled.draw_map(tiled.current_room.tmap)
+  draw_room(current_room.id)
   // draw_platforms()
 
   rl.EndMode2D()
@@ -102,7 +107,6 @@ frame :: proc() {
 cleanup :: proc() {
   delete_player()
   delete_entity_list(state.platform_list)
-  tiled.delete_world()
   phys.destroy_world()
 }
 
@@ -159,3 +163,4 @@ main :: proc() {
 
   cleanup()
 }
+