CActorContraption fixes, better CMake dependency handling

Runtime/CMemoryCardSys.cpp

@@ -146,7 +146,7 @@ bool CMemoryCardSys::InitializePump() {
     std::sort(x20_scanStates.begin(), x20_scanStates.end(), [&](const auto& a, const auto& b) -> bool {
       return g_ResFactory->TranslateNewToOriginal(a.first) < g_ResFactory->TranslateNewToOriginal(b.first);
     });
-    x1c_worldInter = rstl::nullopt;
+    x1c_worldInter = std::nullopt;
   }
 
   return false;