Merge branch 'praydog:master' into master

src/mods/LooseFileLoader.cpp

@@ -268,13 +268,26 @@ bool LooseFileLoader::handle_path(const wchar_t* path, size_t hash) {
     return false;
 }
 
+#if TDB_VER > 67
 uint64_t LooseFileLoader::path_to_hash_hook(const wchar_t* path) {
+#else
+uint64_t LooseFileLoader::path_to_hash_hook(void* This, const wchar_t* path) {
+#endif
     const auto og = g_loose_file_loader->m_path_to_hash_hook->get_original<decltype(path_to_hash_hook)>();
+
+#if TDB_VER > 67
     const auto result = og(path);
+#else
+    const auto result = og(This, path);
+#endif
 
     // true to skip.
     if (g_loose_file_loader->handle_path(path, result)) {
+#if TDB_VER > 67
         return 4294967296;
+#else
+        return 0xFFFFFFFF;
+#endif
     }
 
     return result;

src/mods/LooseFileLoader.hpp

@@ -24,7 +24,12 @@ class LooseFileLoader : public Mod {
 private:
     void hook();
     bool handle_path(const wchar_t* path, size_t hash);
+
+#if TDB_VER > 67
     static uint64_t path_to_hash_hook(const wchar_t* path);
+#else
+    static uint64_t path_to_hash_hook(void* This, const wchar_t* path);
+#endif
 
     bool m_hook_success{false};
     bool m_attempted_hook{false};

src/mods/VR.cpp

@@ -3062,14 +3062,17 @@ void VR::on_end_rendering(void* entry) {
                 "UpdateMovie", // Causes movies to play twice as fast if ran again
                 "UpdateSpeedTree",
                 "UpdateHansoft",
+                "UpdatePuppet",
                 // The dynamics stuff causes a cloth physics step in the right eye
                 "BeginRenderingDynamics",
                 "BeginDynamics",
                 "EndRenderingDynamics",
                 "EndDynamics",
                 "EndPhysics",
                 "RenderDynamics",
+#ifndef DD2
                 "RenderLandscape",
+#endif
                 "DevelopRenderer",
                 "DrawWidget"
             };