Keys should be defined by their action names

Co-authored-by: r3cp3ct <45179536+r3cp3ct@users.noreply.github.com>
Co-authored-by: sigonasr2 <sigonasr2@gmail.com>
main
sigonasr2, Sig, Sigo 3 years ago committed by GitHub
parent 864777f9bd
commit e017e02106
  1. 15
      src/sig/objects/EditorRenderer.java
  2. 11
      src/sig/objects/LevelRenderer.java

@ -31,6 +31,8 @@ public class EditorRenderer extends LevelRenderer{
final static char CAMERA_SPD = 512;
boolean dataTileView=false;
public EditorRenderer(Panel panel) {
super(panel);
setX(3.5*Tile.TILE_WIDTH);
@ -180,6 +182,14 @@ public class EditorRenderer extends LevelRenderer{
int tileX = (int)(RabiClone.MOUSE_POS.getX()+getX())/Tile.TILE_WIDTH;
int tileY = (int)(RabiClone.MOUSE_POS.getY()+getY())/Tile.TILE_HEIGHT;
switch (a) {
case PLAY_GAME:{
RabiClone.OBJ.remove(RabiClone.level_renderer);
RabiClone.OBJ.add(RabiClone.level_renderer = new LevelRenderer(RabiClone.p));
RabiClone.StartGame();
}break;
case LEVEL_EDITOR:{
dataTileView=!dataTileView;
}break;
case EDITOR_SET_VIEW:{
RabiClone.CURRENT_MAP.setView(tileX,tileY,View.values()[(RabiClone.CURRENT_MAP.getView(tileX, tileY).ordinal()+1)%View.values().length]);
}break;
@ -190,10 +200,5 @@ public class EditorRenderer extends LevelRenderer{
RabiClone.CURRENT_MAP.setBackground(tileX,tileY,Background.values()[(RabiClone.CURRENT_MAP.getBackground(tileX, tileY).ordinal()+1)%Background.values().length]);
}break;
}
if (Key.isKeyHeld(KeyEvent.VK_F1)) {
RabiClone.OBJ.remove(RabiClone.level_renderer);
RabiClone.OBJ.add(RabiClone.level_renderer = new LevelRenderer(RabiClone.p));
RabiClone.StartGame();
}
}
}

@ -110,11 +110,14 @@ public class LevelRenderer extends Object{
}
@Override
@SuppressWarnings("incomplete-switch")
public void KeyPressed(Action a) {
if (Key.isKeyHeld(KeyEvent.VK_F2)) {
RabiClone.OBJ.clear();
RabiClone.ResetGame();
RabiClone.OBJ.add(RabiClone.level_renderer = new EditorRenderer(RabiClone.p));
switch(a) {
case LEVEL_EDITOR:{
RabiClone.OBJ.clear();
RabiClone.ResetGame();
RabiClone.OBJ.add(RabiClone.level_renderer = new EditorRenderer(RabiClone.p));
}break;
}
if (Key.isKeyHeld(KeyEvent.VK_F3)) {
RabiClone.OBJ.clear();

Loading…
Cancel
Save