diff --git a/Engine/headers/game.h b/Engine/headers/game.h index cd37916..b63f718 100644 --- a/Engine/headers/game.h +++ b/Engine/headers/game.h @@ -24,14 +24,15 @@ private: CommandParser parser; nlohmann::json json; fs::path filePath = "Resources/Rooms.json"; - std::ifstream stream; + // Likely need to make sure Player is ADDED to room + // We want player and objects to exist IN room + Room currentRoom; + public: Game(); - static bool GetIsActive() { return isActive; } - bool Init(); void ChangeRoom(Direction dir); void Run(); diff --git a/main.cpp b/main.cpp index 5f5cbff..6069beb 100644 --- a/main.cpp +++ b/main.cpp @@ -1,13 +1,9 @@ -#include -#include -#include - #include "game.h" int main(int argc, char *argv[]) { - Game game; // Calls default constructor which Initalizes GAME + Game game; // Calls default constructor which Initializes GAME - while (game.GetIsActive()) { + while (Game::GetIsActive()) { game.Run(); }