Zakharov_Rostislav/PIbd-23_ZakharovR.A._Battleship_Hard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lab5 preparations for pull request p.2

Browse Source
This commit is contained in:
Zakharov_Rostislav 2023-12-09 09:55:52 +04:00
parent 3e82235fc8
commit 7fb34d7482
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/drawing_objects/DrawingShip.java
View File

@ -25,11 +25,11 @@ public class DrawingShip {
return startPosY; return startPosY;
} }
private int shipWidth = 150; private int shipWidth = 150;
public int getShipWidth() { public int getWidth() {
return shipWidth; return shipWidth;
} }
private int shipHeight = 50; private int shipHeight = 50;
public int getShipHeight() { public int getHeight() {
return shipHeight; return shipHeight;
} }
public IMoveableObject getMoveableObject() {return new DrawingObjectShip(this);} public IMoveableObject getMoveableObject() {return new DrawingObjectShip(this);}

4
src/frames/FrameShipConfig.java
View File

@ -244,8 +244,8 @@ public class FrameShipConfig extends JFrame {
drawingShip.setBlocksNumber(blocksNumber); drawingShip.setBlocksNumber(blocksNumber);
} }
} }
drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getShipWidth() / 2, drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getWidth() / 2,
pictureBoxHeight / 2 - drawingShip.getShipHeight() / 2); pictureBoxHeight / 2 - drawingShip.getHeight() / 2);
pictureBox.repaint(); pictureBox.repaint();
return true; return true;
} catch (UnsupportedFlavorException | IOException e) { } catch (UnsupportedFlavorException | IOException e) {

2
src/frames/HardFrame.java
View File

@ -37,7 +37,7 @@ public class HardFrame extends JFrame {
}while(check); }while(check);
buttonMakeObject.addActionListener(e -> { buttonMakeObject.addActionListener(e -> {
DrawingShip drawingShip = generic.makeObject(); DrawingShip drawingShip = generic.makeObject();
drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getShipWidth()/2, pictureBoxHeight / 2 - drawingShip.getShipHeight()/2); drawingShip.setPosition(pictureBoxWidth / 2 - drawingShip.getWidth()/2, pictureBoxHeight / 2 - drawingShip.getHeight()/2);
drawing = drawingShip; drawing = drawingShip;
draw(); draw();
}); });

2
src/movement_strategy/DrawingObjectShip.java
View File

@ -13,7 +13,7 @@ public class DrawingObjectShip implements IMoveableObject{
if(drawingShip == null || drawingShip.getEntityShip() == null) if(drawingShip == null || drawingShip.getEntityShip() == null)
return null; return null;
return new ObjectParameters(drawingShip.getPosX(), drawingShip.getPosY(), return new ObjectParameters(drawingShip.getPosX(), drawingShip.getPosY(),
drawingShip.getShipWidth(), drawingShip.getShipHeight()); drawingShip.getWidth(), drawingShip.getHeight());
} }
@Override @Override
public int getStep(){ public int getStep(){