From b09eebc9c2e1692682041a4ff9557ee78a60bf27 Mon Sep 17 00:00:00 2001 From: juanjp600 Date: Sat, 8 Oct 2016 18:55:27 -0300 Subject: [PATCH] Holding F gives old mousewheel zoom functionality --- Subsurface/Source/Camera.cs | 2 +- Subsurface/Source/Networking/GameServer.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Subsurface/Source/Camera.cs b/Subsurface/Source/Camera.cs index b3f4f7088..372c66ee8 100644 --- a/Subsurface/Source/Camera.cs +++ b/Subsurface/Source/Camera.cs @@ -201,7 +201,7 @@ namespace Barotrauma Vector2 diffViewCenter; diffViewCenter = ((mouseInWorld - Position) * Zoom); Zoom = MathHelper.Clamp(zoom + (PlayerInput.ScrollWheelSpeed / 1000.0f) * zoom, GameMain.DebugDraw ? 0.01f : 0.1f, 2.0f); - Position = mouseInWorld - (diffViewCenter / Zoom); + if (!PlayerInput.KeyDown(Keys.F)) Position = mouseInWorld - (diffViewCenter / Zoom); } else { diff --git a/Subsurface/Source/Networking/GameServer.cs b/Subsurface/Source/Networking/GameServer.cs index c612629b0..86109cbb3 100644 --- a/Subsurface/Source/Networking/GameServer.cs +++ b/Subsurface/Source/Networking/GameServer.cs @@ -971,7 +971,7 @@ namespace Barotrauma.Networking if (cargoSpawnPos == null) { - DebugConsole.ThrowError("Couldn't spawn additional cargo (cargo spawnpoint now found)"); + DebugConsole.ThrowError("Couldn't spawn additional cargo (cargo spawnpoint not found)"); continue; }