From 60e8054ce8ac29908b0fcefe20d0cea506f7be29 Mon Sep 17 00:00:00 2001
From: Bill Rossi <bassguitarbill@gmail.com>
Date: Sat, 7 Jun 2025 08:50:37 -0400
Subject: [PATCH] Ok RoomObjects are now actually actors

---
 src/game.js | 8 ++++++--
 src/room.js | 1 -
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/game.js b/src/game.js
index 2aa65ab..a8fc7c7 100644
--- a/src/game.js
+++ b/src/game.js
@@ -27,10 +27,15 @@ export default class Game {
   }
 
   start() {
-    this.currentRoom = this.assets.get("sampleRoom")
+    this.loadRoom(this.assets.get("sampleRoom"))
     requestAnimationFrame(this.loop.bind(this))
   }
 
+  loadRoom(room) {
+    this.currentRoom = room
+    this.currentRoom.objects.forEach(roomObject => this.actors.push(roomObject))
+  }
+
   loop(timestamp) {
     const dt = timestamp - this.timestamp
     this.timestamp = timestamp
@@ -42,7 +47,6 @@ export default class Game {
 
   tick(dt) {
     this.actors.forEach(actor => actor.tick(dt))
-    this.currentRoom.tick(dt)
     Object.values(this.events).forEach(e => e.nextFrame())
   }
 
diff --git a/src/room.js b/src/room.js
index be115a0..06fa384 100644
--- a/src/room.js
+++ b/src/room.js
@@ -31,7 +31,6 @@ export default class Room {
 
   draw(ctx) {
     this.json.layers.forEach(this.drawLayer.bind(this, ctx))
-    this.objects.forEach(object => object.draw(ctx))
   }
 
   drawLayer(ctx, layer) {