diff options
| author | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-08-19 17:20:51 +0200 |
|---|---|---|
| committer | LaG1924 <12997935+LaG1924@users.noreply.github.com> | 2017-08-19 17:20:51 +0200 |
| commit | f24107368fa47f911f4491f644ff3755525c91e1 (patch) | |
| tree | 02dc3583ed82d81139b17191af9a9bfae40c45a9 /src/GameState.cpp | |
| parent | 2017-08-18 (diff) | |
| download | AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.tar AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.tar.gz AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.tar.bz2 AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.tar.lz AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.tar.xz AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.tar.zst AltCraft-f24107368fa47f911f4491f644ff3755525c91e1.zip | |
Diffstat (limited to 'src/GameState.cpp')
| -rw-r--r-- | src/GameState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/GameState.cpp b/src/GameState.cpp index 77b6394..c49b332 100644 --- a/src/GameState.cpp +++ b/src/GameState.cpp @@ -2,7 +2,7 @@ #include "Event.hpp" #include <iomanip> -GameState::GameState(NetworkClient *networkClient) : nc(networkClient) { +GameState::GameState(std::shared_ptr<NetworkClient> networkClient) : nc(networkClient) { Front = glm::vec3(0.0f, 0.0f, -1.0f); this->SetPosition(glm::vec3(0.0f, 0.0f, 3.0f)); this->WorldUp = glm::vec3(0.0f, 1.0f, 0.0f); @@ -195,7 +195,7 @@ void GameState::UpdatePacket() g_ReducedDebugInfo = packet->ReducedDebugInfo; LOG(INFO) << "Gamemode is " << g_Gamemode << ", Difficulty is " << (int)g_Difficulty << ", Level Type is " << g_LevelType; - EventAgregator::PushEvent(EventType::PlayerConnected, PlayerConnectedData{ this }); + EventAgregator::PushEvent(EventType::PlayerConnected, PlayerConnectedData{ gs }); break; } case Map: |