commit 72ffd82cc29499ccefecd1c9e93ae29de571fab3
parent cbb4f04e23bcf2538a3f83d93ed5d002878a9edb
Author: mpizzzle <michael.770211@gmail.com>
Date: Sun, 3 Mar 2019 14:32:26 +0000
fixing cave game
Diffstat:
6 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/CaveGame/Assets/AlbumArtSmall.jpg b/CaveGame/Assets/AlbumArtSmall.jpg
Binary files differ.
diff --git a/CaveGame/Assets/AlbumArt_{5A46157A-FA0D-4BB0-A4D7-98AC60E53D2A}_Large.jpg b/CaveGame/Assets/AlbumArt_{5A46157A-FA0D-4BB0-A4D7-98AC60E53D2A}_Large.jpg
Binary files differ.
diff --git a/CaveGame/Assets/AlbumArt_{5A46157A-FA0D-4BB0-A4D7-98AC60E53D2A}_Small.jpg b/CaveGame/Assets/AlbumArt_{5A46157A-FA0D-4BB0-A4D7-98AC60E53D2A}_Small.jpg
Binary files differ.
diff --git a/CaveGame/Assets/Folder.jpg b/CaveGame/Assets/Folder.jpg
Binary files differ.
diff --git a/CaveGame/src/CaveArea.java b/CaveGame/src/CaveArea.java
@@ -1,4 +1,7 @@
-import java.awt.*;
+import java.awt.Color;
+import java.awt.Graphics;
+import java.awt.Image;
+import java.awt.MediaTracker;
import java.io.File;
import java.io.IOException;
//import java.applet.AudioClip;
@@ -54,7 +57,7 @@ public class CaveArea extends JPanel {
Image load(CaveGame parent, String picture) {
try {
- Image im = ImageIO.read(new File("../Assets/" + picture));
+ Image im = ImageIO.read(new File("/home/mpizzzle/OldJavaGames/CaveGame/Assets/" + picture));
checkImage(im, picture);
return (im);
} catch (IOException e) {
@@ -106,5 +109,4 @@ public class CaveArea extends JPanel {
}
}
}
-
-}-
\ No newline at end of file
+}
diff --git a/CaveGame/src/CaveGame.java b/CaveGame/src/CaveGame.java
@@ -1,17 +1,19 @@
import java.awt.Color;
-import java.awt.EventQueue;
import java.awt.event.KeyEvent;
import java.awt.event.KeyListener;
-import javax.swing.JPanel;
+import javax.swing.JFrame;
//* Copyright (c) Mary Percival 2003 */
/* CaveGame game Created December 2003 */
-public class CaveGame extends JPanel implements KeyListener, Runnable {
+public class CaveGame extends JFrame implements KeyListener, Runnable {
private static final long serialVersionUID = -4869537669824700402L;
+ private static final int WIDTH = 613;
+ private static final int HEIGHT = 482;
private static CaveArea area;
CaveInterface currentCavern;
+ static Thread timer;
// *************************************************************
public static void main(String[] args) {
@@ -19,29 +21,27 @@ public class CaveGame extends JPanel implements KeyListener, Runnable {
caveGame.setLayout(null);
caveGame.setBackground(Color.white);
+ caveGame.setSize(WIDTH, HEIGHT);
area = new CaveArea(caveGame);
caveGame.add(area);
+ caveGame.setVisible(true);
+ //area.setBounds(0, 0, caveGame.getBounds().width, caveGame.getBounds().height);
+ area.setBounds(0, 0, WIDTH, HEIGHT);
area.setVisible(true);
- area.setBounds(0, 0, caveGame.getBounds().width, caveGame.getBounds().height);
- area.setBounds(0, 0, 1000, 1000);
caveGame.addKeyListener(caveGame);
area.addKeyListener(caveGame);
area.requestFocus();
- caveGame.start();
- EventQueue.invokeLater(caveGame);
- }
-
- public void start() {
- currentCavern = new FirstRoom(this, area);
- currentCavern.display();
- area.repaint();
- System.out.println("CaveGame Started");
+ caveGame.currentCavern = new FirstRoom(caveGame, area);
+ caveGame.currentCavern.display();
+ timer = new Thread(caveGame);
+ timer.start();
}
// this class will use just the key pressed event
+ @Override
public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_A) {
currentCavern = currentCavern.processA();
@@ -56,20 +56,21 @@ public class CaveGame extends JPanel implements KeyListener, Runnable {
currentCavern.display();
area.repaint();
} else if (e.getKeyCode() == KeyEvent.VK_ENTER) {
- start();
+ currentCavern = new FirstRoom(this, area);
+ currentCavern.display();
area.repaint();
}
}
+ @Override
public void keyReleased(KeyEvent e) {
}
+ @Override
public void keyTyped(KeyEvent e) {
}
@Override
public void run() {
- // TODO Auto-generated method stub
-
}
}
\ No newline at end of file
