EpicKnarvik97/Fiasko
1
0
Fork 0
mirror of https://github.com/inf112-v20/Fiasko.git synced 2025-06-28 04:04:42 +02:00
Code Issues Projects Releases Wiki Activity

Fikser kodestil

Browse Source
This commit is contained in:
Kristian Knarvik
2020-03-16 20:06:35 +01:00
parent 49ee7dc896
commit b520178686
7 changed files with 74 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/inf112/fiasko/roborally/game_wrapper/CardChoiceScreen.java
View File

@ -16,8 +16,8 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
private final RoboRallyWrapper roboRallyWrapper;
private final OrthographicCamera camera;
private CardRectangle cardRectangle;
private ShapeRenderer shapeRenderer;
private final CardRectangle cardRectangle;
private final ShapeRenderer shapeRenderer;
public CardChoiceScreen(final RoboRallyWrapper roboRallyWrapper) {
this.roboRallyWrapper = roboRallyWrapper;
@ -28,7 +28,7 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
card1.y = 1200/2;
card1.width = 100;
card1.height = 100;
cardRectangle = new CardRectangle(card1, false);
cardRectangle = new CardRectangle(card1);
shapeRenderer = new ShapeRenderer();
shapeRenderer.setAutoShapeType(true);
Gdx.input.setInputProcessor(this);
@ -36,7 +36,7 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
@Override
public void show() {
//Nothing to do
}
@Override
@ -61,27 +61,27 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
@Override
public void resize(int i, int i1) {
//Nothing to do
}
@Override
public void pause() {
//Nothing to do
}
@Override
public void resume() {
//Nothing to do
}
@Override
public void hide() {
//Nothing to do
}
@Override
public void dispose() {
//Nothing to do
}
@Override
@ -99,11 +99,10 @@ public class CardChoiceScreen extends InputAdapter implements Screen {
}
class CardRectangle {
Rectangle rectangle;
boolean selected;
protected final Rectangle rectangle;
protected boolean selected = false;
CardRectangle(Rectangle rectangle, boolean selected) {
CardRectangle(Rectangle rectangle) {
this.rectangle = rectangle;
this.selected = selected;
}
}