From 7b11c97eb71faa1a747bf6dfd8d15931c52e7562 Mon Sep 17 00:00:00 2001
From: marc barbier <mmarc471@gmail.com>
Date: Mon, 4 Jan 2021 13:16:02 +0100
Subject: [PATCH] patch de la carte qui ne disparait pas

---
 .../java/com/iutlaval/myapplication/Game/GameLogicThread.java   | 2 +-
 .../iutlaval/myapplication/Video/Drawables/DrawableCard.java    | 2 +-
 .../main/java/com/iutlaval/myapplication/Video/Renderer.java    | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
index 8ba42a4..4fd923f 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java
@@ -12,6 +12,7 @@ import com.iutlaval.myapplication.Game.Cards.Card;
 import com.iutlaval.myapplication.Game.Cards.CardRegistery;
 import com.iutlaval.myapplication.GameActivity;
 import com.iutlaval.myapplication.R;
+import com.iutlaval.myapplication.Video.Drawables.Drawable;
 import com.iutlaval.myapplication.Video.Drawables.DrawableBitmap;
 import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
 import com.iutlaval.myapplication.Video.Drawables.DrawableSelfRemoving;
@@ -267,7 +268,6 @@ public class GameLogicThread extends Thread{
                         //detruit la carte sur le terrain du joueur
                         int zoneOfTheDestroyedCard = coms.recieveInt();
                         Card cardToDestroy = board.removeCardOnPlayerBoard(zoneOfTheDestroyedCard);
-                        Log.e("destroying",""+cardToDestroy);
                         renderer.removeToDraw(cardToDestroy);
                         break;
 
diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
index 7ced5d8..35ce53e 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Video/Drawables/DrawableCard.java
@@ -205,7 +205,7 @@ public class DrawableCard extends Drawable{
 
         cardOnBoardDrawable = new DrawableBitmap(cardOnBoardBitmap,x,y,toString()+"BOARD",CARD_ON_BOARD_DRAWABLE_WIDTH*ratio,CARD_ON_BOARD_DRAWABLE_HEIGHT*ratio);
 
-        c.setDrawableCard(this);
+        if(ratio == 1)c.setDrawableCard(this);
 
         updateHpAndAtk(c.getAttack(),c.getHealth());
         setCoordinates(getX(), getY());
diff --git a/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java b/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java
index 9c0eeb6..c2910c3 100644
--- a/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java
+++ b/app/src/main/java/com/iutlaval/myapplication/Video/Renderer.java
@@ -127,7 +127,6 @@ public class Renderer extends SurfaceView implements SurfaceHolder.Callback {
     }
 
 
-
     /**
      * main drawing thread render each frame
      */