start to add some string_view overloads to string_util

Author: MrSapps

include/string_util.hpp

@@ -10,6 +10,7 @@
 // but MSVC for now.
 #include <codecvt>
 #endif
+#include <boost/utility/string_view.hpp>
 
 namespace string_util
 {
@@ -126,6 +127,11 @@ namespace string_util
         return (haystack.find(needle) != std::string::npos);
     }
 
+    inline bool contains(boost::string_view haystack, boost::string_view needle)
+    {
+        return (haystack.find(needle) != boost::string_view::npos);
+    }
+
 #ifdef _MSC_VER
     inline std::string wstring_to_utf8(const std::wstring& str)
     {

test/string_util_tests.cpp

@@ -1,6 +1,8 @@
 #include <gmock/gmock.h>
 #include "string_util.hpp"
 #include "resourcemapper.hpp"
+#include <boost/utility/string_view.hpp>
+
 
 TEST(StringHash, hash)
 {
@@ -76,17 +78,32 @@ TEST(string_util, endsWith)
 
 TEST(string_util, contains)
 {
-    std::string t1 = "LOLrofl";
-    std::string t2 = "roflLOL";
-    std::string t3 = "LroflL";
-    ASSERT_FALSE(string_util::contains(t1, "zzz"));
-    ASSERT_TRUE(string_util::contains(t1, "LOL"));
-    ASSERT_TRUE(string_util::contains(t1, "rofl"));
-    ASSERT_TRUE(string_util::contains(t2, "LOL"));
-    ASSERT_TRUE(string_util::contains(t2, "rofl"));
-    ASSERT_TRUE(string_util::contains(t3, "Lr"));
-    ASSERT_TRUE(string_util::contains(t3, ""));
-    ASSERT_TRUE(string_util::contains(t3, "lL"));
+    {
+        std::string t1 = "LOLrofl";
+        std::string t2 = "roflLOL";
+        std::string t3 = "LroflL";
+        ASSERT_FALSE(string_util::contains(t1, "zzz"));
+        ASSERT_TRUE(string_util::contains(t1, "LOL"));
+        ASSERT_TRUE(string_util::contains(t1, "rofl"));
+        ASSERT_TRUE(string_util::contains(t2, "LOL"));
+        ASSERT_TRUE(string_util::contains(t2, "rofl"));
+        ASSERT_TRUE(string_util::contains(t3, "Lr"));
+        ASSERT_TRUE(string_util::contains(t3, ""));
+        ASSERT_TRUE(string_util::contains(t3, "lL"));
+    }
+    {
+        boost::string_view t1 = "LOLrofl";
+        boost::string_view t2 = "roflLOL";
+        boost::string_view t3 = "LroflL";
+        ASSERT_FALSE(string_util::contains(t1, "zzz"));
+        ASSERT_TRUE(string_util::contains(t1, "LOL"));
+        ASSERT_TRUE(string_util::contains(t1, "rofl"));
+        ASSERT_TRUE(string_util::contains(t2, "LOL"));
+        ASSERT_TRUE(string_util::contains(t2, "rofl"));
+        ASSERT_TRUE(string_util::contains(t3, "Lr"));
+        ASSERT_TRUE(string_util::contains(t3, ""));
+        ASSERT_TRUE(string_util::contains(t3, "lL"));
+    }
 }
 
 TEST(string_util, iequals)

tools/engine_hook/dllmain.cpp

@@ -8,6 +8,7 @@
 #include "types.hpp"
 #include "oddlib/anim.hpp"
 #include "oddlib/stream.hpp"
+#include "sound_hooks.hpp"
 
 // Hack to access private parts of ResourceMapper
 #define private public
@@ -330,7 +331,7 @@ static int __fastcall set_first_camera_hook(void *thisPtr, void* , __int16 level
 
     // Setting to Feco lets us go directly in game, with the side effect that pausing will crash
     // and some other nasties, still its good enough for debugging animations
-    levelNumber = 5;
+    //levelNumber = 5;
 
     // Abe "hello" screen when levelNumber is left as the intro level
     cameraNumber = 1;