From 0de2841523d54c236ecff46e851161f5ac8d0e63 Mon Sep 17 00:00:00 2001 From: marc barbier Date: Sat, 9 Jan 2021 18:09:16 +0100 Subject: [PATCH] renomage carte --- .../myapplication/Game/Cards/Mythes/Mythes_Oedipie.java | 2 +- .../java/com/iutlaval/myapplication/Game/GameLogicThread.java | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java index 92e2c7e..d1762b1 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/Cards/Mythes/Mythes_Oedipie.java @@ -63,7 +63,7 @@ public class Mythes_Oedipie extends Card { */ @Override public String getName() { - return "Oedipe, Maudit malgrés lui"; + return "Oedipe"; } /** 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 1c5797d..9fdc658 100644 --- a/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java +++ b/app/src/main/java/com/iutlaval/myapplication/Game/GameLogicThread.java @@ -469,7 +469,6 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL renderer.moveToDraw(i* DrawableCard.getCardWith(),90F,c.getDrawableCard().getName()); i++; } - } /** @@ -548,7 +547,6 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL return false; } - //on ne peut pas avoir 2 requette simultané while(!requestAttackDone) { try { @@ -633,7 +631,6 @@ public class GameLogicThread extends Thread implements SoundPool.OnLoadCompleteL return isYourBattlePhase; } - @Override public void onLoadComplete(final SoundPool soundPool, int sampleId, int status) { soundPoolLoaded=true;