From 14dc293a09a7e9665b6f367b9fd6c413bb335120 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Tue, 10 Aug 2021 19:56:31 -0400
Subject: [PATCH] Fixed #5734 / New derelict icon

---
 core/assets-raw/sprites/teams/team-derelict.png | Bin 608 -> 490 bytes
 core/src/mindustry/editor/MapEditorDialog.java  |   2 +-
 core/src/mindustry/editor/MapView.java          |   2 +-
 core/src/mindustry/input/InputHandler.java      |   4 ++++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/core/assets-raw/sprites/teams/team-derelict.png b/core/assets-raw/sprites/teams/team-derelict.png
index 38ac90dcb1ad7df85191e10d4c509c68634ec97e..7ba10089d8e0ea7835363d7ac2392d520f034119 100644
GIT binary patch
delta 452
zcmV;#0XzQS1nL8jFn<B0Nkl<ZXo2mU!H&Z)2t>*L|39~vMp|VR$H2^hyPjiH8J>+X
z#i`lW*47q5uaBzi9~DNgz{hdO{g4~HTV*x8)YwyKE8%5^X7{rSUSh<X#1!y9Yy*{<
zdnD@2Mxd7u_0G^{q)<mfv$hI+hFQ?)Xn+pJUTGveY#>#5qkrHbgQ)j30zN%JRU*s6
zr?PtGk(JH%DR3_YIx}bBWwSpEt%@Q^R`)ulfTxFEG`!jH)XFWpr<w4seOJ*NW5GXu
zp+jSk0Y7}$r7<}2Wu%dxw+}is22Ua3Q>Ej|@P9t&*ciMD0iW)`bZsU+3D)jWtvoH%
zBL-H3HVYnSGk*i4B|FY$46X`o<}6tw2C`!1o2jfm8mL=VhyF-8RkiYrg39eIyWj1x
zoAJS2z+4T?7({G`VTKM&e5i6e4SAqv;3KOVjW&5kM%<Gj8Y3kM>FRJr-k=Qbsraf+
ziWb+zcUlH~6=<`jE3T*u;ID#IbYvnbFEj77T&Vw6XFd4x8v9O5ulT8so!k8quR@(}
uXWCo_sE@&a``3&zy*{e;V{2>cJM{*grc_Cq(^sYd0000<MNUMnLSTYiGTSf!

delta 571
zcmV-B0>u651K<RZFn<CXNkl<ZXo2lo$(F+)40GoH|Cu?oZ(f=}yvPf5(5)@lQdoja
zi8eMiqS4-{$bD2KC3=beAaWe3TuOwGMmbabkEIhbJ)in!PJ8teK9kdqkW^U4$iu{?
zBxe#$q!9i@oFhA%Xd<C-32{_>_O8xuZqm_0g^l`0ZFnwI^nW9u<H#c$DTiUO3eo2{
z$VMv4(fhJeG@3_>?izmz-uo>}v}Y_8;okbo6g}c%>d!Th3ViAt1w?$<yK`pIL_xx5
z7fobzXOZAUdF|>`P4&^?rT06Euo2giytd~)U!i@_;l=<pIIXp&5iNb-DUJxSw3gVC
zm}yopV$C8CG=J3td%7)j3At`=Qp=eknrr7a;*s8Ylt+rLv63d@c3w#`6v&D2%I9&a
zpA%_ILlMW;@InNU?6$+B2x)=(up*u6l1)mJyi)uq_wCDB3kN+QmEAOVmc8ap2bf4d
zoiXyzk#$w^E+%C)@v8h>gKrh@dc|uZP$b^vniwWgAb&pO9}OlVO7Td&p9uUbh&QAn
zEU&LyE=}VZMQi*2wU;)WS+q6|(L%dAYD#YHyb@aAEm{+I`jeZL0~dej&LaJ`YAqUH
zR~-MYaEoa1+OoWQ0uDG(A)-epvK-|(3(bC9TXoeEi;is~F9}>FKFp76$YzUoJ;0zh
zBw6CMF*Mj>BYNKzX*m&YrPstn3lt(e;9)11MSG)~$HvA#!7ssX#98gP@YDbR002ov
JPDHLkV1fhR5nliR

diff --git a/core/src/mindustry/editor/MapEditorDialog.java b/core/src/mindustry/editor/MapEditorDialog.java
index 9b51df514b..213e4e4a83 100644
--- a/core/src/mindustry/editor/MapEditorDialog.java
+++ b/core/src/mindustry/editor/MapEditorDialog.java
@@ -42,7 +42,7 @@ public class MapEditorDialog extends Dialog implements Disposable{
     private BaseDialog menu;
     private Table blockSelection;
     private Rules lastSavedRules;
-    private boolean saved = false;
+    private boolean saved = false; //currently never read
     private boolean shownWithMap = false;
     private Seq<Block> blocksOut = new Seq<>();
 
diff --git a/core/src/mindustry/editor/MapView.java b/core/src/mindustry/editor/MapView.java
index 3dc9f8e239..4b603ddb28 100644
--- a/core/src/mindustry/editor/MapView.java
+++ b/core/src/mindustry/editor/MapView.java
@@ -196,7 +196,7 @@ public class MapView extends Element implements GestureListener{
 
         if(Core.scene.getScrollFocus() != this) return;
 
-        zoom += Core.input.axis(KeyCode.scroll) / 10f * zoom;
+        zoom += Core.input.axis(Binding.zoom) / 10f * zoom;
         clampZoom();
     }
 
diff --git a/core/src/mindustry/input/InputHandler.java b/core/src/mindustry/input/InputHandler.java
index f97385122c..0b5f2bef99 100644
--- a/core/src/mindustry/input/InputHandler.java
+++ b/core/src/mindustry/input/InputHandler.java
@@ -454,6 +454,10 @@ public abstract class InputHandler implements InputProcessor, GestureListener{
     public void update(){
         player.typing = ui.chatfrag.shown();
 
+        if(player.dead()){
+            droppingItem = false;
+        }
+
         if(player.isBuilder()){
             player.unit().updateBuilding(isBuilding);
         }