summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-01-12 07:56:07 +0100
committerLaG1924 <12997935+LaG1924@users.noreply.github.com>2018-01-13 03:39:34 +0100
commit7bb460ab7274c46019315cf9aba1d308189ab0de (patch)
tree8565d93cfb7ad5a536a218e114309b2a0122c7a1 /src
parentSingle mutex for event system (diff)
downloadAltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.tar
AltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.tar.gz
AltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.tar.bz2
AltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.tar.lz
AltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.tar.xz
AltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.tar.zst
AltCraft-7bb460ab7274c46019315cf9aba1d308189ab0de.zip
Diffstat (limited to 'src')
-rw-r--r--src/GlobalState.cpp4
-rw-r--r--src/Render.cpp4
-rw-r--r--src/RendererWorld.cpp2
3 files changed, 5 insertions, 5 deletions
diff --git a/src/GlobalState.cpp b/src/GlobalState.cpp
index e947e01..f04bb35 100644
--- a/src/GlobalState.cpp
+++ b/src/GlobalState.cpp
@@ -143,10 +143,10 @@ void PhysExec() {
}
});
- listener.RegisterHandler("MouseMoved", [](const Event& eventData) {
+ listener.RegisterHandler("MouseMove", [](const Event& eventData) {
if (!gs)
return;
- auto data = eventData.get<std::tuple<float,float>>();
+ auto data = eventData.get<std::tuple<double,double>>();
gs->HandleRotation(std::get<0>(data),std::get<1>(data));
});
diff --git a/src/Render.cpp b/src/Render.cpp
index 3daa8ff..c3fe137 100644
--- a/src/Render.cpp
+++ b/src/Render.cpp
@@ -283,8 +283,8 @@ void Render::ExecuteRenderLoop() {
});
listener.RegisterHandler("ChatMessageReceived", [this](const Event& eventData) {
- auto data = eventData.get<std::tuple<std::string, unsigned char>>();
- std::string msg = "(" + std::to_string((int)std::get<1>(data)) + ") " + std::get<0>(data);
+ auto data = eventData.get<std::tuple<Chat, unsigned char>>();
+ std::string msg = "(" + std::to_string((int)std::get<1>(data)) + ") " + std::get<0>(data).text;
chatMessages.push_back(msg);
});
diff --git a/src/RendererWorld.cpp b/src/RendererWorld.cpp
index b9745be..88d289f 100644
--- a/src/RendererWorld.cpp
+++ b/src/RendererWorld.cpp
@@ -83,7 +83,7 @@ void RendererWorld::UpdateAllSections(VectorF playerPos)
sectionsMutex.unlock();
for (auto& it : toRemove) {
- PUSH_EVENT("DeleteSectionRender", 0);
+ PUSH_EVENT("DeleteSectionRender", it);
}
playerChunk.y = std::floor(gs->player->pos.y / 16.0);