14 files changed, 41 insertions, 13 deletions

diff --git a/assets/opensb/interface/opensb/shaders/select.png b/assets/opensb/interface/opensb/shaders/select.png
index dc649b4..880a270 100644
--- a/assets/opensb/interface/opensb/shaders/select.png
+++ b/assets/opensb/interface/opensb/shaders/select.png
diff --git a/assets/opensb/interface/opensb/shaders/selectend.png b/assets/opensb/interface/opensb/shaders/selectend.png
index 99908d6..b524acf 100644
--- a/assets/opensb/interface/opensb/shaders/selectend.png
+++ b/assets/opensb/interface/opensb/shaders/selectend.png
diff --git a/assets/opensb/interface/title/barstound.png b/assets/opensb/interface/title/barstound.png
index d6e14af..23324ab 100644
--- a/assets/opensb/interface/title/barstound.png
+++ b/assets/opensb/interface/title/barstound.png
diff --git a/assets/opensb/interface/title/starbound.png b/assets/opensb/interface/title/starbound.png
index 33647cc..c650d46 100644
--- a/assets/opensb/interface/title/starbound.png
+++ b/assets/opensb/interface/title/starbound.png
diff --git a/assets/opensb/rendering/sprites/error.png b/assets/opensb/rendering/sprites/error.png
index b5bd3e7..84a4a55 100644
--- a/assets/opensb/rendering/sprites/error.png
+++ b/assets/opensb/rendering/sprites/error.png
diff --git a/assets/opensb/scripts/opensb/player/commands.lua b/assets/opensb/scripts/opensb/player/commands.lua
index 2d83106..0094dba 100644
--- a/assets/opensb/scripts/opensb/player/commands.lua
+++ b/assets/opensb/scripts/opensb/player/commands.lua
@@ -22,6 +22,8 @@ register("run", function(src)
       return "^#f00;error: " .. result
     elseif result == nil then
       return nil
+    elseif type(result) == "string" then
+      return result
     else
       local success, printed = pcall(sb.printJson, result)
       if not success then
diff --git a/assets/opensb/sky/orbitals/bluestar.png b/assets/opensb/sky/orbitals/bluestar.png
index d174138..11cd274 100644
--- a/assets/opensb/sky/orbitals/bluestar.png
+++ b/assets/opensb/sky/orbitals/bluestar.png
diff --git a/assets/opensb/sky/orbitals/whitestar.png b/assets/opensb/sky/orbitals/whitestar.png
index 87e11eb..8ebafb3 100644
--- a/assets/opensb/sky/orbitals/whitestar.png
+++ b/assets/opensb/sky/orbitals/whitestar.png
diff --git a/assets/opensb/sky/orbitals/yellowstar.png b/assets/opensb/sky/orbitals/yellowstar.png
index 8979000..216a63a 100644
--- a/assets/opensb/sky/orbitals/yellowstar.png
+++ b/assets/opensb/sky/orbitals/yellowstar.png
diff --git a/source/CMakePresets.json b/source/CMakePresets.json
index e59a78f..defd840 100644
--- a/source/CMakePresets.json
+++ b/source/CMakePresets.json
@@ -41,6 +41,12 @@
       }
     },
     {
+      "inherits": "windows-release",
+      "name": "windows-release-VS2022",
+      "displayName": "Windows x64 (Visual Studio 2022)",
+      "generator": "Visual Studio 17 2022"
+    },
+    {
       "inherits": "base",
       "name": "linux-release",
       "displayName": "Linux x64",
@@ -98,6 +104,20 @@
       "configurePreset": "windows-release"
     },
     {
+      "name": "windows-debug",
+      "configurePreset": "windows-release"
+    },
+    {
+      "name": "windows-release-VS2022",
+      "configurePreset": "windows-release-VS2022",
+      "configuration": "Release"
+    },
+    {
+      "name": "windows-debug-VS2022",
+      "configurePreset": "windows-release-VS2022",
+      "configuration": "Debug"
+    },
+    {
       "name": "linux-release",
       "configurePreset": "linux-release"
     },
@@ -120,7 +140,8 @@
     {
       "inherits": "base",
       "name": "windows-release",
-      "configurePreset": "windows-release"
+      "configurePreset": "windows-release",
+      "configuration": "Release"
     },
     {
       "inherits": "base",
diff --git a/source/client/StarClientApplication.cpp b/source/client/StarClientApplication.cpp
index f79226e..dfe79eb 100644
--- a/source/client/StarClientApplication.cpp
+++ b/source/client/StarClientApplication.cpp
@@ -1213,12 +1213,13 @@ void ClientApplication::updateCamera(float dt) {
   const float deadzone = 0.1f;
   const float panFactor = 1.5f;
   float cameraSpeedFactor = 30.0f / m_root->configuration()->get("cameraSpeedFactor").toFloat();
+  cameraSpeedFactor /= (dt * 60.f);
 
   auto playerCameraPosition = m_player->cameraPosition();
 
   if (isActionTaken(InterfaceAction::CameraShift)) {
     m_snapBackCameraOffset = false;
-    m_cameraOffsetDownTicks++;
+    m_cameraOffsetDownTime += dt;
     Vec2F aim = m_universeClient->worldClient()->geometry().diff(m_mainInterface->cursorWorldPosition(), playerCameraPosition);
 
     float magnitude = aim.magnitude() / (triggerRadius / camera.pixelRatio());
@@ -1234,13 +1235,13 @@ void ClientApplication::updateCamera(float dt) {
       m_cameraYOffset = (m_cameraYOffset * (cameraSpeedFactor - 1.0) + cameraYOffset) / cameraSpeedFactor;
     }
   } else {
-    if ((m_cameraOffsetDownTicks > 0) && (m_cameraOffsetDownTicks < 20))
+    if (m_cameraOffsetDownTime > 0.0f && m_cameraOffsetDownTime < 0.333333f)
       m_snapBackCameraOffset = true;
     if (m_snapBackCameraOffset) {
       m_cameraXOffset = (m_cameraXOffset * (cameraSpeedFactor - 1.0)) / cameraSpeedFactor;
       m_cameraYOffset = (m_cameraYOffset * (cameraSpeedFactor - 1.0)) / cameraSpeedFactor;
     }
-    m_cameraOffsetDownTicks = 0;
+    m_cameraOffsetDownTime = 0.f;
   }
   Vec2F newCameraPosition;
 
diff --git a/source/client/StarClientApplication.hpp b/source/client/StarClientApplication.hpp
index 8824ea0..5f05657 100644
--- a/source/client/StarClientApplication.hpp
+++ b/source/client/StarClientApplication.hpp
@@ -126,7 +126,7 @@ private:
   float m_cameraXOffset = 0.0f;
   float m_cameraYOffset = 0.0f;
   bool m_snapBackCameraOffset = false;
-  int m_cameraOffsetDownTicks = 0;
+  float m_cameraOffsetDownTime = 0.f;
   Vec2F m_cameraPositionSmoother;
   Vec2F m_cameraSmoothDelta;
   int m_cameraZoomDirection = 0;
diff --git a/source/core/StarStringView.cpp b/source/core/StarStringView.cpp
index 2bc9cd5..535d350 100644
--- a/source/core/StarStringView.cpp
+++ b/source/core/StarStringView.cpp
@@ -113,8 +113,11 @@ bool StringView::beginsWith(StringView beg, CaseSensitivity cs) const {
   auto it = begin();
   auto itEnd = end();
   for (size_t i = 0; i != begSize; ++i)
-    if (it++ == itEnd)
+  {
+    if (it == itEnd)
       return false;
+    it++;
+  }
 
   return compare(0, begSize, beg, 0, NPos, cs) == 0;
 }
@@ -352,18 +355,20 @@ StringView StringView::substr(size_t position, size_t n) const {
   auto it = begin();
 
   for (size_t i = 0; i != position; ++i) {
-    if (it++ == itEnd)
+    if (it == itEnd)
       throw OutOfRangeException(strf("out of range in StringView::substr({}, {})", position, n));
+    it++;
   }
 
-  const char* start = &*it.base();
+  const auto itStart = it;
 
   for (size_t i = 0; i != n; ++i) {
-    if (it++ == itEnd)
-      return StringView(start, &*it.base() - start - 1);
+    if (it == itEnd)
+      break;
+    ++it;
   }
 
-  return StringView(start, &*it.base() - start);
+  return StringView(&*itStart.base(), it.base() - itStart.base());
 }
 
 int StringView::compare(size_t selfOffset, size_t selfLen, StringView other,
diff --git a/source/rendering/StarTextPainter.cpp b/source/rendering/StarTextPainter.cpp
index 7fc02bc..76670ff 100644
--- a/source/rendering/StarTextPainter.cpp
+++ b/source/rendering/StarTextPainter.cpp
@@ -139,8 +139,7 @@ bool TextPainter::processWrapText(StringView text, unsigned* wrapWidth, WrapText
   bool finished = true;
 
   auto slice = [](StringView::const_iterator a, StringView::const_iterator b) -> StringView {
-    const char* aPtr = &*a.base();
-    return StringView(aPtr, &*b.base() - aPtr);
+    return StringView(&*a.base(), b.base() - a.base());
   };
 
   while (iterator != end) {