summaryrefslogtreecommitdiffstats
path: root/src/GameState.hpp
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-01-27 06:10:33 +0100
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2019-01-27 06:10:33 +0100
commite2479261c56c8d1a64b51ad4f084ad3c18505359 (patch)
tree5256688eaec174cebdcf873f5247ece28ec45b9c /src/GameState.hpp
parentAdded slow GameState sync (diff)
downloadAltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.tar
AltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.tar.gz
AltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.tar.bz2
AltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.tar.lz
AltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.tar.xz
AltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.tar.zst
AltCraft-e2479261c56c8d1a64b51ad4f084ad3c18505359.zip
Diffstat (limited to 'src/GameState.hpp')
-rw-r--r--src/GameState.hpp19
1 files changed, 5 insertions, 14 deletions
diff --git a/src/GameState.hpp b/src/GameState.hpp
index dbea2c3..41e7080 100644
--- a/src/GameState.hpp
+++ b/src/GameState.hpp
@@ -68,8 +68,6 @@ class GameState {
Window playerInventory;
std::vector<Window> openedWindows;
-
- std::mutex accessMutex;
public:
void Update(float deltaTime);
@@ -95,37 +93,30 @@ public:
glm::mat4 GetViewMatrix();
inline Entity *GetPlayer() {
- std::lock_guard<std::mutex> guard(accessMutex);
return player;
}
- inline World GetWorld() {
- std::lock_guard<std::mutex> guard(accessMutex);
+ inline World &GetWorld() {
return world;
}
- inline TimeStatus GetTimeStatus() {
- std::lock_guard<std::mutex> guard(accessMutex);
+ inline TimeStatus &GetTimeStatus() {
return timeStatus;
}
- inline GameStatus GetGameStatus() {
- std::lock_guard<std::mutex> guard(accessMutex);
+ inline GameStatus &GetGameStatus() {
return gameStatus;
}
- inline PlayerStatus GetPlayerStatus() {
- std::lock_guard<std::mutex> guard(accessMutex);
+ inline PlayerStatus &GetPlayerStatus() {
return playerStatus;
}
- inline SelectionStatus GetSelectionStatus() {
- std::lock_guard<std::mutex> guard(accessMutex);
+ inline SelectionStatus &GetSelectionStatus() {
return selectionStatus;
}
inline Window &GetInventory() {
- std::lock_guard<std::mutex> guard(accessMutex);
return playerInventory;
}
};