Ticket #3676: t3676.4.patch

binaries/data/mods/public/gui/session/menu.js

@@ -214 +214 @@
     Engine.GetGUIObjectByName("chatInput").caption = ""; // Clear chat input
     Engine.GetGUIObjectByName("chatInput").blur(); // Remove focus
     Engine.GetGUIObjectByName("chatDialogPanel").hidden = true;
+    Engine.CameraSetOption("hotkeysEnabled", "true" );
 }
 
 /**
@@ -256 +257 @@
     }
 
     chatWindow.hidden = !hidden;
+    Engine.CameraSetOption("hotkeysEnabled", chatWindow.hidden ? "true" : "false");
 }
 
 function setDiplomacy(data)

source/graphics/GameView.cpp

@@ -292 +292 @@
     float ViewFOV;
     float ViewNear;
     float ViewFar;
+    bool hotkeysEnabled = false;
     int JoystickPanX;
     int JoystickPanY;
     int JoystickRotateX;
@@ -640 +641 @@
     mouse_last_x = g_mouse_x;
     mouse_last_y = g_mouse_y;
 
-    if (HotkeyIsPressed("camera.rotate.cw"))
-        m->RotateY.AddSmoothly(m->ViewRotateYSpeed * deltaRealTime);
-    if (HotkeyIsPressed("camera.rotate.ccw"))
-        m->RotateY.AddSmoothly(-m->ViewRotateYSpeed * deltaRealTime);
-    if (HotkeyIsPressed("camera.rotate.up"))
-        m->RotateX.AddSmoothly(-m->ViewRotateXSpeed * deltaRealTime);
-    if (HotkeyIsPressed("camera.rotate.down"))
-        m->RotateX.AddSmoothly(m->ViewRotateXSpeed * deltaRealTime);
+    if (m->hotkeysEnabled)
+    {
+        if (HotkeyIsPressed("camera.rotate.cw"))
+            m->RotateY.AddSmoothly(m->ViewRotateYSpeed * deltaRealTime);
+        if (HotkeyIsPressed("camera.rotate.ccw"))
+            m->RotateY.AddSmoothly(-m->ViewRotateYSpeed * deltaRealTime);
+        if (HotkeyIsPressed("camera.rotate.up"))
+            m->RotateX.AddSmoothly(-m->ViewRotateXSpeed * deltaRealTime);
+        if (HotkeyIsPressed("camera.rotate.down"))
+            m->RotateX.AddSmoothly(m->ViewRotateXSpeed * deltaRealTime);
+    }
 
     float moveRightward = 0.f;
     float moveForward = 0.f;
 
-    if (HotkeyIsPressed("camera.pan"))
+    if (HotkeyIsPressed("camera.pan") && m->hotkeysEnabled)
     {
         moveRightward += m->ViewDragSpeed * mouse_dx;
         moveForward += m->ViewDragSpeed * -mouse_dy;
@@ -671 +675 @@
             moveForward += m->ViewScrollSpeed * deltaRealTime;
     }
 
-    if (HotkeyIsPressed("camera.right"))
-        moveRightward += m->ViewScrollSpeed * deltaRealTime;
-    if (HotkeyIsPressed("camera.left"))
-        moveRightward -= m->ViewScrollSpeed * deltaRealTime;
-    if (HotkeyIsPressed("camera.up"))
-        moveForward += m->ViewScrollSpeed * deltaRealTime;
-    if (HotkeyIsPressed("camera.down"))
-        moveForward -= m->ViewScrollSpeed * deltaRealTime;
+    if (m->hotkeysEnabled)
+    {
+        if (HotkeyIsPressed("camera.right"))
+            moveRightward += m->ViewScrollSpeed * deltaRealTime;
+        if (HotkeyIsPressed("camera.left"))
+            moveRightward -= m->ViewScrollSpeed * deltaRealTime;
+        if (HotkeyIsPressed("camera.up"))
+            moveForward += m->ViewScrollSpeed * deltaRealTime;
+        if (HotkeyIsPressed("camera.down"))
+            moveForward -= m->ViewScrollSpeed * deltaRealTime;
+    }
 
     if (g_Joystick.IsEnabled())
     {
@@ -754 +761 @@
         }
     }
 
-    if (HotkeyIsPressed("camera.zoom.in"))
-        m->Zoom.AddSmoothly(-m->ViewZoomSpeed * deltaRealTime);
-    if (HotkeyIsPressed("camera.zoom.out"))
-        m->Zoom.AddSmoothly(m->ViewZoomSpeed * deltaRealTime);
+    if (m->hotkeysEnabled)
+    {
+        if (HotkeyIsPressed("camera.zoom.in"))
+            m->Zoom.AddSmoothly(-m->ViewZoomSpeed * deltaRealTime);
+        if (HotkeyIsPressed("camera.zoom.out"))
+            m->Zoom.AddSmoothly(m->ViewZoomSpeed * deltaRealTime);
+    }
 
     if (m->ConstrainCamera)
         m->Zoom.ClampSmoothly(m->ViewZoomMin, m->ViewZoomMax);
@@ -893 +903 @@
     m->ViewCamera.UpdateFrustum();
 }
 
+std::wstring CGameView::GetCameraOption(const std::wstring& optionName)
+{
+    if (L"hotkeysEnabled" == optionName)
+        return m->hotkeysEnabled ? L"true" : L"false";
+
+    return L"";
+}
+
+void CGameView::SetCameraOption(const std::wstring& optionName, const std::wstring& optionValue)
+{
+    if (L"hotkeysEnabled" == optionName)
+        m->hotkeysEnabled = (optionValue == L"true");
+}
+
 float CGameView::GetCameraX()
 {
     CCamera targetCam = m->ViewCamera;

source/graphics/GameView.h

@@ -90 +90 @@
     float GetCameraRotX();
     float GetCameraRotY();
     float GetCameraZoom();
+    std::wstring GetCameraOption(const std::wstring& optionName);
+    void SetCameraOption(const std::wstring& optionName, const std::wstring& optionValue);
     void SetCamera(CVector3D Pos, float RotX, float RotY, float Zoom);
     void MoveCameraTarget(const CVector3D& target);
     void ResetCameraTarget(const CVector3D& target);

source/gui/scripting/ScriptFunctions.cpp

@@ -532 +532 @@
     return -1;
 }
 
+std::wstring CameraGetOption(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& optionName)
+{
+    if (g_Game && g_Game->GetView())
+        return g_Game->GetView()->GetCameraOption(optionName);
+
+    return wstring_from_utf8("");
+}
+
+void CameraSetOption(ScriptInterface::CxPrivate* UNUSED(pCxPrivate), const std::wstring& optionName, const std::wstring& optionValue)
+{
+    if (g_Game && g_Game->GetView())
+        g_Game->GetView()->SetCameraOption(optionName, optionValue);
+}
+
 /**
  * Get the current Z coordinate of the camera.
  */
@@ -1061 +1075 @@
     scriptInterface.RegisterFunction<JS::Value, &GetMapSettings>("GetMapSettings");
     scriptInterface.RegisterFunction<float, &CameraGetX>("CameraGetX");
     scriptInterface.RegisterFunction<float, &CameraGetZ>("CameraGetZ");
+    scriptInterface.RegisterFunction<std::wstring, std::wstring, &CameraGetOption>("CameraGetOption");
+    scriptInterface.RegisterFunction<void, std::wstring, std::wstring, &CameraSetOption>("CameraSetOption");
     scriptInterface.RegisterFunction<void, entity_id_t, &CameraFollow>("CameraFollow");
     scriptInterface.RegisterFunction<void, entity_id_t, &CameraFollowFPS>("CameraFollowFPS");
     scriptInterface.RegisterFunction<void, entity_pos_t, entity_pos_t, entity_pos_t, entity_pos_t, entity_pos_t, entity_pos_t, &SetCameraData>("SetCameraData");