diff --git a/DrawningLocomotive.java b/DrawningLocomotive.java index e20d0ca..8f7e68d 100644 --- a/DrawningLocomotive.java +++ b/DrawningLocomotive.java @@ -180,7 +180,7 @@ public class DrawningLocomotive { if (strs[5] == "Simple") drawningExtra = new ExtraWheelsDraw(Integer.parseInt(strs[6]), Locomotive.getBodyColor()); if (strs[5] == "Star") drawningExtra = new ExtraStarWheelDraw(Integer.parseInt(strs[6]), Locomotive.getBodyColor()); if (strs[5] == "Round") drawningExtra = new ExtraRoundWheelDraw(Integer.parseInt(strs[6]), Locomotive.getBodyColor()); - if (drawningExtra == null) + if (drawningExtra == null) return null; if (strs.length == 7) { Locomotive = new EntityLocomotive( diff --git a/DrawningObjectLocomotive.java b/DrawningObjectLocomotive.java index 2695ed0..417cc14 100644 --- a/DrawningObjectLocomotive.java +++ b/DrawningObjectLocomotive.java @@ -39,4 +39,9 @@ public class DrawningObjectLocomotive implements IDrawningObject { { if (_locomotive != null) _locomotive.SetPosition(x, y, width, height); } + + public String getInfo(){ + if (_locomotive == null) return null; + return _locomotive.getDataForSave(); + } } diff --git a/IDrawningObject.java b/IDrawningObject.java index 80b49ff..1167973 100644 --- a/IDrawningObject.java +++ b/IDrawningObject.java @@ -8,6 +8,9 @@ public interface IDrawningObject { void MoveObject(Direction direction); /// Отрисовка объекта void DrawningObject(Graphics g); + + String getInfo(); + /// Получение текущей позиции объекта float[] GetCurrentPosition(); //0 - up