From: Terri00 Date: Mon, 18 Feb 2019 03:05:01 +0000 (+0000) Subject: model dict in release mode workaround X-Git-Url: https://harrygodden.com/git/?a=commitdiff_plain;h=977a44c0158a19c4ec90ed97be00a230bfe8dc67;p=tar-legacy.git model dict in release mode workaround --- diff --git a/MCDV.sln b/MCDV.sln index 19730e5..f9b9d19 100644 --- a/MCDV.sln +++ b/MCDV.sln @@ -40,7 +40,6 @@ Global {21F22CE8-5445-44FA-8561-D3B8E94D55C5}.Release|x64.ActiveCfg = Release|x64 {21F22CE8-5445-44FA-8561-D3B8E94D55C5}.Release|x64.Build.0 = Release|x64 {21F22CE8-5445-44FA-8561-D3B8E94D55C5}.Release|x86.ActiveCfg = Release|Win32 - {21F22CE8-5445-44FA-8561-D3B8E94D55C5}.Release|x86.Build.0 = Release|Win32 {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Debug|Any CPU.Build.0 = Debug|Any CPU {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -52,7 +51,6 @@ Global {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Release|x64.ActiveCfg = Release|Any CPU {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Release|x64.Build.0 = Release|Any CPU {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Release|x86.ActiveCfg = Release|Any CPU - {71666EC8-527E-4C98-BD6F-2FC0AA104350}.Release|x86.Build.0 = Release|Any CPU {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Debug|Any CPU.Build.0 = Debug|Any CPU {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Debug|x64.ActiveCfg = Debug|Any CPU @@ -64,7 +62,6 @@ Global {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Release|x64.ActiveCfg = Release|Any CPU {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Release|x64.Build.0 = Release|Any CPU {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Release|x86.ActiveCfg = Release|Any CPU - {B9C44160-6699-4DFF-AD66-AD39D83E8A21}.Release|x86.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MCDV/GLFWUtil.hpp b/MCDV/GLFWUtil.hpp index 52a3aff..65b83c6 100644 --- a/MCDV/GLFWUtil.hpp +++ b/MCDV/GLFWUtil.hpp @@ -8,6 +8,8 @@ public: bool getKeyDown(int key) { if (glfwGetKey(this->windowHandle, key) == GLFW_PRESS) return true; + + return false; } util_keyHandler(GLFWwindow* window) { diff --git a/MCDV/MCDV.vcxproj b/MCDV/MCDV.vcxproj index a3e0ab5..a846f0b 100644 --- a/MCDV/MCDV.vcxproj +++ b/MCDV/MCDV.vcxproj @@ -22,7 +22,7 @@ 15.0 {3F5631FE-0F0C-4285-B301-66DA219121EC} MCDV - 10.0.16299.0 + 10.0.17134.0 @@ -101,6 +101,7 @@ true true true + MultiThreadedDLL true diff --git a/MCDV/main.cpp b/MCDV/main.cpp index dd519a3..1763944 100644 --- a/MCDV/main.cpp +++ b/MCDV/main.cpp @@ -38,8 +38,8 @@ float lastFrame = 0.0f; bool isClicking = false; -double mousex; -double mousey; +double mousex = 0.0; +double mousey = 0.0; Camera camera; @@ -61,8 +61,8 @@ Radar* _radar; float M_ORTHO_SIZE = 20.0f; int main(int argc, char* argv[]) { - std::string _FILE_BSP = ""; - std::string _FILE_NAV = ""; + std::string _FILE_BSP = "D:\\Users\\Harry\\Source\\Repos\\MCDV\\Release\\killhouse.bsp"; + std::string _FILE_NAV = "D:\\Users\\Harry\\Source\\Repos\\MCDV\\Release\\killhouse.nav"; for (int i = 1; i < argc; ++i) { char* _arg = argv[i]; diff --git a/MCDV/vbsp.hpp b/MCDV/vbsp.hpp index c758f24..0f2608b 100644 --- a/MCDV/vbsp.hpp +++ b/MCDV/vbsp.hpp @@ -250,6 +250,16 @@ public: std::vector props; + // Prop reading is broken while building under Release mode + // Not sure why. + // TODO: Look into this. + +#ifndef _DEBUG + return props; +#endif + +#ifdef _DEBUG + for (int i = 0; i < numProps; i++) { bsp::staticprop prop; @@ -315,6 +325,8 @@ public: } return props; + +#endif } std::string readString(std::ifstream* reader, bsp::lumpHeader info) { diff --git a/MCDV_Lib/MCDV_Lib.vcxproj b/MCDV_Lib/MCDV_Lib.vcxproj index 8fee611..9e57999 100644 --- a/MCDV_Lib/MCDV_Lib.vcxproj +++ b/MCDV_Lib/MCDV_Lib.vcxproj @@ -26,7 +26,7 @@ {21F22CE8-5445-44FA-8561-D3B8E94D55C5} Win32Proj MCDVLib - 10.0.15063.0 + 10.0.17134.0 diff --git a/deps.zip b/deps.zip new file mode 100644 index 0000000..e3b417b Binary files /dev/null and b/deps.zip differ