From fbf7485bd1d444f298099de542d324299f8520aa Mon Sep 17 00:00:00 2001 From: rozenkranzz Date: Mon, 10 Feb 2025 11:01:08 +0400 Subject: [PATCH] updated constructor --- Liner_Advanced/src/projectliner/DrawingLiner.java | 3 ++- Liner_Advanced/src/projectliner/FormLiner.java | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Liner_Advanced/src/projectliner/DrawingLiner.java b/Liner_Advanced/src/projectliner/DrawingLiner.java index 03a7bcc..3363b4b 100644 --- a/Liner_Advanced/src/projectliner/DrawingLiner.java +++ b/Liner_Advanced/src/projectliner/DrawingLiner.java @@ -17,11 +17,12 @@ public class DrawingLiner { public void init(int speed, double weight, Color primaryColor, Color secondaryColor, LinerEntityType type, int capacity, int maxPassengers, - boolean hasExtraDeck, boolean hasPool) { + boolean hasExtraDeck, boolean hasPool, int deckNum) { linerEntity = new LinerEntity(); deckDrawing = new DeckDrawing(); linerEntity.init(speed, weight, primaryColor, secondaryColor, type, capacity, maxPassengers, hasExtraDeck, hasPool); + deckDrawing.setDeckEnum(deckNum); pictureWidth = null; pictureHeight = null; startPosX = null; diff --git a/Liner_Advanced/src/projectliner/FormLiner.java b/Liner_Advanced/src/projectliner/FormLiner.java index 1d88b98..806de6a 100644 --- a/Liner_Advanced/src/projectliner/FormLiner.java +++ b/Liner_Advanced/src/projectliner/FormLiner.java @@ -140,14 +140,12 @@ public class FormLiner extends JFrame { new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)), new Color(random.nextInt(256), random.nextInt(256), random.nextInt(256)), LinerEntityType.CARGO, random.nextInt(9000) + 1000, - random.nextInt(90) + 10, random.nextBoolean(), random.nextBoolean()); + random.nextInt(90) + 10, random.nextBoolean(), random.nextBoolean(), numberOfDecks); drawingLiner.setPictureSize(pictureBoxLiner.getWidth(), pictureBoxLiner.getHeight()); drawingLiner.setPosition(random.nextInt(pictureBoxLiner.getWidth()), random.nextInt(pictureBoxLiner.getHeight())); - drawingLiner.setDeckNum(numberOfDecks); - drawTransport(); }