From e85007cd5ab730244f97c1ce1f18b654644d1c02 Mon Sep 17 00:00:00 2001
From: Louis MALTERRE <malterre.louis@laposte.net>
Date: Thu, 1 Dec 2022 12:06:32 +0100
Subject: [PATCH] j'ai remis de l'ordre dans entity, character et jeu LM
---
MAVENProject/src/main/java/entity/Character.java | 4 ++--
MAVENProject/src/main/java/jeu/Jeu.java | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/MAVENProject/src/main/java/entity/Character.java b/MAVENProject/src/main/java/entity/Character.java
index f8b3f6a..a4e298a 100644
--- a/MAVENProject/src/main/java/entity/Character.java
+++ b/MAVENProject/src/main/java/entity/Character.java
@@ -29,9 +29,9 @@ public class Character extends Entity{
- public Character(Coordonnees c, double vitesseMax, double m, double impSaut,double width,double height){
+ public Character(Coordonnees c, double vitesseMax, double m, double impSaut){
- super(c,vitesseMax,width,height); // comme tous les entities ont une hitbox, j'ai factorise
+ super(c,vitesseMax,30,60); // comme tous les entities ont une hitbox, j'ai factorise
this.masse = m;
this.impulsionSaut = impSaut;
this.setHitBox(new HitBox(c,entityHEIGHT,entityWIDTH));
diff --git a/MAVENProject/src/main/java/jeu/Jeu.java b/MAVENProject/src/main/java/jeu/Jeu.java
index 926a282..c0685f7 100644
--- a/MAVENProject/src/main/java/jeu/Jeu.java
+++ b/MAVENProject/src/main/java/jeu/Jeu.java
@@ -70,7 +70,7 @@ public class Jeu implements Game{
characterSkinPath = beginPath + movement + numberOfMovement + ".png"; // path premiere frame
/*A = new ArrayList<Double>();
n = 0;*/
- gameCharacterLoader = new CharacterLoader(characterSkinPath,new Character(new Coordonnees(300, 300), 2000, 1,600000,30,60));
+ gameCharacterLoader = new CharacterLoader(characterSkinPath,new Character(new Coordonnees(300, 300), 2000, 1,600000));
gameCharacter = gameCharacterLoader.getGameCharacter();
try {
helpReader = new BufferedReader(new FileReader(source));
--
GitLab