diff --git a/SQCSim-common/define.h b/SQCSim-common/define.h index 17db0ad..b018971 100644 --- a/SQCSim-common/define.h +++ b/SQCSim-common/define.h @@ -76,6 +76,7 @@ typedef uint64_t Timestamp; #include #include #include +#include #define flag_t unsigned int #define addrlen_t unsigned int diff --git a/SQCSim-srv/connection.cpp b/SQCSim-srv/connection.cpp index c1092c9..ac01b5f 100644 --- a/SQCSim-srv/connection.cpp +++ b/SQCSim-srv/connection.cpp @@ -145,8 +145,8 @@ void Connection::Run(World* world) { } void Connection::CleanInputManifest(Timestamp time) { - auto wat = m_input_manifest.find(time); +// auto wat = m_input_manifest.find(time); - while (wat != m_input_manifest.begin()) - m_input_manifest.erase(wat--); +// while (wat != m_input_manifest.begin()) +// m_input_manifest.erase(wat--); } diff --git a/SQCSim2021/booster.cpp b/SQCSim2021/booster.cpp index 593e16e..4e7417f 100644 --- a/SQCSim2021/booster.cpp +++ b/SQCSim2021/booster.cpp @@ -1,4 +1,4 @@ -#include "booster.h"; +#include "booster.h" void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, Shader& shader, Transformation tran) { @@ -43,4 +43,4 @@ void Booster::RenderBillboard(const Vector3f pos, TextureAtlas& textureAtlas, S shader.Disable(); //tran.ApplyTranslation(-m_position); //glEnable(GL_DEPTH_TEST); -} \ No newline at end of file +} diff --git a/SQCSim2021/cmake/CMakeLists.txt b/SQCSim2021/cmake/CMakeLists.txt index 4da3eb4..d9ccd33 100644 --- a/SQCSim2021/cmake/CMakeLists.txt +++ b/SQCSim2021/cmake/CMakeLists.txt @@ -28,6 +28,7 @@ include_directories( add_library(SQCSim-common + "${SQCSIM_COMMON_DIR}boostinfo.cpp" "${SQCSIM_COMMON_DIR}blockinfo.cpp" "${SQCSIM_COMMON_DIR}bullet.cpp" "${SQCSIM_COMMON_DIR}chunk.cpp" @@ -40,6 +41,7 @@ add_library(SQCSim-common add_executable(SQCSim-client "../audio.cpp" + "../booster.cpp" "../connector.cpp" "../engine.cpp" "../mesh.cpp"