Marc/PTS3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mise en place de convention de nomage

Browse Source
This commit is contained in:
marc
2020-09-13 12:07:27 +02:00
parent 5190f8173f
commit 724e58276c
20 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/iutlaval/myapplication/Game/Cards/Card.java
+4 -5
View File
@@ -5,7 +5,7 @@ import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import com.iutlaval.myapplication.Game.Board;
import com.iutlaval.myapplication.Game.Player.Player;
import com.iutlaval.myapplication.Game.Players.Player;
import com.iutlaval.myapplication.R;
import com.iutlaval.myapplication.Video.Drawables.DrawableCard;
@@ -56,12 +56,11 @@ public abstract class Card {
*/
public Bitmap getFrameBitmap(Context c)
{
//TODO add a frame
if(frameBitmap == null) {
frameBitmap=BitmapFactory.decodeResource(c.getResources(), R.drawable.cadre_carte);
frameBitmap=BitmapFactory.decodeResource(c.getResources(), R.drawable.t_cc_defaut);
}
if(getFrameTexture() == R.drawable.cadre_carte)
if(getFrameTexture() == R.drawable.t_cc_defaut)
{
return frameBitmap;
}else{
@@ -79,7 +78,7 @@ public abstract class Card {
*/
public int getFrameTexture()
{
return R.drawable.cadre_carte;
return R.drawable.t_cc_defaut;
}
app/src/main/java/com/iutlaval/myapplication/Game/Cards/DemoCard.java
+1 -1
View File
@@ -20,7 +20,7 @@ public class DemoCard extends Card{
@Override
public int getCardPicture() {
return R.drawable.elfe_fournisseur;
return R.drawable.t_cp_elfe_fournisseur;
}