From db2cb3aeea885cf07bbb1a4dea57f0b0ea82735c Mon Sep 17 00:00:00 2001
From: Timothy O'Barr <tobarr@google.com>
Date: Tue, 18 Aug 2026 11:59:09 -0500
Subject: [PATCH] Parse Rooms and added proper room JSON

---
 .idea/editor.xml      | 42 +++++++++++++------------
 Engine/headers/room.h |  1 -
 Engine/src/game.cpp   |  9 +-----
 Engine/src/room.cpp   |  8 ++---
 Resources/Rooms.json  | 72 +++++++++++++++++++------------------------
 main.cpp              | 10 +++---
 6 files changed, 63 insertions(+), 79 deletions(-)

diff --git a/.idea/editor.xml b/.idea/editor.xml
index 7bb5dec..451df98 100644
--- a/.idea/editor.xml
+++ b/.idea/editor.xml
@@ -26,26 +26,27 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConditionalExpressionCanBeSimplified/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstParameterInDeclaration/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstValueFunctionReturnType/@EntryIndexedValue" value="SUGGESTION" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppConstexprIfDiscardedBranch/@EntryIndexedValue" value="HINT" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppCoroutineCallResolveError/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAArrayIndexOutOfBounds/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantConditions/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantFunctionResult/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantParameter/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFADeletedPointer/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAEndlessLoop/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInfiniteRecursion/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInvalidatedMemory/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesFunction/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesScope/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALoopConditionNotUpdated/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAMemoryLeak/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANotInitializedField/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANullDereference/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFATimeOver/@EntryIndexedValue" value="HINT" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableCode/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableFunctionCall/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreadVariable/@EntryIndexedValue" value="WARNING" type="string" />
-    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnusedValue/@EntryIndexedValue" value="WARNING" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAArrayIndexOutOfBounds/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantConditions/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantFunctionResult/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAConstantParameter/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFADeletedPointer/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAEndlessLoop/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInfiniteRecursion/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAInvalidatedMemory/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesFunction/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALocalValueEscapesScope/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFALoopConditionNotUpdated/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAMemoryLeak/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANotInitializedField/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFANullDereference/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFATimeOver/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableCode/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreachableFunctionCall/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnreadVariable/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDFAUnusedValue/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesLocal/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationHidesUncapturedLocal/@EntryIndexedValue" value="HINT" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppDeclarationSpecifierWithoutDeclarators/@EntryIndexedValue" value="WARNING" type="string" />
@@ -191,6 +192,7 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantTypenameKeyword/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantVoidArgumentList/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRedundantZeroInitializerInAggregateInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReferenceToOverriddenVirtualFunction/@EntryIndexedValue" value="WARNING" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReinterpretCastFromVoidPtr/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppRemoveRedundantBraces/@EntryIndexedValue" value="DO_NOT_SHOW" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppReplaceMemsetWithZeroInitialization/@EntryIndexedValue" value="SUGGESTION" type="string" />
@@ -224,9 +226,11 @@
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAssociativeContains/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAuto/@EntryIndexedValue" value="HINT" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseAutoForNumeric/@EntryIndexedValue" value="HINT" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseDesignatedInitializers/@EntryIndexedValue" value="HINT" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseElementsView/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseEraseAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseFamiliarTemplateSyntaxForGenericLambdas/@EntryIndexedValue" value="SUGGESTION" type="string" />
+    <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseInternalLinkage/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseRangeAlgorithm/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStdSize/@EntryIndexedValue" value="SUGGESTION" type="string" />
     <option name="/Default/CodeInspection/Highlighting/InspectionSeverities/=CppUseStructuredBinding/@EntryIndexedValue" value="HINT" type="string" />
diff --git a/Engine/headers/room.h b/Engine/headers/room.h
index 6477495..0948380 100644
--- a/Engine/headers/room.h
+++ b/Engine/headers/room.h
@@ -24,7 +24,6 @@ private:
     std::string name;
     std::string description;
     std::vector<Exit> exits;
-    std::vector<std::unique_ptr<Object>> objects;
 
 public:
     Room();
diff --git a/Engine/src/game.cpp b/Engine/src/game.cpp
index a01835d..14a8a41 100644
--- a/Engine/src/game.cpp
+++ b/Engine/src/game.cpp
@@ -20,14 +20,7 @@ bool Game::Init() {
     stream.open(absolute(filePath));
     json = nlohmann::json::parse(stream);
 
-    // rooms = json.get<std::vector<std::vector<Room>>>();
-    auto &roomData = json["rooms"];
-    for (const auto &roomCol: rooms) {
-        for (const auto &roomRow: roomCol) {
-            // rooms.push_back(roomRow.get<Room>());
-        }
-    }
-
+    rooms = json.get<std::vector<std::vector<Room>>>();
     player.Init();
     parser = CommandParser();
 
diff --git a/Engine/src/room.cpp b/Engine/src/room.cpp
index 5c9ec6a..983cd0b 100644
--- a/Engine/src/room.cpp
+++ b/Engine/src/room.cpp
@@ -34,18 +34,16 @@ void Room::Print() const {
 }
 
 
-inline void from_json(const json &j, Exit &e) {
+void from_json(const json &j, Exit &e) {
     j.at("exitID").get_to(e.exitID);
     j.at("dir").get_to(e.dir);
     j.at("isLocked").get_to(e.isLocked);
 }
 
-inline void to_json(json &j, const Exit &e) {
-    j = json{{"exitID", e.exitID}, {"dir", e.dir}, {"isLocked", e.isLocked}};
-}
+void to_json(json &j, const Exit &e) { j = json{{"exitID", e.exitID}, {"dir", e.dir}, {"isLocked", e.isLocked}}; }
 
 
-inline void from_json(const json &j, Room &r) {
+void from_json(const json &j, Room &r) {
     j.at("id").get_to(r.id);
     j.at("name").get_to(r.name);
     j.at("description").get_to(r.description);
diff --git a/Resources/Rooms.json b/Resources/Rooms.json
index d7fed3f..26979c1 100644
--- a/Resources/Rooms.json
+++ b/Resources/Rooms.json
@@ -1,45 +1,35 @@
-{
-  "rooms": [
+[
     [
-      {
-        "id": 0,
-        "name": "Test Room 1",
-        "description": "A fascinating Room. There's ... nothing in it, neat.",
-        "exits": [
-          {
-            "exitID": 1,
-            "dir": "E",
-            "isLocked": false
-          },
-          {
-            "exitID": 2,
-            "dir": "S",
-            "isLocked": false
-          }
-        ]
-      },
-      {
-        "id": 1,
-        "name": "Test Room 2",
-        "description": "Another test room. What a shocker",
-        "exits": [
-          {}
-        ]
-      }
+        {
+            "description": "A fascinating Room. There's ... nothing in it, neat.",
+            "exits": [
+                {
+                    "dir": 2,
+                    "exitID": 1,
+                    "isLocked": false
+                },
+                {
+                    "dir": 1,
+                    "exitID": 2,
+                    "isLocked": false
+                }
+            ],
+            "id": -8528,
+            "name": "Test Room 1"
+        },
+        {
+            "description": "Another test room. What a shocker",
+            "exits": [],
+            "id": -8608,
+            "name": "Test Room 2"
+        }
     ],
     [
-      {
-        "id": 6,
-        "name": "Test Room 3",
-        "description": "Testing another column",
-        "exits": [
-          {
-            "exitID": 0,
-            "dir": "S",
-            "isLocked": false
-          }
-        ]
-      }
+        {
+            "description": "Testing another column",
+            "exits": [],
+            "id": -8656,
+            "name": "Test Room 3"
+        }
     ]
-  ]
-}
\ No newline at end of file
+]
diff --git a/main.cpp b/main.cpp
index 628e70b..5f5cbff 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,14 +1,14 @@
+#include <fstream>
+#include <ios>
 #include <iostream>
 
 #include "game.h"
 
 int main(int argc, char *argv[]) {
-    Game game;
+    Game game; // Calls default constructor which Initalizes GAME
 
-    if (game.Init()) {
-        while (game.GetIsActive()) {
-            game.Run();
-        }
+    while (game.GetIsActive()) {
+        game.Run();
     }
 
     return 0;