Updated dependencies

boost 1.65.1 -> boost 1.67.0 tbb 2018u1 -> 2018u3
HourglassGame · May 6, 2018 · c9411ca · c9411ca
1 parent fae96a8
commit c9411ca
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ext/ExternalDependencies.txt b/ext/ExternalDependencies.txt
@@ -1,9 +1,9 @@
 ==== HourglassII External Dependencies Configuration ====
 HourglassII depends on the following libraries:
 
-Boost version 1.65.1 -- http://www.boost.org/users/history/version_1_65_1.html
+Boost version 1.67.0 -- http://www.boost.org/users/history/version_1_67_0.html
 SFML version 2.4.2 -- http://www.sfml-dev.org/download.php
-Threading Building Blocks version 2018 Update 1 -- http://threadingbuildingblocks.org
+Threading Building Blocks version 2018 Update 3 -- http://threadingbuildingblocks.org
 
 These libraries must be compiled and placed in the following directory structure within the ext/ directory.
 

diff --git a/src/SimpleConfiguredTriggerSystem.cpp b/src/SimpleConfiguredTriggerSystem.cpp
@@ -10,7 +10,7 @@
 #include "LuaStackManager.h"
 #include "LuaSandbox.h"
 #include "mt/std/memory"
-#include "lua\lauxlib.h"
+#include "lua/lauxlib.h"
 #include <cmath>
 
 namespace hg {
@@ -313,7 +313,7 @@ namespace hg {
         if (portal.getWinner()) {
             text = active ? "Win" : "Inactive";
         }
-        else if (portal.getRelativeTime() and portal.getTimeDestination() > 0) {
+        else if (portal.getRelativeTime() && portal.getTimeDestination() > 0) {
             text = "+" + formatTime(portal.getTimeDestination());
         }
         else {