Don't filter out empty rooms early 🫗.

gmarty · Apr 26, 2024 · 072f3af · 072f3af
1 parent 60ae977
commit 072f3af
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/src/components/RoomsList.js b/src/components/RoomsList.js
@@ -5,7 +5,12 @@ const RoomsList = ({ rooms, currentId }) => {
   return (
     <>
       <ColumnListHeader>Rooms</ColumnListHeader>
-      {rooms.map(({ metadata }) => {
+      {rooms.map(({ metadata, header }) => {
+        if (!header) {
+          // Some rooms are empty.
+          return null;
+        }
+
         const selected = metadata.id === currentId;
         const path = `/rooms/${metadata.id}`;
         const label = `Room ${metadata.id}`;

diff --git a/src/containers/RoomsContainer.js b/src/containers/RoomsContainer.js
@@ -48,6 +48,10 @@ const RoomsContainer = ({ rooms, roomgfx }) => {
     setSelectedObjects(newSelectedObjects);
   };
 
+  if (room && !room.header) {
+    return null;
+  }
+
   return (
     <>
       <PrimaryColumn>

diff --git a/src/lib/parseRom.js b/src/lib/parseRom.js
@@ -10,10 +10,6 @@ const parseRom = (arrayBuffer, res) => {
   for (let i = 0; i < res?.rooms?.length; i++) {
     const [offset, length] = res.rooms[i];
 
-    if (length === 0) {
-      continue;
-    }
-
     const buffer = arrayBuffer.slice(offset, offset + length);
     const item = parseRooms(buffer, i, offset, res.characters);
     item.buffer = buffer;

diff --git a/src/lib/parseRooms.js b/src/lib/parseRooms.js
@@ -10,6 +10,10 @@ const parseRooms = (arrayBuffer, i = 0, offset = 0, characters = {}) => {
     size: arrayBuffer.byteLength,
   };
 
+  if (arrayBuffer.byteLength === 0) {
+    return { metadata };
+  }
+
   const chunkSize = parser.getUint16(); // Room res size
 
   assert(