ristipolku: game/Engine.java comparison

comparison game/Engine.java @ 47:695cf13c103a

Move some code.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 22 Feb 2011 07:19:26 +0200
parents	3e8d1c30f573
children	f13bab4cccd3

comparison

equal deleted inserted replaced

-:3e8d1c30f573
+:695cf13c103a
 public boolean flagGameOver;
 Piece currPiece;
 int currX, currY, currPoint;
-public GameBoard()
+SoundManager soundManager;
+Sound sndPlaced;
+public GameBoard(SoundManager smgr)
 {
 board = new Piece[boardSize][boardSize];
 board[boardMiddle][boardMiddle] = new Piece(PieceType.START);
 currPoint = 0;
 pieceFinishTurn();
 flagGameOver = false;
+soundManager = smgr;
+sndPlaced = soundManager.getSound("sounds/placed.wav");
 }
 public void paint(Graphics2D g, int sx, int sy, float scale)
 {
 for (int y = 0; y < boardSize; y++)
 }
 private boolean isEmpty(int x, int y)
 {
-return (x >= 0 && x < boardSize && y >= 0 && y < boardSize && board[x][y] == null);
+return (x >= 0 && x < boardSize && y >= 0 &&
+y < boardSize && board[x][y] == null);
 }
 public void pieceRotate(Piece.RotateDir dir)
 {
 if (currPiece != null)
 {
 if (currPiece != null)
 {
 // Hit center starting piece, game over
 flagGameOver = true;
+currPiece = null;
 System.out.print("GameOver!\n");
 break;
 }
 else
 {
 }
 else
 {
 // Outside of the board, game over
 flagGameOver = true;
+currPiece = null;
 System.out.print("GameOver!\n");
 break;
 }
 }
+}
+public boolean keyHandler(KeyEvent e)
+{
+switch (e.getKeyCode())
+{
+case KeyEvent.VK_LEFT:
+case KeyEvent.VK_UP:
+pieceRotate(Piece.RotateDir.LEFT);
+return true;
+case KeyEvent.VK_RIGHT:
+case KeyEvent.VK_DOWN:
+pieceRotate(Piece.RotateDir.RIGHT);
+return true;
+case KeyEvent.VK_ENTER:
+soundManager.play(sndPlaced);
+pieceFinishTurn();
+return true;
+}
+return false;
 }
 }
 public class Engine extends JPanel
 BufferedImage lautaBG = null, lautaBGScaled = null;
 Dimension lautaDim;
 static final AudioFormat sfmt = new AudioFormat(22050, 16, 1, true, false);
-SoundManager smgr;
+SoundManager soundManager;
-Sound musa, placed;
+Sound musa;
 public Engine()
 {
 // Initialize globals
 System.out.print("Engine() constructor\n");
 gameClock = 0;
 gameFrames = 0;
 startTime = new Date().getTime();
 // Sound system
-smgr = new SoundManager(sfmt, 16);
+soundManager = new SoundManager(sfmt, 16);
 // Load resources
 try
 {
 ResourceLoader res = new ResourceLoader("graphics/board.jpg");
 {
 System.out.print("Could not initialize fonts.\n");
 }
 //            musa = smgr.getSound("sounds/gamemusic.wav");
-//            placed = smgr.getSound("sounds/placed.wav");
 }
 catch (IOException e)
 {
 JOptionPane.showMessageDialog(null,
 e.getMessage(),
 System.out.print(e.getMessage());
 }
 // Initialize game components
-lauta = new GameBoard();
+lauta = new GameBoard(soundManager);
 addKeyListener(this);
 addMouseListener(this);
 // Get initial focus
 if (!hasFocus())
 {
 System.out.print("Engine(): requesting focus\n");
 requestFocus();
 }
-smgr.play(musa);
+soundManager.play(musa);
 }
 public void paintComponent(Graphics g)
 {
 animEnable = false;
 animThread = null;
 }
 // Shut down sound manager
-smgr.close();
+soundManager.close();
 }
 public void mousePressed(MouseEvent e) { }
 public void mouseEntered(MouseEvent e) { }
 public void mouseExited(MouseEvent e) { }
 }
 public void keyPressed(KeyEvent e)
 {
 // Handle keyboard input
+if (lauta.keyHandler(e))
+return;
 switch (e.getKeyCode())
 {
-case KeyEvent.VK_LEFT:
-case KeyEvent.VK_UP:
-lauta.pieceRotate(Piece.RotateDir.LEFT);
-break;
-case KeyEvent.VK_RIGHT:
-case KeyEvent.VK_DOWN:
-lauta.pieceRotate(Piece.RotateDir.RIGHT);
-break;
-case KeyEvent.VK_ENTER:
-smgr.play(placed);
-lauta.pieceFinishTurn();
-break;
 case KeyEvent.VK_ESCAPE:
 break;
 }
 }

Mercurial > hg > ristipolku

comparison game/Engine.java @ 47:695cf13c103a