Wip: Working on room movements, player location in room, and data storage
This commit is contained in:
@@ -28,10 +28,8 @@ private:
|
||||
std::ifstream stream;
|
||||
bool isActive;
|
||||
|
||||
|
||||
inline static Game *game_;
|
||||
|
||||
|
||||
// Likely need to make sure Player is ADDED to room
|
||||
// We want player and objects to exist IN room
|
||||
Room currentRoom;
|
||||
@@ -44,7 +42,7 @@ public:
|
||||
void Run();
|
||||
bool Save();
|
||||
|
||||
void ChangeRoom(Room r);
|
||||
void ChangeRoom(const Room &r);
|
||||
Room GetCurrentRoom() { return currentRoom; }
|
||||
|
||||
inline bool operator!() const {
|
||||
@@ -64,9 +62,7 @@ public:
|
||||
return *game_;
|
||||
}
|
||||
|
||||
static void SetGameInstance(Game * g) {
|
||||
game_ = g;
|
||||
}
|
||||
static void SetGameInstance(Game *g) { game_ = g; }
|
||||
|
||||
~Game();
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user