Commit: 05cc135621c23da07c29cef03100ad8d6cad1c55 - SpaceRocket (hg)

Commit MetaInfo

• Revisão: 05cc135621c23da07c29cef03100ad8d6cad1c55 (tree)
• Hora: 2021-11-29 03:15:56
• Autor: sebastian_bugiu
• Commiter: sebastian_bugiu

Mensagem de Log

Simplifying everything. Uncompilable.

Mudança Sumário

• modified: core/src/com/headwayent/spacerocket/HighScoreActivity.java
• modified: core/src/com/headwayent/spacerocket/SpaceRocket.java
• modified: core/src/com/headwayent/spacerocket/SpaceRocketMainView.java
• modified: core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
• modified: core/src/com/headwayent/spacerocket/old/FinalResults.java
• modified: core/src/com/headwayent/spacerocket/old/GraphicsManager.java
• modified: core/src/com/headwayent/spacerocket/old/SendThread.java
• modified: core/src/com/headwayent/spacerocket/old/SpaceRocketMain.java
• modified: core/src/com/headwayent/spacerocket/old/Status.java
• add: core/src/com/headwayent/spacerocket/Preferences.java
• add: core/src/com/headwayent/spacerocket/net/ClassRegistration.java
• add: core/src/com/headwayent/spacerocket/net/NetManager.java

Diff

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/HighScoreActivity.java
--- a/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/HighScoreActivity.java	Sun Nov 28 20:15:56 2021 +0200
@@ -53,7 +53,7 @@
 			break;
 		}
 		String msg = "Congratulations! You have reached a new " +
-				"High Score: " + status.Score + " taking " + status.NumPowerupsTaken +
+				"High Score: " + status.score + " taking " + status.numPowerupsTaken +
 				" powerups! Difficulty setting: " + diff;
 		gameEngine.uploadDataToFacebook(msg);
 		gameEngine.sendTweet(msg);

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/Preferences.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/com/headwayent/spacerocket/Preferences.java	Sun Nov 28 20:15:56 2021 +0200
@@ -0,0 +1,36 @@
+package com.headwayent.spacerocket;
+
+import com.badlogic.gdx.Gdx;
+
+public class Preferences {
+
+    private static final Preferences preferences = new Preferences();
+    private static final String PREFS_NAME = "spacerocket_prefs";
+    private static final String SOUNDS = "sounds";
+    private static final String ACCELEROMETER = "accelerometer";
+    private final com.badlogic.gdx.Preferences prefs;
+
+    private Preferences() {
+        prefs = Gdx.app.getPreferences(PREFS_NAME);
+    }
+
+    public boolean isSoundEnabled() {
+        return prefs.getBoolean(SOUNDS, true);
+    }
+
+    public void setSoundsEnabled(boolean soundsEnabled) {
+        prefs.putBoolean(SOUNDS, soundsEnabled).flush();
+    }
+
+    public boolean isAccelerometerEnabled() {
+        return prefs.getBoolean(ACCELEROMETER, false);
+    }
+
+    public void setAccelerometerEnabled(boolean accelerometerEnabled) {
+        prefs.putBoolean(ACCELEROMETER, accelerometerEnabled).flush();
+    }
+
+    public static Preferences getInstance() {
+        return preferences;
+    }
+}

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/SpaceRocket.java
--- a/core/src/com/headwayent/spacerocket/SpaceRocket.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/SpaceRocket.java	Sun Nov 28 20:15:56 2021 +0200
@@ -1,19 +1,31 @@
 package com.headwayent.spacerocket;
 
-import com.badlogic.gdx.ApplicationAdapter;
 import com.badlogic.gdx.Game;
-import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.utils.ScreenUtils;
 
 public class SpaceRocket extends Game {
-	SpriteBatch batch;
-	Texture img;
+
+	private static SpaceRocket game;
+	private SpriteBatch batch;
+	private TextureAtlas mainTextureAtlas;
+	private BitmapFont font;
+	private Mode mode;
+
+	public enum Mode {
+		CLIENT, SERVER
+	}
 	
 	@Override
 	public void create () {
+		game = this;
+		mode = Mode.CLIENT;
 		batch = new SpriteBatch();
-		img = new Texture("badlogic.jpg");
+		mainTextureAtlas = new TextureAtlas("spacerocket_textures");
+		font = new BitmapFont();
+		setScreen(new MainMenuActivity(this));
 	}
 
 	@Override
@@ -21,7 +33,7 @@
 		super.render();
 		ScreenUtils.clear(1, 0, 0, 1);
 		batch.begin();
-		batch.draw(img, 0, 0);
+//		batch.draw(img, 0, 0);
 		batch.end();
 	}
 
@@ -44,6 +56,26 @@
 	public void dispose () {
 		super.dispose();
 		batch.dispose();
-		img.dispose();
+		mainTextureAtlas.dispose();
+	}
+
+	public SpriteBatch getBatch() {
+		return batch;
+	}
+
+	public TextureAtlas getMainTextureAtlas() {
+		return mainTextureAtlas;
+	}
+
+	public BitmapFont getFont() {
+		return font;
+	}
+
+	public Mode getApplicationMode() {
+		return mode;
+	}
+
+	public static SpaceRocket getGame() {
+		return game;
 	}
 }

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/SpaceRocketMainView.java
--- a/core/src/com/headwayent/spacerocket/SpaceRocketMainView.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/SpaceRocketMainView.java	Sun Nov 28 20:15:56 2021 +0200
@@ -284,110 +284,105 @@
 		arrowsUpPressed = false,
 		arrowsDownPressed = false;
 		GraphicsManager gfx = game.getSpaceCanvas().getGraphicsManager();
-		gfx.getControlTransparency().lock();
-		try {
-			for (int p = 0; p < pointerCount; ++p) {
-				int pointerId = event.getPointerId(p);
-				int xPos = (int) event.getX(pointerId);
-				int yPos = (int) event.getY(pointerId);									
-				
-				if ((xPos > xLeftFire) && (xPos < xRightFire) &&
-						(yPos > yTopFire) && (yPos < yBottomFire)) {
-					if ((event.getAction() == MotionEvent.ACTION_DOWN) ||
-							(event.getAction() == MotionEvent.ACTION_MOVE)) {
-						game.getSpaceCanvas().recordKeyPressed(Canvas.FIRE);
-						if (!gfx.getFireSpriteTransparent().get()) {
-							gfx.getFireSprite().setImage(gfx.getFirePressedBitmap(), 
-									gfx.getFirePressedBitmap().getWidth(), 
-									gfx.getFirePressedBitmap().getHeight());
-						}
-						firePressed.set(true);// = true;
-					} else if ((event.getAction() == MotionEvent.ACTION_UP) ||
-							(event.getAction() == MotionEvent.ACTION_CANCEL)) {
-						game.getSpaceCanvas().recordKeyReleased(Canvas.FIRE);
+		for (int p = 0; p < pointerCount; ++p) {
+			int pointerId = event.getPointerId(p);
+			int xPos = (int) event.getX(pointerId);
+			int yPos = (int) event.getY(pointerId);
+
+			if ((xPos > xLeftFire) && (xPos < xRightFire) &&
+					(yPos > yTopFire) && (yPos < yBottomFire)) {
+				if ((event.getAction() == MotionEvent.ACTION_DOWN) ||
+						(event.getAction() == MotionEvent.ACTION_MOVE)) {
+					game.getSpaceCanvas().recordKeyPressed(Canvas.FIRE);
+					if (!gfx.getFireSpriteTransparent().get()) {
+						gfx.getFireSprite().setImage(gfx.getFirePressedBitmap(),
+								gfx.getFirePressedBitmap().getWidth(),
+								gfx.getFirePressedBitmap().getHeight());
 					}
-				} else if ((xPos > xLeftArrows) && (xPos < xRightArrows) &&
-						(yPos > yTopArrows) && (yPos < yBottomArrows)) {
-					boolean upperDiagonal = isLeft(
-							xRightArrows, yBottomArrows,
-							xLeftArrows, yTopArrows, 
-							xPos, yPos);
-					boolean lowerDiagonal = isLeft(
-							xRightArrows, yTopArrows,
-							xLeftArrows, yBottomArrows,
-							xPos, yPos);
-					if ((event.getAction() == MotionEvent.ACTION_DOWN) ||
-							(event.getAction() == MotionEvent.ACTION_MOVE)) {
-						if ((upperDiagonal) && (lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyPressed(Canvas.UP);
-							arrowsUpPressed = true;						
-						} else if ((upperDiagonal) && (!lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyPressed(Canvas.RIGHT);
-							arrowsRightPressed = true;
-						} else if ((!upperDiagonal) && (!lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyPressed(Canvas.DOWN);
-							arrowsDownPressed = true;
-						} else if ((!upperDiagonal) && (lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyPressed(Canvas.LEFT);
-							arrowsLeftPressed = true;
-						}
-						
-						gfx.getArrowsSprite().setImage(gfx.getArrowsPressedBitmap(), 
-								gfx.getArrowsPressedBitmap().getWidth(), 
-								gfx.getArrowsPressedBitmap().getHeight());
-						arrowsPressed.set(true);// = true;
-					}  else if ((event.getAction() == MotionEvent.ACTION_UP) ||
-							(event.getAction() == MotionEvent.ACTION_CANCEL)) {
-						if ((upperDiagonal) && (lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyReleased(Canvas.UP);
-						} else if ((upperDiagonal) && (!lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyReleased(Canvas.RIGHT);
-						} else if ((!upperDiagonal) && (!lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyReleased(Canvas.DOWN);
-						} else if ((!upperDiagonal) && (lowerDiagonal)) {
-							game.getSpaceCanvas().recordKeyReleased(Canvas.LEFT);
-						}
-					//	GraphicsManager gfx = game.getSpaceCanvas().getGraphicsManager();
-						gfx.getArrowsSprite().setImage(gfx.getArrowsBitmap(), 
-								gfx.getArrowsBitmap().getWidth(), 
-								gfx.getArrowsBitmap().getHeight());
-						arrowsPressed.set(false);// = false;
+					firePressed.set(true);// = true;
+				} else if ((event.getAction() == MotionEvent.ACTION_UP) ||
+						(event.getAction() == MotionEvent.ACTION_CANCEL)) {
+					game.getSpaceCanvas().recordKeyReleased(Canvas.FIRE);
+				}
+			} else if ((xPos > xLeftArrows) && (xPos < xRightArrows) &&
+					(yPos > yTopArrows) && (yPos < yBottomArrows)) {
+				boolean upperDiagonal = isLeft(
+						xRightArrows, yBottomArrows,
+						xLeftArrows, yTopArrows,
+						xPos, yPos);
+				boolean lowerDiagonal = isLeft(
+						xRightArrows, yTopArrows,
+						xLeftArrows, yBottomArrows,
+						xPos, yPos);
+				if ((event.getAction() == MotionEvent.ACTION_DOWN) ||
+						(event.getAction() == MotionEvent.ACTION_MOVE)) {
+					if ((upperDiagonal) && (lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyPressed(Canvas.UP);
+						arrowsUpPressed = true;
+					} else if ((upperDiagonal) && (!lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyPressed(Canvas.RIGHT);
+						arrowsRightPressed = true;
+					} else if ((!upperDiagonal) && (!lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyPressed(Canvas.DOWN);
+						arrowsDownPressed = true;
+					} else if ((!upperDiagonal) && (lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyPressed(Canvas.LEFT);
+						arrowsLeftPressed = true;
 					}
-				}
-				
-			}
-			if (!firePressed.get()) {
-				game.getSpaceCanvas().recordKeyReleased(Canvas.FIRE);
-			}
-			if (!arrowsUpPressed) {
-				game.getSpaceCanvas().recordKeyReleased(Canvas.UP);
-			}
-			if (!arrowsRightPressed) {
-				game.getSpaceCanvas().recordKeyReleased(Canvas.RIGHT);
-			}
-			if (!arrowsDownPressed) {
-				game.getSpaceCanvas().recordKeyReleased(Canvas.DOWN);
-			}
-			if (!arrowsLeftPressed) {
-				game.getSpaceCanvas().recordKeyReleased(Canvas.LEFT);
-			}
-			
-			if (!firePressed.get()) {
-				if (!gfx.getFireSpriteTransparent().get()) {
-					gfx.getFireSprite().setImage(gfx.getFireBitmap(), 
-							gfx.getFireBitmap().getWidth(), 
-							gfx.getFireBitmap().getHeight());
+
+					gfx.getArrowsSprite().setImage(gfx.getArrowsPressedBitmap(),
+							gfx.getArrowsPressedBitmap().getWidth(),
+							gfx.getArrowsPressedBitmap().getHeight());
+					arrowsPressed.set(true);// = true;
+				}  else if ((event.getAction() == MotionEvent.ACTION_UP) ||
+						(event.getAction() == MotionEvent.ACTION_CANCEL)) {
+					if ((upperDiagonal) && (lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyReleased(Canvas.UP);
+					} else if ((upperDiagonal) && (!lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyReleased(Canvas.RIGHT);
+					} else if ((!upperDiagonal) && (!lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyReleased(Canvas.DOWN);
+					} else if ((!upperDiagonal) && (lowerDiagonal)) {
+						game.getSpaceCanvas().recordKeyReleased(Canvas.LEFT);
+					}
+				//	GraphicsManager gfx = game.getSpaceCanvas().getGraphicsManager();
+					gfx.getArrowsSprite().setImage(gfx.getArrowsBitmap(),
+							gfx.getArrowsBitmap().getWidth(),
+							gfx.getArrowsBitmap().getHeight());
+					arrowsPressed.set(false);// = false;
 				}
 			}
-			
-			if (!arrowsPressed.get()) {
-			//	GraphicsManager gfx = game.getSpaceCanvas().getGraphicsManager();
-				gfx.getArrowsSprite().setImage(gfx.getArrowsBitmap(), 
-						gfx.getArrowsBitmap().getWidth(), 
-						gfx.getArrowsBitmap().getHeight());
+
+		}
+		if (!firePressed.get()) {
+			game.getSpaceCanvas().recordKeyReleased(Canvas.FIRE);
+		}
+		if (!arrowsUpPressed) {
+			game.getSpaceCanvas().recordKeyReleased(Canvas.UP);
+		}
+		if (!arrowsRightPressed) {
+			game.getSpaceCanvas().recordKeyReleased(Canvas.RIGHT);
+		}
+		if (!arrowsDownPressed) {
+			game.getSpaceCanvas().recordKeyReleased(Canvas.DOWN);
+		}
+		if (!arrowsLeftPressed) {
+			game.getSpaceCanvas().recordKeyReleased(Canvas.LEFT);
+		}
+
+		if (!firePressed.get()) {
+			if (!gfx.getFireSpriteTransparent().get()) {
+				gfx.getFireSprite().setImage(gfx.getFireBitmap(),
+						gfx.getFireBitmap().getWidth(),
+						gfx.getFireBitmap().getHeight());
 			}
-		} finally {
-			gfx.getControlTransparency().unlock();
+		}
+
+		if (!arrowsPressed.get()) {
+		//	GraphicsManager gfx = game.getSpaceCanvas().getGraphicsManager();
+			gfx.getArrowsSprite().setImage(gfx.getArrowsBitmap(),
+					gfx.getArrowsBitmap().getWidth(),
+					gfx.getArrowsBitmap().getHeight());
 		}
 		return true;
 	}

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/net/ClassRegistration.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/com/headwayent/spacerocket/net/ClassRegistration.java	Sun Nov 28 20:15:56 2021 +0200
@@ -0,0 +1,38 @@
+package com.headwayent.spacerocket.net;
+
+import com.badlogic.gdx.math.Matrix3;
+import com.badlogic.gdx.math.Matrix4;
+import com.badlogic.gdx.math.Vector3;
+import com.esotericsoftware.kryo.Kryo;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.TreeMap;
+import java.util.TreeSet;
+
+public class ClassRegistration {
+
+    public static void register(Kryo kryo) {
+
+        kryo.register(byte[].class);
+        kryo.register(short[].class);
+        kryo.register(char[].class);
+        kryo.register(int[].class);
+        kryo.register(long[].class);
+        kryo.register(float[].class);
+        kryo.register(double[].class);
+
+        kryo.register(ArrayList.class);
+        kryo.register(LinkedList.class);
+        kryo.register(TreeSet.class);
+        kryo.register(HashSet.class);
+        kryo.register(TreeMap.class);
+        kryo.register(HashMap.class);
+
+        kryo.register(Vector3.class);
+        kryo.register(Matrix4.class);
+        kryo.register(Matrix3.class);
+    }
+}

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/net/NetManager.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/core/src/com/headwayent/spacerocket/net/NetManager.java	Sun Nov 28 20:15:56 2021 +0200
@@ -0,0 +1,29 @@
+package com.headwayent.spacerocket.net;
+
+import com.esotericsoftware.kryo.Kryo;
+import com.esotericsoftware.kryonet.Client;
+import com.esotericsoftware.kryonet.rmi.ObjectSpace;
+import com.headwayent.spacerocket.SpaceRocket;
+
+public class NetManager {
+
+    public static final int MAX_UDP_DATAGRAM_SIZE = 1400;
+    public static final int WRITE_BUFFER_SIZE = 65536;
+    public static final int OBJECT_BUFFER_SIZE = 65536;
+    private static final NetManager netManager = new NetManager();
+    private Kryo kryo;
+    private Client client;
+
+    public NetManager() {
+        if (SpaceRocket.getGame().getApplicationMode() == SpaceRocket.Mode.CLIENT) {
+            client = new Client(WRITE_BUFFER_SIZE, OBJECT_BUFFER_SIZE);
+            kryo = client.getKryo();
+            ClassRegistration.register(kryo);
+        }
+        ObjectSpace.registerClasses(kryo);
+    }
+
+    public static NetManager getInstance() {
+        return netManager;
+    }
+}

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java
--- a/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/ExtendedCanvas.java	Sun Nov 28 20:15:56 2021 +0200
@@ -1,11 +1,14 @@
 package com.headwayent.spacerocket.old;
 
+import com.badlogic.gdx.ScreenAdapter;
+import com.badlogic.gdx.graphics.g2d.GlyphLayout;
+import com.badlogic.gdx.utils.ScreenUtils;
 import com.headwayent.spacerocket.HighScoreActivity;
 import com.headwayent.spacerocket.HighScoreInvertedComparator;
 import com.headwayent.spacerocket.OptionsMenuManager;
+import com.headwayent.spacerocket.SpaceRocket;
 import com.headwayent.spacerocket.SpaceRocketActivity;
 import com.headwayent.spacerocket.SpaceRocketMainView;
-import com.headwayent.microedition.lcdui.game.GameCanvas;
 import com.headwayent.microedition.media.MediaException;
 import com.headwayent.microedition.rms.InvalidRecordIDException;
 import com.headwayent.microedition.rms.RecordEnumeration;
@@ -24,7 +27,7 @@
 import android.graphics.Rect;
 import android.view.View;
 
-public class ExtendedCanvas extends GameCanvas {
+public class ExtendedCanvas extends ScreenAdapter {
 	
 	public static final float ACCELEROMETER_ERROR = 3.0f;
 	public static final float FLOAT_EPSILON = 0.00001f;
@@ -47,7 +50,6 @@
     private static int OTHER_SHIP_LIVES_WIDTH;
     private static int HIGH_SCORE_WIDTH;
     private int DISP_WIDTH, DISP_HEIGHT;
-    private SpaceRocket gameEngine;
     private GraphicsManager gfxMgmt;
     private int InitialGameTicks = 950;
     private int OldGameTicks = InitialGameTicks;
@@ -55,11 +57,7 @@
     public static final int BLACK = 0xff000000;
     public static final int WHITE = 0xffffffff;
     private String timeString;
-    private Status status;// = new Status();
-    private RecordStore highScoreStore;
-    private RecordStore nameStore;
-    private RecordEnumeration highScoreEnum;
-//	private RecordEnumeration nameEnum;
+    private Status status = new Status();
     private HighScoreComparator comparator;
     
     private int keyCode;
@@ -83,13 +81,6 @@
     private boolean rollReleased, pitchReleased;
     private AtomicBoolean checkFirePressed = new AtomicBoolean();
     
-    /*	private boolean GameOver;
-    private int Score;
-    private int LivesRemaining;*/
-    public void setHighScoreEnumNull() {
-        setHighScoreEnum(null);
-    }
-    
     public void updateDisplayMetrics() {
     	DISP_WIDTH = getWidth();
         DISP_HEIGHT = getHeight();
@@ -101,103 +92,25 @@
         GraphicsManager.setDISP_HEIGHT(DISP_HEIGHT);
     }
 
-	public ExtendedCanvas(View view, SpaceRocket midlet) {
-		super(view);
-		// TODO Auto-generated constructor stub
-		
-		setGameEngine(midlet);
-        
-		synchronized(this) {
-	        status = new Status();
-	        status.LivesRemaining = NUM_LIVES;
-	        status.GameTicks = InitialGameTicks;
-		
-		//	initStatus();
-	        updateDisplayMetrics();
-	        FONT = new Paint();
-	        FONT.setAntiAlias(true);
-	        FontMetrics metrics = FONT.getFontMetrics();
-	        FONT_HEIGHT = (int) (metrics.bottom - metrics.top);
-	        Rect rect = new Rect();
-	        String sc = "Score : 0000";
-	        FONT.getTextBounds(sc, 0, sc.length(), rect);
-	        SCORE_WIDTH = rect.width();
-	        String hs = "HIGH_SCORE:";
-	        FONT.getTextBounds(hs, 0, hs.length(), rect);
-	        HIGH_SCORE_WIDTH = rect.width();
-	        String tm = "Time: 10:00";
-	        FONT.getTextBounds(tm, 0, tm.length(), rect);
-	        TIME_WIDTH = rect.width();
-	        String lv = "Lives : 00";
-	        FONT.getTextBounds(lv, 0, lv.length(), rect);
-	        LIVES_WIDTH = rect.width();
-	        FONT.getTextBounds(messagePending, 0, messagePending.length(), rect);
-	        MESSAGE_WIDTH = rect.width();
-	        comparator = new HighScoreComparator();
-	        try {
-		        gfxMgmt = new GraphicsManager(CORNER_X, CORNER_Y, DISP_WIDTH, DISP_HEIGHT,
-		                getGameEngine(), status, this);
-	        } catch (RuntimeException e) {
-	        	e.printStackTrace();
-	        	throw e;
-	        }
-	        
-	        try {
-	            highScoreStore = RecordStore.openRecordStore(gameEngine.getContext(),
-	            		"highscores", true);
-	        } catch (RecordStoreFullException e) {
-	            // TODO Auto-generated catch block
-	            e.printStackTrace();
-	        } catch (RecordStoreNotFoundException e) {
-	            // TODO Auto-generated catch block
-	            e.printStackTrace();
-	        } catch (RecordStoreException e) {
-	            // TODO Auto-generated catch block
-	            e.printStackTrace();
-	        }
-	        try {
-	            highScoreEnum = highScoreStore.enumerateRecords(null,
-	                    comparator, false);
-	        } catch (RecordStoreNotOpenException e) {
-	            e.printStackTrace();
-	        }
-		}
+	public ExtendedCanvas() {
+        status.livesRemaining = NUM_LIVES;
+        status.gameTicks = InitialGameTicks;
+
+        updateDisplayMetrics();
+        String sc = "Score : 0000";
+        String hs = "HIGH_SCORE:";
+        String tm = "Time: 10:00";
+        String lv = "Lives : 00";
+        comparator = new HighScoreComparator();
+        try {
+            gfxMgmt = new GraphicsManager(CORNER_X, CORNER_Y, DISP_WIDTH, DISP_HEIGHT,
+                    status, this);
+        } catch (RuntimeException e) {
+            e.printStackTrace();
+            throw e;
+        }
 	}
 	
-	/**
-	 * @return the fONT
-	 */
-	private static synchronized Paint getFONT() {
-		return FONT;
-	}
-
-	/**
-	 * @return the gfxMgmt
-	 */
-	private synchronized GraphicsManager getGfxMgmt() {
-		return gfxMgmt;
-	}
-
-	private void initStatus() {
-	/*	status = new Status();
-        status.LivesRemaining = NUM_LIVES;
-        status.GameTicks = InitialGameTicks;
-        */
-	//	status = gfxMgmt.getStatus();
-	}
-	
-	public synchronized int getDispWidth() {
-        return DISP_WIDTH;
-    }
-
-    public synchronized int getDispHeight() {
-        return DISP_HEIGHT;
-    }
-
-    public GraphicsManager getGraphicsManager() {
-        return getGfxMgmt();
-    }
-
     public synchronized Status getStatus() {
         return status;
     }
@@ -228,7 +141,7 @@
     		initStatus();
     	}
 		getStatus().setGameOver(false);
-		getStatus().GameTicks = InitialGameTicks;
+		getStatus().gameTicks = InitialGameTicks;
         //	GameTicks = InitialGameTicks;
         OldGameTicks = InitialGameTicks;
     //    d.setCurrent(this);
@@ -240,9 +153,9 @@
     		initStatus();
     	}
     	getGfxMgmt().reset();
-        getStatus().Score = 0;        
-        getStatus().LivesRemaining = NUM_LIVES;
-        getStatus().NumPowerupsTaken = 0;
+        getStatus().score = 0;
+        getStatus().livesRemaining = NUM_LIVES;
+        getStatus().numPowerupsTaken = 0;
         resetTicks();
     }
     
@@ -253,10 +166,10 @@
     		initStatus();
     	}
         if(score != 0) {
-        	getStatus().Score = score;
+        	getStatus().score = score;
         }
         if(lives != 0) {
-        	getStatus().LivesRemaining = lives;
+        	getStatus().livesRemaining = lives;
         }
         if((currentBoss != -1) && (bossHealth != 0)) {
         	getGfxMgmt().getBossSprite()[currentBoss].setHealth(bossHealth);
@@ -267,22 +180,10 @@
         this.getGraphicsManager().getEngine().setSelectionMade();
     }
 
-//    public Display getDisplay() {
-//        return d;
-//    }
-
     public void flushKeys() {
         getKeyStates();
     }
 
-    //TODO add action when game is hidden
-    protected void hideNotify() {
-    }
-    
-    public synchronized RecordEnumeration getHighScoreEnum() {
-        return highScoreEnum;
-    }
-
     synchronized void setNotifyMessageReceived() {
         notifyMessageReceived = true;
         popNotify = true;
@@ -310,7 +211,43 @@
     public String getCoopName() {
         return coopName;
     }
-    
+
+    @Override
+    public void render(float delta) {
+        super.render(delta);
+        ScreenUtils.clear(0, 0, 0, 1);
+        SpaceRocket game = SpaceRocket.getGame();
+        game.getFont().draw(game.getBatch(), "Score: " + getStatus().score,
+                CORNER_X, CORNER_Y + 100);
+        game.getFont().draw(game.getBatch(), "Lives: " + getStatus().livesRemaining, (DISP_WIDTH - LIVES_WIDTH),
+                CORNER_Y + 100);
+
+//        if (mp) {
+//            game.getFont().draw(game.getBatch(), "coopName + Score: " + getStatus().score,
+//                    CORNER_X, CORNER_Y + 100);
+//            game.getFont().draw(game.getBatch(), "coopName + Lives: " + getStatus().livesRemaining, (DISP_WIDTH - LIVES_WIDTH),
+//                    CORNER_Y + 100);
+//        }
+
+        if((popNotify)) {
+            if(++elapsedFrames < 100) {
+                game.getFont().draw(game.getBatch(), messagePending, (DISP_WIDTH - MESSAGE_WIDTH) >> 1,
+                        DISP_HEIGHT - 70);
+            } else {
+                elapsedFrames = 0;
+                popNotify = false;
+                //    notifyMessageReceived = false;
+            }
+        }
+
+        if (getStatus().isGameOver()) {
+            GlyphLayout layout = new GlyphLayout(game.getFont(), "Game Over!");
+            game.getFont().draw(game.getBatch(), "Game Over!",
+                    (DISP_WIDTH - layout.width) / 2,
+                    (DISP_HEIGHT - layout.height) / 2);
+        }
+    }
+
     public void paint(Canvas gfx) {
     	gfx.drawARGB(0, 0, 0, 0);
     	try {
@@ -322,93 +259,20 @@
         if (getStatus() == null) {
     		initStatus();
     	}
-        if (getStatus().FirstTime == true) {
+        if (getStatus().firstTime) {
         	FONT.setColor(WHITE);
-        	
-        /*	gfx.drawText("HIGH SCORE:", (DISP_WIDTH - HIGH_SCORE_WIDTH) >> 1,
-                    DISP_HEIGHT - 100, FONT);
-        	byte[] record = null;
-            String name = "";
-            String score = "";
-            String difficulty = "";
-            //	int j = 0;
-            int height = 80;
-            while ((getHighScoreEnum() != null) && (getHighScoreEnum().hasNextElement())) {
-                try {
-                    record = getHighScoreEnum().nextRecord();
-                } catch (InvalidRecordIDException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                } catch (RecordStoreException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-                boolean found1 = false;
-                for (int i = 0; i < record.length; ++i) {
-                    if (record[i] == ',') {
-                        //	name += record[i];
-                        name = new String(record, 0, i);
-                        for(int j = i + 1; j < record.length; ++j) {
-                            if(record[j] == ',') {
-                                score = new String(record, i + 2, j - i - 2);
-                                difficulty = new String(record, j + 2, record.length - j - 2);
-                                found1 = true;
-                                break;
-                            }
-                        }
-                        //	j = i + 1;
-                        break;
-                    }
-                }
-                if(found1 == false) {
-                    try {
-                        getHighScoreEnum().reset();
-                        while(getHighScoreEnum().hasNextElement()) {
-                            getHighScoreStore().deleteRecord(getHighScoreEnum().nextRecordId());
-                        }
-                        getHighScoreEnum().rebuild();
-                    } catch (InvalidRecordIDException f) {
-                    // TODO Auto-generated catch block
-
-                    } catch (RecordStoreException f) {
-                        // TODO Auto-generated catch block
-                        f.printStackTrace();
-                    }
-                }
-
-
-                /*	for(int i = j; i < record.length; ++i) {
-                score += record[i];
-                }*/
-
-           /*     String ns = name + " " + score + " " + difficulty;
-                ns = ns.trim();
-                FONT.setTextAlign(Align.CENTER);
-                gfx.drawText(ns, //(int)((float)DISP_WIDTH - FONT.measureText(ns)) >> 1,
-                		((float)DISP_WIDTH * 0.5f), 
-                        DISP_HEIGHT - height, FONT);
-                FONT.setTextAlign(Align.LEFT);
-                height -= 15;
-            }
-            if (getHighScoreEnum() != null) {
-                getHighScoreEnum().reset();
-            }*/
         } else {
         	FONT.setColor(WHITE);
         	if(getGameEngine().isMP() == false) {
-        		gfx.drawText("Score: " + getStatus().Score, CORNER_X,
+        		gfx.drawText("Score: " + getStatus().score, CORNER_X,
                         CORNER_Y + 100, FONT);
-    /*            gfx.drawString("Time: " + formatTime(), (DISP_WIDTH - TIME_WIDTH) >> 1,
-                        DISP_HEIGHT - 50, Graphics.BOTTOM | Graphics.LEFT);*/
-                gfx.drawText("Lives: " + getStatus().LivesRemaining, (DISP_WIDTH - LIVES_WIDTH),
+                gfx.drawText("Lives: " + getStatus().livesRemaining, (DISP_WIDTH - LIVES_WIDTH),
                         CORNER_Y + 100, FONT);
         	}
         	if (getGameEngine().isMP() && (getGfxMgmt().getOtherSpaceRocket() != null)) {
-                gfx.drawText(getGameEngine().getName() + " Score: " + getStatus().Score, CORNER_X,
+                gfx.drawText(getGameEngine().getName() + " Score: " + getStatus().score, CORNER_X,
                         CORNER_Y + 100, FONT);
-    /*            gfx.drawString("Time: " + formatTime(), (DISP_WIDTH - TIME_WIDTH) >> 1,
-                        DISP_HEIGHT - 50, Graphics.BOTTOM | Graphics.LEFT);*/
-                gfx.drawText(getGameEngine().getName() + " Lives: " + getStatus().LivesRemaining, CORNER_X,
+                gfx.drawText(getGameEngine().getName() + " Lives: " + getStatus().livesRemaining, CORNER_X,
                         CORNER_Y + 80, FONT);
                 gfx.drawText(coopName + " Score: " + getGfxMgmt().getOtherSpaceRocket().GetScore(),
                         (DISP_WIDTH - OTHER_SHIP_SCORE_WIDTH), CORNER_Y + 100, 
@@ -416,42 +280,6 @@
                 gfx.drawText(coopName + " Lives: " + getGfxMgmt().getOtherSpaceRocket().GetNumLives(),
                         (DISP_WIDTH - OTHER_SHIP_LIVES_WIDTH),
                         CORNER_Y + 80, FONT);
-       /*         gfx.drawString("pos1: " + gfxMgmt.getClientPrediction().getPos1().x + " " +
-                        gfxMgmt.getClientPrediction().getPos1().y,
-                        10, 10, Graphics.TOP | Graphics.LEFT);
-                gfx.drawString("pos2: " + gfxMgmt.getClientPrediction().getPos2().x + " " +
-                        gfxMgmt.getClientPrediction().getPos2().y,
-                        10, 30, Graphics.TOP | Graphics.LEFT);
-                gfx.drawString("pos3: " + gfxMgmt.getClientPrediction().getPos3().x + " " +
-                        gfxMgmt.getClientPrediction().getPos3().y,
-                        10, 50, Graphics.TOP | Graphics.LEFT);
-                gfx.drawString("uppos: " + gfxMgmt.getClientPrediction().getUPPos().x + " " +
-                        gfxMgmt.getClientPrediction().getUPPos().y,
-                        10, 70, Graphics.TOP | Graphics.LEFT);
-                gfx.drawString("diffpos: " + gfxMgmt.getClientPrediction().getDiffPos().x + " " +
-                        gfxMgmt.getClientPrediction().getDiffPos().y,
-                        10, 90, Graphics.TOP | Graphics.LEFT);
-                gfx.drawString("SmoothNum: " + gfxMgmt.getClientPrediction().getCurrentSmoothNum(),
-                        10, 110, Graphics.TOP | Graphics.LEFT);
-                gfx.drawString("Pos: " + gfxMgmt.getOtherSpaceRocket().getXPos() + " " +
-                        gfxMgmt.getOtherSpaceRocket().getYPos(),
-                        10, 130, Graphics.TOP | Graphics.LEFT);*/
-                /*	System.out.println("Other ship score " +
-                gfxMgmt.getOtherSpaceRocket().GetScore());*/
-                
-                //Check if message received and alert player
-                synchronized(this) {
-                    if((popNotify)) {
-                        if(++elapsedFrames < 100) {
-                            gfx.drawText(messagePending, (DISP_WIDTH - MESSAGE_WIDTH) >> 1,
-                                    DISP_HEIGHT - 70, FONT);
-                        } else {
-                            elapsedFrames = 0;
-                            popNotify = false;
-                        //    notifyMessageReceived = false;
-                        }
-                    }
-                }
         	}
         }
         
@@ -469,7 +297,7 @@
     	if (getStatus() == null) {
     		initStatus();
     	}
-        if (getStatus().FirstTime == false) {
+        if (getStatus().firstTime == false) {
             //	--status.GameTicks;
         }
 
@@ -479,7 +307,7 @@
 			// TODO Auto-generated catch block
 			e1.printStackTrace();
 		}
-        if (((getStatus().GameTicks == 0) || (getStatus().LivesRemaining <= 0)) && (getStatus().getGameOver() == false)) {
+        if (((getStatus().gameTicks == 0) || (getStatus().livesRemaining <= 0)) && (getStatus().getGameOver() == false)) {
             if (!getGameEngine().isMP()) {
                 //     try {
                 if(!gameOver) {
@@ -645,10 +473,10 @@
     		initStatus();
     	}
         if(gameLoaded) {
-        	getStatus().FirstTime = false;
+        	getStatus().firstTime = false;
         	getGfxMgmt().appendSpaceRockets();
         }
-        if ((getStatus().FirstTime == true) && (getGameEngine().isMP() == false)) {
+        if ((getStatus().firstTime == true) && (getGameEngine().isMP() == false)) {
             int keyState = getKeyStates();
             if (showFireToast) {
             	
@@ -656,7 +484,7 @@
             }
             checkFirePressed.set(true);
             if ((keyState & FIRE_PRESSED) != 0) {
-            	getStatus().FirstTime = false;
+            	getStatus().firstTime = false;
                 if(!gameLoaded) {
                     this.reset();
                 }
@@ -669,11 +497,11 @@
             return;
         }
         
-        if ((getStatus().FirstTime == true) && (getGameEngine().isMP()) &&
+        if ((getStatus().firstTime == true) && (getGameEngine().isMP()) &&
                 (getGfxMgmt().getSpaceRocketsSet())) {
             this.reset();
             getGfxMgmt().appendSpaceRockets();
-            getStatus().FirstTime = false;
+            getStatus().firstTime = false;
         }
         if (!getStatus().getGameOver()) {
             int keyState = getKeyStates();
@@ -695,7 +523,7 @@
             	getGfxMgmt().setFire();
             }
             if ((getGameEngine().isMP()) && (this.keyCode == KEY_POUND) && (pressed)) {
-                if (getStatus().LivesRemaining > 0) {
+                if (getStatus().livesRemaining > 0) {
                 	getGfxMgmt().GiveLife();
                 //    gfxMgmt.getOtherSpaceRocket().IncrementLives(); NO need since we use full lives in mp
                 	getGfxMgmt().UpdateScore(true, false);
@@ -790,7 +618,7 @@
                 //		int lowestScore = Integer.parseInt(str);
                 getHighScoreEnum().rebuild();
                 getHighScoreEnum().reset();
-                if (lowestScore < getStatus().Score) {
+                if (lowestScore < getStatus().score) {
                     return true;
                 }
             }
@@ -839,36 +667,10 @@
     }
 
 	/**
-	 * @param highScoreEnum the highScoreEnum to set
-	 */
-	private synchronized void setHighScoreEnum(RecordEnumeration highScoreEnum) {
-		this.highScoreEnum = highScoreEnum;
-	}
-
-	/**
-	 * @param gameEngine the gameEngine to set
-	 */
-	private synchronized void setGameEngine(SpaceRocket gameEngine) {
-		this.gameEngine = gameEngine;
-	}
-
-	/**
-	 * @return the gameEngine
-	 */
-	private synchronized SpaceRocket getGameEngine() {
-		return gameEngine;
-	}
-
-	/**
 	 * @return the checkFirePressed
 	 */
 	public AtomicBoolean getCheckFirePressed() {
 		return checkFirePressed;
 	}
 	
-	public synchronized void setView(View view) {
-		super.setView(view);
-		
-	}
-
 }

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/old/FinalResults.java
--- a/core/src/com/headwayent/spacerocket/old/FinalResults.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/FinalResults.java	Sun Nov 28 20:15:56 2021 +0200
@@ -19,9 +19,9 @@
 	public void setResultsString() { //Before restart!!!
         Status status = spaceCanvas.getStatus();
         results = gameThread.getEngine().getName() + " :\n" +
-                "Score : " + status.Score + "\n" +
-                "Total lives lost : " + status.TotalNumLivesLost + "\n" +
-                "Total powerups taken : " + status.NumPowerupsTaken + "\n\n" +
+                "Score : " + status.score + "\n" +
+                "Total lives lost : " + status.totalNumLivesLost + "\n" +
+                "Total powerups taken : " + status.numPowerupsTaken + "\n\n" +
                 spaceCanvas.getCoopName() + " :\n" +
                 "Score : " + spaceCanvas.getGraphicsManager().getOtherSpaceRocket().GetScore();// + "\n" +
         //        "Total lives lost : " + status.CoopTotalNumLivesLost + "\n" +

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/old/GraphicsManager.java
--- a/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/GraphicsManager.java	Sun Nov 28 20:15:56 2021 +0200
@@ -1,5 +1,9 @@
 package com.headwayent.spacerocket.old;
 
+import com.badlogic.gdx.Gdx;
+import com.badlogic.gdx.audio.Sound;
+import com.badlogic.gdx.graphics.g2d.TextureAtlas;
+import com.headwayent.spacerocket.SpaceRocket;
 import com.headwayent.spacerocket.SpaceRocketMainView;
 import com.headwayent.SpaceRocketFull.R;
 import com.headwayent.microedition.lcdui.game.LayerManager;
@@ -14,7 +18,6 @@
 import java.util.Iterator;
 import java.util.Random;
 import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReentrantLock;
 
 import android.content.res.Resources;
 import android.graphics.Bitmap;
@@ -57,13 +60,12 @@
     private static final int SCREEN_HEIGHT_MULTIPLIER = 4;
     private static final int STAR_NUM = 500;
     private static final int PLANET_NUM = 8;
-    public static int CANVAS_X;
-    public static int CANVAS_Y;
-    private static int DISP_WIDTH;
-    private static int DISP_HEIGHT;
-    private int XDir = 0, YDir = 0;
-    private int shoot = 0;
-    private SpaceRocket gameEngine;
+    public int CANVAS_X;
+    public int CANVAS_Y;
+    private int DISP_WIDTH;
+    private int DISP_HEIGHT;
+    private int XDir, YDir;
+    private int shoot;
     private SpaceRocketSprite spaceRocket;
     private SpaceRocketSprite otherSpaceRocket;
     private EnemySprite[] enemy;
@@ -71,9 +73,7 @@
     private RocketSprite[] srrocketRightSprite;
     private RocketSprite[] otherRocketLeftSprite;
     private RocketSprite[] otherRocketRightSprite;
-//    private RocketSprite[] otherRocketSprite;
     private RocketSprite[] enemyrocketSprite;
-//    private RocketSprite[] srrocketSprite;
     private RocketSprite[] tripleRocketSpriteCenter;
     private RocketSprite[] tripleRocketSpriteLeft;
     private RocketSprite[] tripleRocketSpriteRight;
@@ -99,56 +99,17 @@
     private Sprite backgroundLayer;
     private AnimatedBackground animatedBackground;
     private boolean[] bossSpriteLaunched;
-    private Bitmap[] planetBitmap;
-    private Bitmap[] miniBossBitmap;
-    private Bitmap[] enemyBitmap;
-    private Bitmap[] enemyrocketBitmap;
-    private Bitmap[] srrocketBitmap;
-    private Bitmap[] srrocketLeftBitmap;
-    private Bitmap[] srrocketRightBitmap;
-    private Bitmap smokeBitmap;
-    private Bitmap earthBitmap;
-    private Bitmap atmosphereBitmap;
-    private Bitmap doubleDamageRocketBitmap;
-    private Bitmap centerRocketBitmap;
-    private Bitmap leftRocketBitmap;
-    private Bitmap rightRocketBitmap;
-    private Bitmap spaceRocketBitmap;
-    private Bitmap otherSpaceRocketBitmap;
-    private Bitmap explosionBitmap;
-    private Bitmap tiledBitmap;
-    private Bitmap boss1Bitmap;
-    private Bitmap boss2Bitmap;
-    private Bitmap boss3Bitmap;
-    private Bitmap boss4Bitmap;
-    private Bitmap[] PowerupBitmap;
-    private Bitmap starBitmap;
-    private Bitmap flamesBitmap;
-    private Bitmap shieldBitmap;
-    private Bitmap giveLifeBitmap;
-    private Bitmap arrowsBitmap;
-    private Bitmap arrowsPressedBitmap;
-    private Bitmap fireBitmap;
-    private Bitmap firePressedBitmap;
-    private Bitmap fireTransparentBitmap;
-    private Bitmap backgroundBitmap;
-    private Bitmap animatedBackgroundBitmap;
     private TiledLayer tiledLayer;
     private int numCol, numRows;
-    private InputStream explosionWAV;
-    private InputStream launchWAV;
-    private Player explodeSnd;
-    private Player launchSnd;
+    private Sound explodeSnd;
+    private Sound launchSnd;
     private Random rand;
-    //private Status status;
     private ConnectionThread connectionThread;
     private boolean giveLife;
     private boolean spaceRocketsSet;
-    private int ScoreQueue;
-    private int CurrentUpdateFrame = 0;
-    private int CurrentPowerup = 0;
-    private int CurrentBoss = -1;
-    //private Display display;
+    private int scoreQueue;
+    private int currentPowerup = 0;
+    private int currentBoss = -1;
     private ClientPrediction clientPrediction;
     private Position pos = new Position();
     private int spaceRocketGiveLifeCount, otherSpaceRocketGiveLifeCount;
@@ -157,7 +118,6 @@
     private boolean showEarth;
     private int advanceEarth;
     private AtomicBoolean fireSpriteTransparent = new AtomicBoolean();
-    private ReentrantLock controlTransparency = new ReentrantLock();
     private ExtendedCanvas spaceCanvas;
     
     /**
@@ -194,8 +154,8 @@
         /*	boolean b = scoreIncreased;
         scoreIncreased = false;
         return b;*/
-        if (ScoreQueue != 0) {
-            --ScoreQueue;
+        if (scoreQueue != 0) {
+            --scoreQueue;
             return true;
         }
         return false;
@@ -236,31 +196,14 @@
         return bossSprite[Num];
     }
 
-    public SpaceRocket getEngine() {
-        return gameEngine;
-    }
-
-	public GraphicsManager(int x, int y, int width, int height, SpaceRocket ge, Status status,
+	public GraphicsManager(int x, int y, int width, int height, Status status,
             ExtendedCanvas spaceCanvas) {
-		// TODO Auto-generated constructor stub
-		
-		
 		CANVAS_X = x;
         CANVAS_Y = y;
-        setDISP_WIDTH(width);
-        setDISP_HEIGHT(height);
-        ScoreQueue = 0;
-        
-        if (ge != null) {
-            gameEngine = ge;
-        }
+        DISP_WIDTH = width;
+        DISP_HEIGHT = height;
+
         this.spaceCanvas = spaceCanvas;
-        if (status != null) {
-        //    this.status = status;
-        }
-        if (spaceCanvas != null) {
-        //    this.spaceCanvas = spaceCanvas;
-        }
         rand = new Random(System.currentTimeMillis());
         
         if (bossSpriteLaunched == null) {
@@ -269,643 +212,359 @@
                 bossSpriteLaunched[i] = false;
             }
         }
-        if ((explodeSnd == null) && (launchSnd == null)) {
-            gameEngine.setSoundSupported(true);
-            Manager.setSoundNum(2);
-            try {
-                explodeSnd = Manager.createPlayer(R.raw.explode, "audio/X-wav");
-                launchSnd = Manager.createPlayer(R.raw.launch, "audio/X-wav");
-            } catch (MediaException e) {
-                gameEngine.setSoundSupported(false);
-            } catch (Exception e) {
-                gameEngine.setSoundSupported(false);
-            //    gameEngine.errorMsg(e);
-            }
-        }
-        Resources res = gameEngine.getContext().getResources();
-        if(smokeBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    smokeBitmap = new Bitmap("/smoke2_sm.png", gameEngine);
-            	smokeBitmap = BitmapFactory.decodeResource(res, R.raw.smoke2_sm);
-            } else {
+        explodeSnd = Gdx.audio.newSound(Gdx.files.internal("explode.wav"));
+        launchSnd = Gdx.audio.newSound(Gdx.files.internal("launch.wav"));
+        SpaceRocket game = SpaceRocket.getGame();
+        TextureAtlas mainTextureAtlas = game.getMainTextureAtlas();
+        mainTextureAtlas.createSprite()
             //    smokeBitmap = new Bitmap("/smoke2.png", gameEngine);
-            	smokeBitmap = BitmapFactory.decodeResource(res, R.raw.smoke2);
-            }
-        }
-        if (earthBitmap == null) {
         //    earthBitmap = new Bitmap("/earth.png", gameEngine);
-        	earthBitmap = BitmapFactory.decodeResource(res, R.raw.earth);
-        }
-        if (atmosphereBitmap == null) {
         //    atmosphereBitmap = new Bitmap("/atmosphere.png", gameEngine);
-        	atmosphereBitmap = BitmapFactory.decodeResource(res, R.raw.atmosphere);
-        }
-        if (planetBitmap == null) {
-            planetBitmap = new Bitmap[4];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            /*    planetBitmap[0] = new Bitmap("/planet0_sm.png", gameEngine);
-                planetBitmap[1] = new Bitmap("/planet1_sm.png", gameEngine);
-                planetBitmap[2] = new Bitmap("/planet0_sm.png", gameEngine);
-                planetBitmap[3] = new Bitmap("/planet1_sm.png", gameEngine);*/
-            	planetBitmap[0] = BitmapFactory.decodeResource(res, R.raw.planet0);
-            	planetBitmap[1] = BitmapFactory.decodeResource(res, R.raw.planet1);
-            	planetBitmap[2] = BitmapFactory.decodeResource(res, R.raw.planet0);
-            	planetBitmap[3] = BitmapFactory.decodeResource(res, R.raw.planet1);
-            } else {
             /*    planetBitmap[0] = new Bitmap("/planet0.png", gameEngine);
                 planetBitmap[1] = new Bitmap("/planet1.png", gameEngine);
                 planetBitmap[2] = new Bitmap("/planet0.png", gameEngine);
                 planetBitmap[3] = new Bitmap("/planet1.png", gameEngine);*/
-            	planetBitmap[0] = BitmapFactory.decodeResource(res, R.raw.planet0);
-            	planetBitmap[1] = BitmapFactory.decodeResource(res, R.raw.planet1);
-            	planetBitmap[2] = BitmapFactory.decodeResource(res, R.raw.planet0);
-            	planetBitmap[3] = BitmapFactory.decodeResource(res, R.raw.planet1);
-            }
-        }
-        if (miniBossBitmap == null) {
-            miniBossBitmap = new Bitmap[4];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            /*    miniBossBitmap[0] = new Bitmap("/miniboss0_sm.png", gameEngine);
-                miniBossBitmap[1] = new Bitmap("/miniboss1_sm.png", gameEngine);
-                miniBossBitmap[2] = new Bitmap("/miniboss2_sm.png", gameEngine);
-                miniBossBitmap[3] = new Bitmap("/miniboss3_sm.png", gameEngine);*/
-            	miniBossBitmap[0] = BitmapFactory.decodeResource(res, R.raw.miniboss0_sm);
-            	miniBossBitmap[1] = BitmapFactory.decodeResource(res, R.raw.miniboss1_sm);
-            	miniBossBitmap[2] = BitmapFactory.decodeResource(res, R.raw.miniboss2_sm);
-            	miniBossBitmap[3] = BitmapFactory.decodeResource(res, R.raw.miniboss3_sm);
-            } else {
             /*    miniBossBitmap[0] = new Bitmap("/miniboss0.png", gameEngine);
                 miniBossBitmap[1] = new Bitmap("/miniboss1.png", gameEngine);
                 miniBossBitmap[2] = new Bitmap("/miniboss2.png", gameEngine);
                 miniBossBitmap[3] = new Bitmap("/miniboss3.png", gameEngine);*/
-            	miniBossBitmap[0] = BitmapFactory.decodeResource(res, R.raw.miniboss0);
-            	miniBossBitmap[1] = BitmapFactory.decodeResource(res, R.raw.miniboss1);
-            	miniBossBitmap[2] = BitmapFactory.decodeResource(res, R.raw.miniboss2);
-            	miniBossBitmap[3] = BitmapFactory.decodeResource(res, R.raw.miniboss3);
-            }
-        }
-        if (giveLifeBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    giveLifeBitmap = new Bitmap("/circle_sm.png", gameEngine);
-            	giveLifeBitmap = BitmapFactory.decodeResource(res, R.raw.circle_sm);
-            } else {
             //    giveLifeBitmap = new Bitmap("/circle.png", gameEngine);
-            	giveLifeBitmap = BitmapFactory.decodeResource(res, R.raw.circle);
-            }
-        }
-        if (starBitmap == null) {
         //    starBitmap = new Bitmap("/star1.png", gameEngine);
-        	starBitmap = BitmapFactory.decodeResource(res, R.raw.star1);
-        }
-        if (flamesBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    flamesBitmap = new Bitmap("/flames_sm.png", gameEngine);
-            	flamesBitmap = BitmapFactory.decodeResource(res, R.raw.flames_sm);
-            } else {
             //    flamesBitmap = new Bitmap("/flames.png", gameEngine);
-            	flamesBitmap = BitmapFactory.decodeResource(res, R.raw.flames);
-            }
-        }
-        if (boss1Bitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    boss1Bitmap = new Bitmap("/boss1ff_sm.png", gameEngine);
-            	boss1Bitmap = BitmapFactory.decodeResource(res, R.raw.boss1ff_sm);
-            } else {
             //    boss1Bitmap = new Bitmap("/boss1ff.png", gameEngine);
-            	boss1Bitmap = BitmapFactory.decodeResource(res, R.raw.boss1ff);
-            }
-        }
-        if (boss2Bitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    boss2Bitmap = new Bitmap("/bossnou_sm.png", gameEngine);
-            	boss2Bitmap = BitmapFactory.decodeResource(res, R.raw.bossnou_sm);
-            } else {
             //    boss2Bitmap = new Bitmap("/bossnou.png", gameEngine);
-            	boss2Bitmap = BitmapFactory.decodeResource(res, R.raw.bossnou);
-            }
-        }
-        /*   if(boss2Bitmap == null) {
-        boss2Bitmap = new Bitmap("/boss1ff.png", gameEngine);
-        }*/
-        if (boss3Bitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //	boss3Bitmap = new Bitmap("/boss00_sm.png", gameEngine);
-            	boss3Bitmap = BitmapFactory.decodeResource(res, R.raw.boss00_sm);
-            } else {
             //    boss3Bitmap = new Bitmap("/boss00.png", gameEngine);
-            	boss3Bitmap = BitmapFactory.decodeResource(res, R.raw.boss00);
-            }
-        }
-        if (boss4Bitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    boss4Bitmap = new Bitmap("/boss01_sm.png", gameEngine);
-            	boss4Bitmap = BitmapFactory.decodeResource(res, R.raw.boss01_sm);
-            } else {
             //    boss4Bitmap = new Bitmap("/boss01.png", gameEngine);
-            	boss4Bitmap = BitmapFactory.decodeResource(res, R.raw.boss01);
-            }
-        }
-        if (PowerupBitmap == null) {
-            PowerupBitmap = new Bitmap[4];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            /*    PowerupBitmap[0] = new Bitmap("/1upd_sm.png", gameEngine);
-                PowerupBitmap[1] = new Bitmap("/strikethrough3_sm.png", gameEngine);
-                PowerupBitmap[2] = new Bitmap("/multi2_sm.png", gameEngine);
-                PowerupBitmap[3] = new Bitmap("/shield1_sm.png", gameEngine);*/
-            	PowerupBitmap[0] = BitmapFactory.decodeResource(res, R.raw.oneupd_sm);
-            	PowerupBitmap[1] = BitmapFactory.decodeResource(res, R.raw.strikethrough3_sm);
-            	PowerupBitmap[2] = BitmapFactory.decodeResource(res, R.raw.multi2_sm);
-            	PowerupBitmap[3] = BitmapFactory.decodeResource(res, R.raw.shield1_sm);
-            } else {
             /*    PowerupBitmap[0] = new Bitmap("/1upd.png", gameEngine);
                 PowerupBitmap[1] = new Bitmap("/strikethrough3.png", gameEngine);
                 PowerupBitmap[2] = new Bitmap("/multi2.png", gameEngine);
                 PowerupBitmap[3] = new Bitmap("/shield1.png", gameEngine);*/
-            	PowerupBitmap[0] = BitmapFactory.decodeResource(res, R.raw.oneupd);
-            	PowerupBitmap[1] = BitmapFactory.decodeResource(res, R.raw.strikethrough3);
-            	PowerupBitmap[2] = BitmapFactory.decodeResource(res, R.raw.multi2);
-            	PowerupBitmap[3] = BitmapFactory.decodeResource(res, R.raw.shield1);
-            }
-        }
-        if (shieldBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    shieldBitmap = new Bitmap("/shield2_sm.png", gameEngine);
-            	shieldBitmap = BitmapFactory.decodeResource(res, R.raw.shield2_sm);
-            } else {
             //    shieldBitmap = new Bitmap("/shield2.png", gameEngine);
-            	shieldBitmap = BitmapFactory.decodeResource(res, R.raw.shield2);
-            }
-        }
-        if (centerRocketBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    centerRocketBitmap = new Bitmap("/multishoot_sm.png", gameEngine);
-            	centerRocketBitmap = BitmapFactory.decodeResource(res, R.raw.multishoot_sm);
-            } else {
             //    centerRocketBitmap = new Bitmap("/multishoot.png", gameEngine);
-            	centerRocketBitmap = BitmapFactory.decodeResource(res, R.raw.multishoot);
-            }
-        }
-        if (leftRocketBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    leftRocketBitmap = new Bitmap("/multishootleft_sm.png", gameEngine);
-            	leftRocketBitmap = BitmapFactory.decodeResource(res, R.raw.multishootleft_sm);
-            } else {
             //    leftRocketBitmap = new Bitmap("/multishootleft.png", gameEngine);
-            	leftRocketBitmap = BitmapFactory.decodeResource(res, R.raw.multishootleft);
-            }
-        }
-        if (rightRocketBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    rightRocketBitmap = new Bitmap("/multishootright_sm.png", gameEngine);
-            	rightRocketBitmap = BitmapFactory.decodeResource(res, 
-            			R.raw.multishootright_sm);
-            } else {
             //    rightRocketBitmap = new Bitmap("/multishootright.png", gameEngine);
-            	rightRocketBitmap = BitmapFactory.decodeResource(res, R.raw.multishootright);
-            }
-        }
-        if (doubleDamageRocketBitmap == null) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    doubleDamageRocketBitmap = new Bitmap("/strikethrough2_sm.png", gameEngine);
-            	doubleDamageRocketBitmap = BitmapFactory.decodeResource(res, 
-            			R.raw.strikethrough2_sm);
-            } else {
             //    doubleDamageRocketBitmap = new Bitmap("/strikethrough2.png", gameEngine);
-            	doubleDamageRocketBitmap = BitmapFactory.decodeResource(res,
-            			R.raw.strikethrough2);
-            }
-        }
-        BitmapFactory.Options opt = new Options();
-        if (tiledBitmap == null) {
         //    tiledBitmap = new Bitmap("/tiledback3.png", gameEngine);
-        	
-        	tiledBitmap = BitmapFactory.decodeResource(res, R.raw.tiledback3);
-        	
-        }
         //createTiledLayer();
         createAnimatedBackground();
-        if ((explosion == null) && (explosionBitmap == null)) {
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    explosionBitmap = new Bitmap("/explosion_sm.png", gameEngine);
-            	explosionBitmap = BitmapFactory.decodeResource(res, R.raw.explosion_sm);
-            } else {
-            //    explosionBitmap = new Bitmap("/explosion.png", gameEngine);
-            	explosionBitmap = BitmapFactory.decodeResource(res, R.raw.explosion);
-            }
-            explosion = new ExplosionSprite[16];
-            for (int i = 0; i < explosion.length; ++i) {
-                //    int w = explosionBitmap.getBitmap().getWidth();
-                //    int h = explosionBitmap.getBitmap().getHeight();
-                explosion[i] = new ExplosionSprite(explosionBitmap); //, 34, 33);
-                //	explosion[i].setVisible(false);
-                append(explosion[i]);
+        //    explosionBitmap = new Bitmap("/explosion.png", gameEngine);
+        explosion = new ExplosionSprite[16];
+        for (int i = 0; i < explosion.length; ++i) {
+            //    int w = explosionBitmap.getBitmap().getWidth();
+            //    int h = explosionBitmap.getBitmap().getHeight();
+            explosion[i] = new ExplosionSprite(explosionBitmap); //, 34, 33);
+            //	explosion[i].setVisible(false);
+            append(explosion[i]);
+        }
+        /*    enemyBitmap[0] = new Bitmap("/enemy03.png", gameEngine);
+            enemyBitmap[1] = new Bitmap("/enemy00.png", gameEngine);
+            enemyBitmap[2] = new Bitmap("/enemy01.png", gameEngine);
+            enemyBitmap[3] = new Bitmap("/enemy02.png", gameEngine);*/
+        /*    enemyrocketBitmap[0] = new Bitmap("/enemyshot0.png", gameEngine);
+            enemyrocketBitmap[1] = new Bitmap("/enemyshot1.png", gameEngine);
+            enemyrocketBitmap[2] = new Bitmap("/enemyshot2.png", gameEngine);
+            enemyrocketBitmap[3] = new Bitmap("/enemyshot3.png", gameEngine);*/
+        //    srrocketBitmap[0] = new Bitmap("/playershoot.png", gameEngine);
+        //    srrocketLeftBitmap[0] = new Bitmap("/shootleft.png", gameEngine);
+        //    srrocketRightBitmap[0] = new Bitmap("/shootright.png", gameEngine);
+        arrowsBitmap = BitmapFactory.decodeResource(res, R.raw.touch_arrows);
+        arrowsPressedBitmap =
+            BitmapFactory.decodeResource(res, R.raw.touch_arrows_pressed);
+        fireBitmap = BitmapFactory.decodeResource(res, R.raw.touch_fire);
+        firePressedBitmap =
+            BitmapFactory.decodeResource(res, R.raw.touch_fire_pressed);
+        fireTransparentBitmap =
+            BitmapFactory.decodeResource(res, R.raw.touch_fire_trans);
+        arrowsSprite = new SynchronizedSprite(arrowsBitmap, arrowsBitmap.getWidth(),
+                arrowsBitmap.getHeight());
+        arrowsSprite.setVisible(false);
+        append(arrowsSprite);
+        fireSprite = new SynchronizedSprite(fireBitmap, fireBitmap.getWidth(),
+                fireBitmap.getHeight());
+        fireSprite.setVisible(false);
+        append(fireSprite);
+        giveLifeSprite = new Sprite[2];
+        for (int i = 0; i < giveLifeSprite.length; ++i) {
+            giveLifeSprite[i] = new Sprite(giveLifeBitmap,
+                    giveLifeBitmap.getWidth() / 8, giveLifeBitmap.getHeight());
+            giveLifeSprite[i].setVisible(false);
+            append(giveLifeSprite[i]);
+        }
+        shieldSprite = new ExtendedSprite[2];
+        for (int i = 0; i < shieldSprite.length; ++i) {
+            shieldSprite[i] = new ExtendedSprite(shieldBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 10,
+                    null, null, null, "shieldSprite" + i);
+            shieldSprite[i].setVisible(false);
+            append(shieldSprite[i]);
+        }
+        flamesSprite = new ExtendedSprite[2];
+        for (int i = 0; i < flamesSprite.length; ++i) {
+            flamesSprite[i] = new ExtendedSprite(flamesBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 4,
+                    null, null, null, "flamesSprite" + i);
+            flamesSprite[i].setVisible(false);
+            append(flamesSprite[i]);
+        }
+        if(smokeSprite == null) {
+            smokeSprite = new SmokeSprite[16];
+            for(int i = 0; i < smokeSprite.length; ++i) {
+                smokeSprite[i] = new SmokeSprite(smokeBitmap,
+                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 12,
+                            "smokeSprite" + i);
+                append(smokeSprite[i]);
             }
         }
-        if (enemy == null && enemyrocketSprite == null) {
-            enemyBitmap = new Bitmap[4];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            /*    enemyBitmap[0] = new Bitmap("/enemy03_sm.png", gameEngine);
-                enemyBitmap[1] = new Bitmap("/enemy00_sm.png", gameEngine);
-                enemyBitmap[2] = new Bitmap("/enemy01_sm.png", gameEngine);
-                enemyBitmap[3] = new Bitmap("/enemy02_sm.png", gameEngine);*/
-            	enemyBitmap[0] = BitmapFactory.decodeResource(res, R.raw.enemy03_sm);
-            	enemyBitmap[1] = BitmapFactory.decodeResource(res, R.raw.enemy00_sm);
-            	enemyBitmap[2] = BitmapFactory.decodeResource(res, R.raw.enemy01_sm);
-            	enemyBitmap[3] = BitmapFactory.decodeResource(res, R.raw.enemy02_sm);
-            } else {
-            /*    enemyBitmap[0] = new Bitmap("/enemy03.png", gameEngine);
-                enemyBitmap[1] = new Bitmap("/enemy00.png", gameEngine);
-                enemyBitmap[2] = new Bitmap("/enemy01.png", gameEngine);
-                enemyBitmap[3] = new Bitmap("/enemy02.png", gameEngine);*/
-            	enemyBitmap[0] = BitmapFactory.decodeResource(res, R.raw.enemy03);
-            	enemyBitmap[1] = BitmapFactory.decodeResource(res, R.raw.enemy00);
-            	enemyBitmap[2] = BitmapFactory.decodeResource(res, R.raw.enemy01);
-            	enemyBitmap[3] = BitmapFactory.decodeResource(res, R.raw.enemy02);
-            }
-            enemyrocketBitmap = new Bitmap[4];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            /*    enemyrocketBitmap[0] = new Bitmap("/enemyshot0_sm.png", gameEngine);
-                enemyrocketBitmap[1] = new Bitmap("/enemyshot1_sm.png", gameEngine);
-                enemyrocketBitmap[2] = new Bitmap("/enemyshot2_sm.png", gameEngine);
-                enemyrocketBitmap[3] = new Bitmap("/enemyshot3_sm.png", gameEngine);*/
-            	enemyrocketBitmap[0] = BitmapFactory.decodeResource(res, R.raw.enemyshot0_sm);
-            	enemyrocketBitmap[1] = BitmapFactory.decodeResource(res, R.raw.enemyshot1_sm);
-            	enemyrocketBitmap[2] = BitmapFactory.decodeResource(res, R.raw.enemyshot2_sm);
-            	enemyrocketBitmap[3] = BitmapFactory.decodeResource(res, R.raw.enemyshot3_sm);
-            } else {
-            /*    enemyrocketBitmap[0] = new Bitmap("/enemyshot0.png", gameEngine);
-                enemyrocketBitmap[1] = new Bitmap("/enemyshot1.png", gameEngine);
-                enemyrocketBitmap[2] = new Bitmap("/enemyshot2.png", gameEngine);
-                enemyrocketBitmap[3] = new Bitmap("/enemyshot3.png", gameEngine);*/
-            	enemyrocketBitmap[0] = BitmapFactory.decodeResource(res, R.raw.enemyshot0);
-            	enemyrocketBitmap[1] = BitmapFactory.decodeResource(res, R.raw.enemyshot1);
-            	enemyrocketBitmap[2] = BitmapFactory.decodeResource(res, R.raw.enemyshot2);
-            	enemyrocketBitmap[3] = BitmapFactory.decodeResource(res, R.raw.enemyshot3);
-            }
-            srrocketBitmap = new Bitmap[1];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    srrocketBitmap[0] = new Bitmap("/playershoot_sm.png", gameEngine);
-            	srrocketBitmap[0] = BitmapFactory.decodeResource(res, R.raw.playershoot_sm);
-            } else {
-            //    srrocketBitmap[0] = new Bitmap("/playershoot.png", gameEngine);
-            	srrocketBitmap[0] = BitmapFactory.decodeResource(res, R.raw.playershoot);
-            }
-            srrocketLeftBitmap = new Bitmap[1];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    srrocketLeftBitmap[0] = new Bitmap("/shootleft_sm.png", gameEngine);
-            	srrocketLeftBitmap[0] = BitmapFactory.decodeResource(res, R.raw.shootleft_sm);
-            } else {
-            //    srrocketLeftBitmap[0] = new Bitmap("/shootleft.png", gameEngine);
-            	srrocketLeftBitmap[0] = BitmapFactory.decodeResource(res, R.raw.shootleft);
-            }
-            srrocketRightBitmap = new Bitmap[1];
-            if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-            //    srrocketRightBitmap[0] = new Bitmap("/shootright_sm.png", gameEngine);
-            	srrocketRightBitmap[0] = BitmapFactory.decodeResource(
-            			res, R.raw.shootright_sm);
-            } else {
-            //    srrocketRightBitmap[0] = new Bitmap("/shootright.png", gameEngine);
-            	srrocketRightBitmap[0] = BitmapFactory.decodeResource(res, R.raw.shootright);
-            }
-            synchronized (this) {
-	            arrowsBitmap = BitmapFactory.decodeResource(res, R.raw.touch_arrows);
-	            arrowsPressedBitmap = 
-	            	BitmapFactory.decodeResource(res, R.raw.touch_arrows_pressed);
-	            fireBitmap = BitmapFactory.decodeResource(res, R.raw.touch_fire);
-	            firePressedBitmap = 
-	            	BitmapFactory.decodeResource(res, R.raw.touch_fire_pressed);
-	            fireTransparentBitmap = 
-	            	BitmapFactory.decodeResource(res, R.raw.touch_fire_trans);
-	            arrowsSprite = new SynchronizedSprite(arrowsBitmap, arrowsBitmap.getWidth(),
-	            		arrowsBitmap.getHeight());
-	            arrowsSprite.setVisible(false);
-	            append(arrowsSprite);
-	            fireSprite = new SynchronizedSprite(fireBitmap, fireBitmap.getWidth(),
-	            		fireBitmap.getHeight());
-	            fireSprite.setVisible(false);
-	            append(fireSprite);
-            }
-            giveLifeSprite = new Sprite[2];
-            for (int i = 0; i < giveLifeSprite.length; ++i) {
-                giveLifeSprite[i] = new Sprite(giveLifeBitmap,
-                        giveLifeBitmap.getWidth() / 8, giveLifeBitmap.getHeight());
-                giveLifeSprite[i].setVisible(false);
-                append(giveLifeSprite[i]);
-            }
-            shieldSprite = new ExtendedSprite[2];
-            for (int i = 0; i < shieldSprite.length; ++i) {
-                shieldSprite[i] = new ExtendedSprite(shieldBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 10, 
-                        null, null, null, "shieldSprite" + i);
-                shieldSprite[i].setVisible(false);
-                append(shieldSprite[i]);
-            }
-            flamesSprite = new ExtendedSprite[2];
-            for (int i = 0; i < flamesSprite.length; ++i) {
-                flamesSprite[i] = new ExtendedSprite(flamesBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 4, 
-                        null, null, null, "flamesSprite" + i);
-                flamesSprite[i].setVisible(false);
-                append(flamesSprite[i]);
-            }
-            /*
-            srrocketSprite = new RocketSprite[16];
-            for (int i = 0; i < srrocketSprite.length; ++i) {
-            srrocketSprite[i] = new RocketSprite(srrocketBitmap[0].getBitmap(),
-            CANVAS_X, DISP_WIDTH, CANVAS_Y, DISP_HEIGHT, true, 8);
-            srrocketSprite[i].setLastFrameStick(true);
-            append(srrocketSprite[i]);
-            }*/
-            if(smokeSprite == null) {
-                smokeSprite = new SmokeSprite[16];
-                for(int i = 0; i < smokeSprite.length; ++i) {
-                    smokeSprite[i] = new SmokeSprite(smokeBitmap,
-                                CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 12,
-                                "smokeSprite" + i);
-                    append(smokeSprite[i]);
+        if (powerupSprite == null) {
+            powerupSprite = new PowerupSprite[4];
+            int numFrames = 0;
+            for (int i = 0; i < powerupSprite.length; ++i) {
+                if ((i % 3 == 0) && (i > 0)) {
+                    numFrames = 1;
+                } else {
+                    numFrames = 1;
                 }
-            }
-            if (powerupSprite == null) {
-                powerupSprite = new PowerupSprite[4];
-                int numFrames = 0;
-                for (int i = 0; i < powerupSprite.length; ++i) {
-                    if ((i % 3 == 0) && (i > 0)) {
-                        numFrames = 1;
-                    } else {
-                        numFrames = 1;
-                    }
-                    powerupSprite[i] = new PowerupSprite(PowerupBitmap[i],
-                            CANVAS_X, getDISP_WIDTH(),
-                            CANVAS_Y, getDISP_HEIGHT(), numFrames, 10, i + 1,
-                            "powerupSprite" + i);
+                powerupSprite[i] = new PowerupSprite(powerupBitmap[i],
+                        CANVAS_X, getDISP_WIDTH(),
+                        CANVAS_Y, getDISP_HEIGHT(), numFrames, 10, i + 1,
+                        "powerupSprite" + i);
 
-                    append(powerupSprite[i]);
-                }
-            }
-            srrocketLeftSprite = new RocketSprite[16];
-            for (int i = 0; i < srrocketLeftSprite.length; ++i) {
-                srrocketLeftSprite[i] = new RocketSprite(srrocketLeftBitmap[0],
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8, 
-                        powerupSprite, gameEngine, explosion,
-                        "srrocketLeftSprite" + i);
-                srrocketLeftSprite[i].setLastFrameStick(true);
-                append(srrocketLeftSprite[i]);
-            }
-            srrocketRightSprite = new RocketSprite[16];
-            for (int i = 0; i < srrocketRightSprite.length; ++i) {
-                srrocketRightSprite[i] = new RocketSprite(srrocketRightBitmap[0],
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8, 
-                        powerupSprite, gameEngine, explosion,
-                        "srrocketRightSprite" + i);
-                srrocketRightSprite[i].setLastFrameStick(true);
-                append(srrocketRightSprite[i]);
-            }
-            tripleRocketSpriteCenter = new RocketSprite[16];
-            otherTripleRocketSpriteCenter = new RocketSprite[16];
-            for (int i = 0; i < tripleRocketSpriteCenter.length; ++i) {
-                tripleRocketSpriteCenter[i] = new RocketSprite(centerRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1, 
-                        powerupSprite, gameEngine, explosion,
-                        "tripleRocketSpriteCenter" + i);
-                append(tripleRocketSpriteCenter[i]);
-                otherTripleRocketSpriteCenter[i] = new RocketSprite(
-                		centerRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1, 
-                        powerupSprite, gameEngine, explosion,
-                        "otherTripleRocketSpriteCenter" + i);
-                append(otherTripleRocketSpriteCenter[i]);
-
-            }
-            tripleRocketSpriteLeft = new RocketSprite[16];
-            otherTripleRocketSpriteLeft = new RocketSprite[16];
-            for (int i = 0; i < tripleRocketSpriteLeft.length; ++i) {
-                tripleRocketSpriteLeft[i] = new RocketSprite(leftRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1, 
-                        powerupSprite, gameEngine, explosion,
-                        "tripleRocketSpriteLeft" + i);
-                append(tripleRocketSpriteLeft[i]);
-                otherTripleRocketSpriteLeft[i] = new RocketSprite(leftRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1, 
-                        powerupSprite, gameEngine, explosion,
-                        "otherTripleRocketSpriteLeft" + i);
-                append(otherTripleRocketSpriteLeft[i]);
-            }
-            tripleRocketSpriteRight = new RocketSprite[16];
-            otherTripleRocketSpriteRight = new RocketSprite[16];
-            for (int i = 0; i < tripleRocketSpriteRight.length; ++i) {
-                tripleRocketSpriteRight[i] = new RocketSprite(rightRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1, 
-                        powerupSprite, gameEngine, explosion,
-                        "tripleRocketSpriteRight" + i);
-                append(tripleRocketSpriteRight[i]);
-                otherTripleRocketSpriteRight[i] = new RocketSprite(rightRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1, 
-                        powerupSprite, gameEngine, explosion,
-                        "otherTripleRocketSpriteRight" + i);
-                append(otherTripleRocketSpriteRight[i]);
+                append(powerupSprite[i]);
             }
-            doubleDamageRocketSprite = new RocketSprite[16];
-            otherDoubleDamageRocketSprite = new RocketSprite[16];
-            for (int i = 0; i < doubleDamageRocketSprite.length; ++i) {
-                doubleDamageRocketSprite[i] = new RocketSprite(doubleDamageRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 4, 
-                        powerupSprite, gameEngine, explosion,
-                        "doubleDamageRocketSprite" + i);
-                doubleDamageRocketSprite[i].setDoubleDamage(true);
-                append(doubleDamageRocketSprite[i]);
-                otherDoubleDamageRocketSprite[i] = new RocketSprite(doubleDamageRocketBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 4, 
-                        powerupSprite, gameEngine, explosion,
-                        "otherDoubleDamageRocketSprite" + i);
-                otherDoubleDamageRocketSprite[i].setDoubleDamage(true);
-                append(otherDoubleDamageRocketSprite[i]);
+        }
+        srrocketLeftSprite = new RocketSprite[16];
+        for (int i = 0; i < srrocketLeftSprite.length; ++i) {
+            srrocketLeftSprite[i] = new RocketSprite(srrocketLeftBitmap[0],
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8,
+                    powerupSprite, gameEngine, explosion,
+                    "srrocketLeftSprite" + i);
+            srrocketLeftSprite[i].setLastFrameStick(true);
+            append(srrocketLeftSprite[i]);
+        }
+        srrocketRightSprite = new RocketSprite[16];
+        for (int i = 0; i < srrocketRightSprite.length; ++i) {
+            srrocketRightSprite[i] = new RocketSprite(srrocketRightBitmap[0],
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8,
+                    powerupSprite, gameEngine, explosion,
+                    "srrocketRightSprite" + i);
+            srrocketRightSprite[i].setLastFrameStick(true);
+            append(srrocketRightSprite[i]);
+        }
+        tripleRocketSpriteCenter = new RocketSprite[16];
+        otherTripleRocketSpriteCenter = new RocketSprite[16];
+        for (int i = 0; i < tripleRocketSpriteCenter.length; ++i) {
+            tripleRocketSpriteCenter[i] = new RocketSprite(centerRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1,
+                    powerupSprite, gameEngine, explosion,
+                    "tripleRocketSpriteCenter" + i);
+            append(tripleRocketSpriteCenter[i]);
+            otherTripleRocketSpriteCenter[i] = new RocketSprite(
+                    centerRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1,
+                    powerupSprite, gameEngine, explosion,
+                    "otherTripleRocketSpriteCenter" + i);
+            append(otherTripleRocketSpriteCenter[i]);
+
+        }
+        tripleRocketSpriteLeft = new RocketSprite[16];
+        otherTripleRocketSpriteLeft = new RocketSprite[16];
+        for (int i = 0; i < tripleRocketSpriteLeft.length; ++i) {
+            tripleRocketSpriteLeft[i] = new RocketSprite(leftRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1,
+                    powerupSprite, gameEngine, explosion,
+                    "tripleRocketSpriteLeft" + i);
+            append(tripleRocketSpriteLeft[i]);
+            otherTripleRocketSpriteLeft[i] = new RocketSprite(leftRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1,
+                    powerupSprite, gameEngine, explosion,
+                    "otherTripleRocketSpriteLeft" + i);
+            append(otherTripleRocketSpriteLeft[i]);
+        }
+        tripleRocketSpriteRight = new RocketSprite[16];
+        otherTripleRocketSpriteRight = new RocketSprite[16];
+        for (int i = 0; i < tripleRocketSpriteRight.length; ++i) {
+            tripleRocketSpriteRight[i] = new RocketSprite(rightRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1,
+                    powerupSprite, gameEngine, explosion,
+                    "tripleRocketSpriteRight" + i);
+            append(tripleRocketSpriteRight[i]);
+            otherTripleRocketSpriteRight[i] = new RocketSprite(rightRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 1,
+                    powerupSprite, gameEngine, explosion,
+                    "otherTripleRocketSpriteRight" + i);
+            append(otherTripleRocketSpriteRight[i]);
+        }
+        doubleDamageRocketSprite = new RocketSprite[16];
+        otherDoubleDamageRocketSprite = new RocketSprite[16];
+        for (int i = 0; i < doubleDamageRocketSprite.length; ++i) {
+            doubleDamageRocketSprite[i] = new RocketSprite(doubleDamageRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 4,
+                    powerupSprite, gameEngine, explosion,
+                    "doubleDamageRocketSprite" + i);
+            doubleDamageRocketSprite[i].setDoubleDamage(true);
+            append(doubleDamageRocketSprite[i]);
+            otherDoubleDamageRocketSprite[i] = new RocketSprite(doubleDamageRocketBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 4,
+                    powerupSprite, gameEngine, explosion,
+                    "otherDoubleDamageRocketSprite" + i);
+            otherDoubleDamageRocketSprite[i].setDoubleDamage(true);
+            append(otherDoubleDamageRocketSprite[i]);
+        }
+        enemyrocketSprite = new RocketSprite[16];
+        for (int i = 0; i < enemyrocketSprite.length; ++i) {
+            int numFrames = 0;
+            int r = rand.nextInt(4);
+            switch (r) {
+                case 0:
+                    numFrames = 4;
+                    break;
+                case 1:
+                    numFrames = 1;
+                    break;
+                case 2:
+                    numFrames = 1;
+                    break;
+                case 3:
+                    numFrames = 1;
+                    break;
+                default:
+                    numFrames = 1;
+                    break;
             }
-            enemyrocketSprite = new RocketSprite[16];
-            for (int i = 0; i < enemyrocketSprite.length; ++i) {
-                int numFrames = 0;
-                int r = rand.nextInt(4);
-                switch (r) {
-                    case 0:
-                        numFrames = 4;
-                        break;
-                    case 1:
-                        numFrames = 1;
-                        break;
-                    case 2:
-                        numFrames = 1;
-                        break;
-                    case 3:
-                        numFrames = 1;
-                        break;
-                    default:
-                        numFrames = 1;
-                        break;
-                }
-                enemyrocketSprite[i] =
-                        new RocketSprite(enemyrocketBitmap[r],
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), false, numFrames,
-                        powerupSprite, gameEngine, explosion,
-                        "enemyrocketSprite" + i);
-                append(enemyrocketSprite[i]);
-            }
-            
-            if (bossSprite == null) {
-                bossSprite = new BossSprite[4];
-                /*     for(int i = 0; i < bossSprite.length; ++i) {
-                bossSprite[i] = new BossSprite(boss1Bitmap.getBitmap(), CANVAS_X, DISP_WIDTH,
-                CANVAS_Y, DISP_HEIGHT, explosion, enemyrocketSprite, BOSS_NUM_FRAMES,
-                this, 10);
-                append(bossSprite[i]);
-                }*/
-                bossSprite[0] = new BossSprite(boss1Bitmap, CANVAS_X, getDISP_WIDTH(),
-                        CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite, 
-                        powerupSprite, BOSS1_NUM_FRAMES,
-                        this, BOSS1_HEALTH, status, "boss0");
-                append(bossSprite[0]);
-                bossSprite[1] = new BossSprite(boss2Bitmap, CANVAS_X, getDISP_WIDTH(),
-                        CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite, 
-                        powerupSprite, BOSS2_NUM_FRAMES,
-                        this, BOSS2_HEALTH, status, "boss1");
-                append(bossSprite[1]);
-                bossSprite[2] = new BossSprite(boss3Bitmap, CANVAS_X, getDISP_WIDTH(),
-                        CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite, 
-                        powerupSprite, BOSS3_NUM_FRAMES,
-                        this, BOSS3_HEALTH, status, "boss2");
-                append(bossSprite[2]);
-                bossSprite[3] = new BossSprite(boss4Bitmap, CANVAS_X, getDISP_WIDTH(),
-                        CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite, 
-                        powerupSprite, BOSS4_NUM_FRAMES,
-                        this, BOSS4_HEALTH, status, "boss3");
-                append(bossSprite[3]);
-            }
+            enemyrocketSprite[i] =
+                    new RocketSprite(enemyrocketBitmap[r],
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), false, numFrames,
+                    powerupSprite, gameEngine, explosion,
+                    "enemyrocketSprite" + i);
+            append(enemyrocketSprite[i]);
+        }
+
+        if (bossSprite == null) {
+            bossSprite = new BossSprite[4];
+            /*     for(int i = 0; i < bossSprite.length; ++i) {
+            bossSprite[i] = new BossSprite(boss1Bitmap.getBitmap(), CANVAS_X, DISP_WIDTH,
+            CANVAS_Y, DISP_HEIGHT, explosion, enemyrocketSprite, BOSS_NUM_FRAMES,
+            this, 10);
+            append(bossSprite[i]);
+            }*/
+            bossSprite[0] = new BossSprite(boss1Bitmap, CANVAS_X, getDISP_WIDTH(),
+                    CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite,
+                    powerupSprite, BOSS1_NUM_FRAMES,
+                    this, BOSS1_HEALTH, status, "boss0");
+            append(bossSprite[0]);
+            bossSprite[1] = new BossSprite(boss2Bitmap, CANVAS_X, getDISP_WIDTH(),
+                    CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite,
+                    powerupSprite, BOSS2_NUM_FRAMES,
+                    this, BOSS2_HEALTH, status, "boss1");
+            append(bossSprite[1]);
+            bossSprite[2] = new BossSprite(boss3Bitmap, CANVAS_X, getDISP_WIDTH(),
+                    CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite,
+                    powerupSprite, BOSS3_NUM_FRAMES,
+                    this, BOSS3_HEALTH, status, "boss2");
+            append(bossSprite[2]);
+            bossSprite[3] = new BossSprite(boss4Bitmap, CANVAS_X, getDISP_WIDTH(),
+                    CANVAS_Y, getDISP_HEIGHT(), explosion, enemyrocketSprite,
+                    powerupSprite, BOSS4_NUM_FRAMES,
+                    this, BOSS4_HEALTH, status, "boss3");
+            append(bossSprite[3]);
+        }
 
 
 
-            enemy = new EnemySprite[8];
-            for (int i = 0; i < enemy.length; ++i) {
-                //	int r = rand.nextInt(4);
-                int r = rand.nextInt(4);
-                if (r == 0) {
-                    enemy[i] = new EnemySprite(enemyBitmap[0],
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), explosion,
-                            enemyrocketSprite, powerupSprite, gameEngine, 3, status,
-                            "enemy" + i);
-                } else {
-                    enemy[i] = new EnemySprite(enemyBitmap[r],
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), explosion,
-                            enemyrocketSprite, powerupSprite, gameEngine, 1, status,
-                            "enemy" + i);
-                }
-                append(enemy[i]);
-            }
-            //		enemy[0].setBounds(CANVAS_X, DISP_WIDTH, CANVAS_Y, DISP_HEIGHT);
-            if (spaceRocketBitmap == null) {
-                if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-                //    spaceRocketBitmap = new Bitmap("/player_sm.png", gameEngine);
-                	spaceRocketBitmap = BitmapFactory.decodeResource(res, R.raw.player_sm);
-                } else {
-                //    spaceRocketBitmap = new Bitmap("/player.png", gameEngine);
-                	spaceRocketBitmap = BitmapFactory.decodeResource(res, R.raw.player);
-                }
-            }
-            if (otherSpaceRocketBitmap == null) {
-                if ((getDISP_WIDTH() < MIN_WIDTH) || (getDISP_HEIGHT() < MIN_HEIGHT)) {
-                //    otherSpaceRocketBitmap = new Bitmap("/Image2_sm.png", gameEngine);
-                	otherSpaceRocketBitmap = BitmapFactory.decodeResource(res, 
-                			R.raw.image2_sm);
-                } else {
-                //    otherSpaceRocketBitmap = new Bitmap("/Image2.png", gameEngine);
-                	otherSpaceRocketBitmap = BitmapFactory.decodeResource(res, 
-                			R.raw.image2);
-                }
-            }
-            /*
-            if (otherRocketSprite == null) {
-            otherRocketSprite = new RocketSprite[16];
-            for (int i = 0; i < otherRocketSprite.length; ++i) {
-            otherRocketSprite[i] = new RocketSprite(
-            srrocketBitmap[0].getBitmap(),
-            CANVAS_X, DISP_WIDTH, CANVAS_Y, DISP_HEIGHT, true, 8);
-            otherRocketSprite[i].setLastFrameStick(true);
-            append(otherRocketSprite[i]);
+        enemy = new EnemySprite[8];
+        for (int i = 0; i < enemy.length; ++i) {
+            //	int r = rand.nextInt(4);
+            int r = rand.nextInt(4);
+            if (r == 0) {
+                enemy[i] = new EnemySprite(enemyBitmap[0],
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), explosion,
+                        enemyrocketSprite, powerupSprite, gameEngine, 3, status,
+                        "enemy" + i);
+            } else {
+                enemy[i] = new EnemySprite(enemyBitmap[r],
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), explosion,
+                        enemyrocketSprite, powerupSprite, gameEngine, 1, status,
+                        "enemy" + i);
             }
-            }*/
-            if (otherRocketLeftSprite == null) {
-                otherRocketLeftSprite = new RocketSprite[16];
-                for (int i = 0; i < otherRocketLeftSprite.length; ++i) {
-                    otherRocketLeftSprite[i] = new RocketSprite(
-                            srrocketLeftBitmap[0],
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8,
-                            powerupSprite, gameEngine, explosion,
-                            "otherRocketLeftSprite" + i);
-                    otherRocketLeftSprite[i].setLastFrameStick(true);
-                    append(otherRocketLeftSprite[i]);
-                }
-            }
-            if (otherRocketRightSprite == null) {
-                otherRocketRightSprite = new RocketSprite[16];
-                for (int i = 0; i < otherRocketRightSprite.length; ++i) {
-                    otherRocketRightSprite[i] = new RocketSprite(
-                            srrocketRightBitmap[0],
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8,
-                            powerupSprite, gameEngine, explosion,
-                            "otherRocketRightSprite" + i);
-                    otherRocketRightSprite[i].setLastFrameStick(true);
-                    append(otherRocketRightSprite[i]);
-                }
+            append(enemy[i]);
+        }
+            //    spaceRocketBitmap = new Bitmap("/player.png", gameEngine);
+            //    otherSpaceRocketBitmap = new Bitmap("/Image2.png", gameEngine);
+        if (otherRocketLeftSprite == null) {
+            otherRocketLeftSprite = new RocketSprite[16];
+            for (int i = 0; i < otherRocketLeftSprite.length; ++i) {
+                otherRocketLeftSprite[i] = new RocketSprite(
+                        srrocketLeftBitmap[0],
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8,
+                        powerupSprite, gameEngine, explosion,
+                        "otherRocketLeftSprite" + i);
+                otherRocketLeftSprite[i].setLastFrameStick(true);
+                append(otherRocketLeftSprite[i]);
             }
-            if (miniBossSprite == null) {
-                miniBossSprite = new ExtendedSprite[4];
-                for (int i = 0; i < miniBossSprite.length; ++i) {
-                    miniBossSprite[i] = new ExtendedSprite(miniBossBitmap[i],
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 3, 
-                            null, null, null, "miniBossSprite" + i);
-                    miniBossSprite[i].setVisible(false);
-                    bossSprite[i].setMiniBossSprite(miniBossSprite[i]);
-                    append(miniBossSprite[i]);
-                }
-
+        }
+        if (otherRocketRightSprite == null) {
+            otherRocketRightSprite = new RocketSprite[16];
+            for (int i = 0; i < otherRocketRightSprite.length; ++i) {
+                otherRocketRightSprite[i] = new RocketSprite(
+                        srrocketRightBitmap[0],
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), true, 8,
+                        powerupSprite, gameEngine, explosion,
+                        "otherRocketRightSprite" + i);
+                otherRocketRightSprite[i].setLastFrameStick(true);
+                append(otherRocketRightSprite[i]);
             }
-            if (planetSprite == null) {
-                planetSprite = new ExtendedSprite[4];
-                for (int i = 0; i < planetSprite.length; ++i) {
-                	//Allow out of bounds
-                    planetSprite[i] = new ExtendedSprite(planetBitmap[i],
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 
-                            1, null, null, null, "planetSprite" + i, true);
-                //    append(planetSprite[i]);
-                }
-            }
-            if (earthSprite == null) {
-                earthSprite = new ExtendedSprite(earthBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 1, 
-                        null, null, null, "earth", true);
-                append(earthSprite);
-            }
-            if (atmosphereSprite == null) {
-                atmosphereSprite = new ExtendedSprite(atmosphereBitmap,
-                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 1, 
-                        null, null, null, "atmosphere", true);
-                append(atmosphereSprite);
+        }
+        if (miniBossSprite == null) {
+            miniBossSprite = new ExtendedSprite[4];
+            for (int i = 0; i < miniBossSprite.length; ++i) {
+                miniBossSprite[i] = new ExtendedSprite(miniBossBitmap[i],
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 3,
+                        null, null, null, "miniBossSprite" + i);
+                miniBossSprite[i].setVisible(false);
+                bossSprite[i].setMiniBossSprite(miniBossSprite[i]);
+                append(miniBossSprite[i]);
             }
 
+        }
+        if (planetSprite == null) {
+            planetSprite = new ExtendedSprite[4];
+            for (int i = 0; i < planetSprite.length; ++i) {
+                //Allow out of bounds
+                planetSprite[i] = new ExtendedSprite(planetBitmap[i],
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(),
+                        1, null, null, null, "planetSprite" + i, true);
+            //    append(planetSprite[i]);
+            }
+        }
+        if (earthSprite == null) {
+            earthSprite = new ExtendedSprite(earthBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 1,
+                    null, null, null, "earth", true);
+            append(earthSprite);
+        }
+        if (atmosphereSprite == null) {
+            atmosphereSprite = new ExtendedSprite(atmosphereBitmap,
+                    CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 1,
+                    null, null, null, "atmosphere", true);
+            append(atmosphereSprite);
+        }
 
-            if (starSprite == null) {
-                starSprite = new ExtendedSprite[32];
-                for (int i = 0; i < starSprite.length; ++i) {
-                    starSprite[i] = new ExtendedSprite(starBitmap,
-                            CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 1,
-                            null, null, null, "starSprite" + i);
-                    append(starSprite[i]);
-                }
+
+        if (starSprite == null) {
+            starSprite = new ExtendedSprite[32];
+            for (int i = 0; i < starSprite.length; ++i) {
+                starSprite[i] = new ExtendedSprite(starBitmap,
+                        CANVAS_X, getDISP_WIDTH(), CANVAS_Y, getDISP_HEIGHT(), 1,
+                        null, null, null, "starSprite" + i);
+                append(starSprite[i]);
             }
+        }
 
-            
-            for(int i = 0; i < powerupSprite.length; ++i) {
-                powerupSprite[i].setSmokeSprite(smokeSprite);
-            }
-            appendTiledLayer();
+
+        for(int i = 0; i < powerupSprite.length; ++i) {
+            powerupSprite[i].setSmokeSprite(smokeSprite);
         }
+        appendTiledLayer();
 	}
 	
 	
@@ -1234,12 +893,6 @@
                 enemyrocketSprite[i].reset();
             }
         }
-        /*
-        if (otherRocketSprite != null) {
-        for (int i = 0; i < otherRocketSprite.length; ++i) {
-        otherRocketSprite[i].reset();
-        }
-        }*/
         if (otherRocketLeftSprite != null) {
             for (int i = 0; i < otherRocketLeftSprite.length; ++i) {
                 otherRocketLeftSprite[i].reset();
@@ -1250,12 +903,6 @@
                 otherRocketRightSprite[i].reset();
             }
         }
-        /*
-        if (srrocketSprite != null) {
-        for (int i = 0; i < srrocketSprite.length; ++i) {
-        srrocketSprite[i].reset();
-        }
-        }*/
         if (srrocketLeftSprite != null) {
             for (int i = 0; i < srrocketLeftSprite.length; ++i) {
                 srrocketLeftSprite[i].reset();
@@ -1296,7 +943,7 @@
                 bossSprite[i].reset();
             }
         }
-        CurrentBoss = -1;
+        currentBoss = -1;
         lastKilledBoss = -1;
         if (powerupSprite != null) {
             for (int i = 0; i < powerupSprite.length; ++i) {
@@ -1350,10 +997,10 @@
         paint(g, CANVAS_X, CANVAS_Y);
     }
 	
-	synchronized public void UpdateScore(boolean isMP, boolean explode) {
-        if (spaceCanvas.getStatus().LivesRemaining > 0) {
-            --spaceCanvas.getStatus().LivesRemaining;
-            ++spaceCanvas.getStatus().TotalNumLivesLost;
+	synchronized public void updateScore(boolean isMP, boolean explode) {
+        if (spaceCanvas.getStatus().livesRemaining > 0) {
+            --spaceCanvas.getStatus().livesRemaining;
+            ++spaceCanvas.getStatus().totalNumLivesLost;
 
             if (explode) {
                 Position p = spaceRocket.getSPPos();
@@ -1364,7 +1011,7 @@
                     }
                 }
             }
-            if (spaceCanvas.getStatus().LivesRemaining == 0) {
+            if (spaceCanvas.getStatus().livesRemaining == 0) {
 
                 spaceRocket.setVisible(false);
             }
@@ -1375,49 +1022,38 @@
     }
 
     synchronized public int getCurrentBoss() {
-        return CurrentBoss;
+        return currentBoss;
     }
     
-    void advance() throws MediaException {
+    void advance() {
         boolean isMP = gameEngine.isMP();
         try {
-        	controlTransparency.lock();
-        	try {
-        		Status status = spaceCanvas.getStatus();
-	            if ((spaceCanvas.getStatus().FirstTime == false) && (spaceCanvas.getStatus().LivesRemaining != 0)) {
-	                spaceRocket.advance(XDir, YDir, shoot);
-	                if (spaceRocket.collidesWith(fireSprite, false)) {
-	                	fireSprite.setImage(fireTransparentBitmap, 
-	                			fireTransparentBitmap.getWidth(), 
-	                			fireTransparentBitmap.getHeight());
-	                	fireSpriteTransparent.set(true);// = true;
-	                } else if (fireSpriteTransparent.get()) {
-	                	fireSpriteTransparent.set(false);// = false;
-	                	SpaceRocketMainView view = (SpaceRocketMainView) gameEngine.getView();
-	                	if (view.getFirePressed().get()) {
-	                		fireSprite.setImage(firePressedBitmap, 
-	                				firePressedBitmap.getWidth(),
-	                				firePressedBitmap.getHeight());
-	                	} else {
-	                		fireSprite.setImage(fireBitmap, 
-	                				fireBitmap.getWidth(),
-	                				fireBitmap.getHeight());
-	                	}
-	                }
-	            } else if (fireSpriteTransparent.get()) {
-	            	fireSpriteTransparent.set(false);// = false;
-	            	fireSprite.setImage(fireBitmap, 
-	        				fireBitmap.getWidth(),
-	        				fireBitmap.getHeight());
-	            }
-        	} finally {
-        		controlTransparency.unlock();
-        	}
-            /*	if((CreateSPSpaceRocket == true) && (gameEngine.isMP() == false)) {
-
-            }*/
-            if (gameEngine.isSoundSupported()) {
-                explodeSnd.prefetch();
+            Status status = spaceCanvas.getStatus();
+            if (!spaceCanvas.getStatus().firstTime && spaceCanvas.getStatus().livesRemaining != 0) {
+                spaceRocket.advance(XDir, YDir, shoot);
+                if (spaceRocket.collidesWith(fireSprite, false)) {
+                    fireSprite.setImage(fireTransparentBitmap,
+                            fireTransparentBitmap.getWidth(),
+                            fireTransparentBitmap.getHeight());
+                    fireSpriteTransparent.set(true);// = true;
+                } else if (fireSpriteTransparent.get()) {
+                    fireSpriteTransparent.set(false);// = false;
+                    SpaceRocketMainView view = (SpaceRocketMainView) gameEngine.getView();
+                    if (view.getFirePressed().get()) {
+                        fireSprite.setImage(firePressedBitmap,
+                                firePressedBitmap.getWidth(),
+                                firePressedBitmap.getHeight());
+                    } else {
+                        fireSprite.setImage(fireBitmap,
+                                fireBitmap.getWidth(),
+                                fireBitmap.getHeight());
+                    }
+                }
+            } else if (fireSpriteTransparent.get()) {
+                fireSpriteTransparent.set(false);// = false;
+                fireSprite.setImage(fireBitmap,
+                        fireBitmap.getWidth(),
+                        fireBitmap.getHeight());
             }
             for(int i = 0; i < smokeSprite.length; ++i) {
                 if(smokeSprite[i].isVisible()) {
@@ -1467,12 +1103,6 @@
                 }
             }
             if ((shouldLaunchPlanet) && (rand.nextInt(30) == 0)) {
-                /*    for(int i = 0; i < planetSprite.length; ++i) {
-                if(planetSprite[i].isVisible() == false) {
-                planetSprite[i].launch(3, 1);
-                break;
-                }
-                }*/
                 planetSprite[rand.nextInt(4)].launch(3, 1);
             }
             for (int i = 0; i < planetSprite.length; ++i) {
@@ -1481,17 +1111,17 @@
                     advancePlanet = 0;
                 }
             }
-            if ((isMP) && (spaceRocket != null) && (spaceCanvas.getStatus().LivesRemaining == 0)) {
+            if ((isMP) && (spaceRocket != null) && (spaceCanvas.getStatus().livesRemaining == 0)) {
                 spaceRocket.setVisible(false);
             }
             if ((isMP) && (connectionThread != null) &&
                     (connectionThread.getLiveGivenByOtherPlayer())) {
-                if (spaceCanvas.getStatus().LivesRemaining == 0) {
+                if (spaceCanvas.getStatus().livesRemaining == 0) {
                     spaceRocket.reset();
                     spaceRocket.setVisible(true);
                 }
-                if (spaceCanvas.getStatus().LivesRemaining < 15) {
-                    ++spaceCanvas.getStatus().LivesRemaining;
+                if (spaceCanvas.getStatus().livesRemaining < 15) {
+                    ++spaceCanvas.getStatus().livesRemaining;
                 }
                 giveLifeSprite[0].setVisible(true);
             }
@@ -1499,24 +1129,6 @@
                 boolean alreadyChecked = false;
                 if (bossSprite[i].isVisible()) {
                     bossSprite[i].advance();
-                    /*    for (int j = 0; j < srrocketSprite.length; ++j) {
-                    if ((srrocketSprite[j].isVisible())) {
-                    if (bossSprite[i].collisionCheck(srrocketSprite[j])) {
-                    alreadyChecked = true;
-                    ++status.Score;
-                    if (isMP) {
-                    synchronized (this) {
-                    //	scoreIncreased  = true;
-                    ++ScoreQueue;
-                    }
-                    }
-                    }
-                    }
-                    if ((isMP) && (otherRocketSprite[j].isVisible())) {
-                    if (bossSprite[i].collisionCheck(otherRocketSprite[j])) {
-                    }
-                    }
-                    }*/
                     alreadyChecked = checkBossCollision(srrocketLeftSprite, true, i);
                     if (!alreadyChecked) {
                         alreadyChecked = checkBossCollision(srrocketRightSprite, true, i);
@@ -1551,68 +1163,8 @@
                     if (!alreadyChecked) {
                         checkBossCollision(otherDoubleDamageRocketSprite, false, i);
                     }
-                    /*          for (int j = 0; j < tripleRocketSpriteCenter.length; ++j) {
-                    if (tripleRocketSpriteCenter[j].isVisible()) {
-                    if ((!alreadyChecked) &&
-                    (bossSprite[i].collisionCheck(tripleRocketSpriteCenter[j]))) {
-                    alreadyChecked = true;
-                    ++status.Score;
-                    if (isMP) {
-                    synchronized (this) {
-                    //	scoreIncreased  = true;
-                    ++ScoreQueue;
-                    }
-                    }
-                    }
-                    }
-                    }
-                    for (int j = 0; j < tripleRocketSpriteLeft.length; ++j) {
-                    if (tripleRocketSpriteLeft[j].isVisible()) {
-                    if ((!alreadyChecked) &&
-                    (bossSprite[i].collisionCheck(tripleRocketSpriteLeft[j]))) {
-                    alreadyChecked = true;
-                    ++status.Score;
-                    if (isMP) {
-                    synchronized (this) {
-                    //	scoreIncreased  = true;
-                    ++ScoreQueue;
-                    }
-                    }
-                    }
-                    }
-                    }
-                    for (int j = 0; j < tripleRocketSpriteRight.length; ++j) {
-                    if (tripleRocketSpriteRight[j].isVisible()) {
-                    if ((!alreadyChecked) &&
-                    (bossSprite[i].collisionCheck(tripleRocketSpriteRight[j]))) {
-                    alreadyChecked = true;
-                    ++status.Score;
-                    if (isMP) {
-                    synchronized (this) {
-                    //	scoreIncreased  = true;
-                    ++ScoreQueue;
-                    }
-                    }
-                    }
-                    }
-                    }
-                    for (int j = 0; j < doubleDamageRocketSprite.length; ++j) {
-                    if (doubleDamageRocketSprite[j].isVisible()) {
-                    if ((!alreadyChecked) &&
-                    (bossSprite[i].collisionCheck(doubleDamageRocketSprite[j]))) {
-                    alreadyChecked = true;
-                    ++status.Score;
-                    if (isMP) {
-                    synchronized (this) {
-                    //	scoreIncreased  = true;
-                    ++ScoreQueue;
-                    }
-                    }
-                    }
-                    }
-                    }*/
                     if (spaceRocket.collisionCheck(bossSprite[i])) {
-                        UpdateScore(isMP, true);
+                        updateScore(isMP, true);
                     }
                 }
             }
@@ -1626,25 +1178,23 @@
                     System.out.println("killedBoss out of range: " + killedBoss);
                 }
             }
-            if ((!isMP) && (spaceCanvas.getStatus().Score == BOSS1_SCORE) && (!bossSprite[0].getLaunched()) &&
+            if ((!isMP) && (spaceCanvas.getStatus().score == BOSS1_SCORE) && (!bossSprite[0].getLaunched()) &&
                     (!bossSpriteLaunched[0])) {
                 bossSprite[0].launch();
                 bossSpriteLaunched[0] = true;
                 if (gameEngine.getSoundOn()) {
                     gameEngine.getVibrator().vibrate(500);
                 }
-            //    display.flashBacklight(500);
             }
-            if ((!isMP) && (spaceCanvas.getStatus().Score >= BOSS2_SCORE) && (!bossSprite[1].getLaunched()) &&
+            if ((!isMP) && (spaceCanvas.getStatus().score >= BOSS2_SCORE) && (!bossSprite[1].getLaunched()) &&
                     (!bossSpriteLaunched[1]) && (bossSprite[0].getBossDestroyedSP())) {
                 bossSprite[1].launch();
                 bossSpriteLaunched[1] = true;
                 if (gameEngine.getSoundOn()) {
                 	gameEngine.getVibrator().vibrate(500);
                 }
-            //    display.flashBacklight(500);
             }
-            if ((!isMP) && (spaceCanvas.getStatus().Score >= BOSS3_SCORE) && (!bossSprite[2].getLaunched()) &&
+            if ((!isMP) && (spaceCanvas.getStatus().score >= BOSS3_SCORE) && (!bossSprite[2].getLaunched()) &&
                     (!bossSpriteLaunched[2]) && (bossSprite[0].getBossDestroyedSP()) &&
                     (bossSprite[1].getBossDestroyedSP())) {
                 bossSprite[2].launch();
@@ -1652,9 +1202,8 @@
                 if (gameEngine.getSoundOn()) {
                 	gameEngine.getVibrator().vibrate(500);
                 }
-            //    display.flashBacklight(500);
             }
-            if ((!isMP) && (spaceCanvas.getStatus().Score >= BOSS4_SCORE) && (!bossSprite[3].getLaunched()) &&
+            if ((!isMP) && (spaceCanvas.getStatus().score >= BOSS4_SCORE) && (!bossSprite[3].getLaunched()) &&
                     (!bossSpriteLaunched[3]) && (bossSprite[0].getBossDestroyedSP()) &&
                     (bossSprite[1].getBossDestroyedSP()) && (bossSprite[2].getBossDestroyedSP())) {
                 bossSprite[3].launch();
@@ -1679,12 +1228,6 @@
             }
 
             if ((!isMP) && (rand.nextInt(POWERUP_RATE) == 0)) {
-                /*    for(int i = 0; i < powerupSprite.length; ++i) {
-                if(powerupSprite[i].isVisible() == false) {
-                powerupSprite[i].launch(false);
-                break;
-                }
-                }*/
                 int i = rand.nextInt(4);
                 if (powerupSprite[i].isVisible() == false) {
                     powerupSprite[i].launch();
@@ -1696,19 +1239,19 @@
                         int type = powerupSprite[i].collisionCheck(spaceRocket);
                         if (type != 0) {
                             spaceRocket.setPowerupType(type);
-                            ++spaceCanvas.getStatus().NumPowerupsTaken;
+                            ++spaceCanvas.getStatus().numPowerupsTaken;
                             switch (type) {
                                 case 1: //IncreaseLives
-                                    if (spaceCanvas.getStatus().LivesRemaining < MAX_NUM_LIVES) {
-                                        ++spaceCanvas.getStatus().LivesRemaining;
+                                    if (spaceCanvas.getStatus().livesRemaining < MAX_NUM_LIVES) {
+                                        ++spaceCanvas.getStatus().livesRemaining;
                                     }
                                     break;
                                 case 2: //More damage to boss
                                     if (isMP) {
-                                        if ((CurrentBoss >= 0) && (CurrentBoss < BOSS_COUNT)) {
-                                            bossSprite[CurrentBoss].DoubleDamage();
+                                        if ((currentBoss >= 0) && (currentBoss < BOSS_COUNT)) {
+                                            bossSprite[currentBoss].DoubleDamage();
                                         } else {
-                                            System.out.println("CurrentBoss: " + CurrentBoss);
+                                            System.out.println("CurrentBoss: " + currentBoss);
                                         }
                                         spaceRocket.EnableDoubleDamage();
                                         spaceRocket.changeFrame(SpaceRocketSprite.DOUBLE_DAMAGE_FRAME);
@@ -1740,22 +1283,22 @@
             }
             if ((isMP) && (connectionThread != null)) {
                 if (connectionThread.getPowerupTakenByOtherShip()) {
-                    if ((CurrentPowerup <= 3) && (CurrentPowerup >= 0)) {
-                        powerupSprite[CurrentPowerup].reset();
-                        ++spaceCanvas.getStatus().CoopNumPowerupsTaken;
+                    if ((currentPowerup <= 3) && (currentPowerup >= 0)) {
+                        powerupSprite[currentPowerup].reset();
+                        ++spaceCanvas.getStatus().coopNumPowerupsTaken;
                     }
 
-                    switch (CurrentPowerup) {
+                    switch (currentPowerup) {
                         case 0:
                             //    otherSpaceRocket.IncrementLives();
                             break;
                         case 1:
                             otherSpaceRocket.EnableDoubleDamage();
                             otherSpaceRocket.changeFrame(SpaceRocketSprite.DOUBLE_DAMAGE_FRAME);
-                            if ((CurrentBoss >= 0) && (CurrentBoss < BOSS_COUNT)) {
-                                bossSprite[CurrentBoss].DoubleDamage();
+                            if ((currentBoss >= 0) && (currentBoss < BOSS_COUNT)) {
+                                bossSprite[currentBoss].DoubleDamage();
                             } else {
-                                System.out.println("CurrentBoss: " + CurrentBoss);
+                                System.out.println("CurrentBoss: " + currentBoss);
                             }
                             break;
                         case 2:
@@ -1770,28 +1313,15 @@
                     }
                 }
                 if (connectionThread.getPowerupLaunched()) {
-                    CurrentPowerup = connectionThread.getPowerupNum();
-                    if ((CurrentPowerup > 3) || (CurrentPowerup < 0)) {
-                        System.out.println("CurrentPowerup error: " + CurrentPowerup);
+                    currentPowerup = connectionThread.getPowerupNum();
+                    if ((currentPowerup > 3) || (currentPowerup < 0)) {
+                        System.out.println("CurrentPowerup error: " + currentPowerup);
                     } else {
-                        powerupSprite[CurrentPowerup].launch(
+                        powerupSprite[currentPowerup].launch(
                                 connectionThread.getPowerupXPos(),
                                 connectionThread.getPowerupYPos());
                     }
                 }
-                /*       if(connectionThread.getPowerupTakenByOtherShip()) {
-                powerupSprite[CurrentPowerup].reset();
-                }*/
-
-                /*	if((isMP) && (otherSpaceRocket != null)) {
-                ++CurrentUpdateFrame;
-                if(CurrentUpdateFrame >= UPDATE_POSITION) {
-                CurrentUpdateFrame = 0;
-                otherSpaceRocket.move(false);
-                } else {
-                otherSpaceRocket.move(true);
-                }
-                }*/
                 if ((isMP) && (otherSpaceRocket != null)) {
                     if (connectionThread.getOtherSRPosSet()) {
 
@@ -1822,8 +1352,6 @@
                     }
                 }
 
-
-
                 if (connectionThread.getshouldLaunchRocketOtherShip()) {
                     otherSpaceRocket.launchRocket();
                 }
@@ -1833,20 +1361,11 @@
                 } else {
                     if ((otherSpaceRocket.isVisible() == false) &&
                             (otherSpaceRocket.GetNumLives() > 0)) {
-                        //    int lifenum = otherSpaceRocket.GetNumLives();
-                        //    int xpos = otherSpaceRocket.getX();
-                        //    int ypos = otherSpaceRocket.getY();
                         otherSpaceRocket.reset();
                         otherSpaceRocket.setVisible(true);
                     }
                 }
             }
-            //      if(otherSpaceRocket.GetNumLives() <= 0) {
-            //          spaceCanvas.setGameOver();
-            //      }
-		/*	if(connectionThread.getShouldResetOtherShip()) {
-            otherSpaceRocket.reset();
-            }*/
 
             if (animatedBackground != null) {
             	animatedBackground.advance();
@@ -1926,7 +1445,7 @@
                 if ((connectionThread != null) && (connectionThread.getBossLaunched())) {
                     int BossNum = connectionThread.GetBossNum();
                     if ((BossNum >= 0) && (BossNum < BOSS_COUNT)) {
-                        if (CurrentBoss != BossNum) {
+                        if (currentBoss != BossNum) {
                             bossSprite[BossNum].launch(connectionThread.getBossXPos(),
                                     connectionThread.getBossXSpeed(),
                                     connectionThread.getBossYSpeed());
@@ -1934,10 +1453,9 @@
                             if (gameEngine.getSoundOn()) {
                             	gameEngine.getVibrator().vibrate(500);
                             }
-                            //display.flashBacklight(500);
                             System.out.println("Boss: " + BossNum + " has been launched");
                             synchronized (this) {
-                                CurrentBoss = BossNum;
+                                currentBoss = BossNum;
                             }
                         }
                     } else {
@@ -1946,36 +1464,12 @@
                 }
             }
 
-            /*	connectionThread.getEnemyStats(currentEnemyStats);
-            if((currentEnemyStats.positionX != previousEnemyStats.positionX) ||
-            (currentEnemyStats.positionY != previousEnemyStats.positionY) ||
-            (currentEnemyStats.speedX != previousEnemyStats.speedX) ||
-            (currentEnemyStats.speedY != previousEnemyStats.speedY)) {
-            previousEnemyStats.positionX = currentEnemyStats.positionX;
-            previousEnemyStats.positionY = currentEnemyStats.positionY;
-            previousEnemyStats.speedX = currentEnemyStats.speedX;
-            previousEnemyStats.speedY = currentEnemyStats.speedY;
-
-            for(int i = 0; i < enemy.length; ++i) {
-            if(enemy[i].isVisible() == false) {
-            enemy[i].launch(currentEnemyStats);
-            break;
-            }
-            }
-            }*/
-            /*		for(int i = 0; i < enemy.length; ++i) {
-            if(enemy[i].isVisible()) {
-            System.out.println("Enemy: " + i + " " +
-            enemy[i].getX() + " " + enemy[i].getY());
-            }
-            }*/
-
             for (int i = 0; i < enemy.length; ++i) {
                 if (enemy[i].isVisible()) {
                     enemy[i].advance();
-                    if (spaceCanvas.getStatus().FirstTime == false) {
+                    if (spaceCanvas.getStatus().firstTime == false) {
                         if (spaceRocket.collisionCheck(enemy[i])) {
-                            UpdateScore(isMP, true);
+                            updateScore(isMP, true);
                             if (i < (enemy.length - 1)) {
                                 ++i;
                             } else {
@@ -1988,26 +1482,6 @@
                 }
             }
 
-            /*		for(int i = 0; i < enemy.length; ++i) {
-            if(enemy[i].isVisible()) {
-            enemy[i].advance();
-            if(spaceRocket.collisionCheck(enemy[i])) {
-            --status.LivesRemaining;
-            }
-            if(rand.nextInt(40) == 0) {
-            enemy[i].launchMissile();
-            }
-            for(int j = 0; j < srrocketSprite.length; ++j) {
-            if(srrocketSprite[j].isVisible()) {
-            if(enemy[i].collisionCheck(srrocketSprite[j])) {
-            ++status.Score;
-            }
-
-            }
-            }
-            }
-            }*/
-
             for (int i = 0; i < enemy.length; ++i) {
                 if (enemy[i].isVisible()) {
                     if (rand.nextInt(20) == 0) {
@@ -2016,8 +1490,8 @@
                     for (int j = 0; j < srrocketLeftSprite.length; ++j) {
                         if ((srrocketLeftSprite[j].isVisible()) && (enemy[i].isVisible())) {
                             if (enemy[i].collisionCheck(srrocketLeftSprite[j])) {
-                            	spaceCanvas.getStatus().GameTicks += 100;
-                                ++spaceCanvas.getStatus().Score;
+                            	spaceCanvas.getStatus().gameTicks += 100;
+                                ++spaceCanvas.getStatus().score;
 
                                 if (i < (enemy.length - 1)) {
                                     ++i;
@@ -2040,8 +1514,8 @@
                     for (int j = 0; j < srrocketRightSprite.length; ++j) {
                         if ((srrocketRightSprite[j].isVisible()) && (enemy[i].isVisible())) {
                             if (enemy[i].collisionCheck(srrocketRightSprite[j])) {
-                            	spaceCanvas.getStatus().GameTicks += 100;
-                                ++spaceCanvas.getStatus().Score;
+                            	spaceCanvas.getStatus().gameTicks += 100;
+                                ++spaceCanvas.getStatus().score;
 
                                 if (i < (enemy.length - 1)) {
                                     ++i;
@@ -2071,79 +1545,9 @@
                         updateRocketScore(otherTripleRocketSpriteRight, false, i);
                         updateRocketScore(otherDoubleDamageRocketSprite, false, i);
                     }
-
-                    /*        for (int k = 0; k < tripleRocketSpriteCenter.length; ++k) {
-                    if (tripleRocketSpriteCenter[k].isVisible() && (enemy[i].isVisible())) {
-                    if (enemy[i].collisionCheck(tripleRocketSpriteCenter[k])) {
-                    status.GameTicks += 100;
-                    ++status.Score;
-
-                    if (i < (enemy.length - 1)) {
-                    ++i;
-                    } else {
-                    break;
-                    }
-                    }
-                    }
-                    }
-                    for (int k = 0; k < tripleRocketSpriteLeft.length; ++k) {
-                    if (tripleRocketSpriteLeft[k].isVisible() && (enemy[i].isVisible())) {
-                    if (enemy[i].collisionCheck(tripleRocketSpriteLeft[k])) {
-                    status.GameTicks += 100;
-                    ++status.Score;
-
-                    if (i < (enemy.length - 1)) {
-                    ++i;
-                    } else {
-                    break;
-                    }
-                    }
-                    }
-                    }
-                    for (int k = 0; k < tripleRocketSpriteRight.length; ++k) {
-                    if (tripleRocketSpriteRight[k].isVisible() && (enemy[i].isVisible())) {
-                    if (enemy[i].collisionCheck(tripleRocketSpriteRight[k])) {
-                    status.GameTicks += 100;
-                    ++status.Score;
-
-                    if (i < (enemy.length - 1)) {
-                    ++i;
-                    } else {
-                    break;
-                    }
-                    }
-                    }
-                    }
-                    for (int k = 0; k < doubleDamageRocketSprite.length; ++k) {
-                    if (doubleDamageRocketSprite[k].isVisible() && (enemy[i].isVisible())) {
-                    if (enemy[i].collisionCheck(doubleDamageRocketSprite[k])) {
-                    status.GameTicks += 100;
-                    ++status.Score;
-
-                    if (i < (enemy.length - 1)) {
-                    ++i;
-                    } else {
-                    break;
-                    }
-                    }
-                    }
-                    }*/
                 }
             }
 
-            /*      if (gameEngine.isMP()) {
-            for (int i = 0; i < enemy.length; ++i) {
-            if (enemy[i].isVisible()) {
-            for (int j = 0; j < otherRocketSprite.length; ++j) {
-            if ((otherRocketSprite[j].isVisible()) && (enemy[i].isVisible())) {
-            if (enemy[i].collisionCheck(otherRocketSprite[j])) {
-            }
-            ++i;
-            }
-            }
-            }
-            }
-            }*/
             updateRocketPosition(srrocketLeftSprite);
             updateRocketPosition(srrocketRightSprite);
             updateRocketPosition(tripleRocketSpriteCenter);
@@ -2158,117 +1562,6 @@
                 updateRocketPosition(otherTripleRocketSpriteRight);
                 updateRocketPosition(otherDoubleDamageRocketSprite);
             }
-            /*        for (int i = 0; i < srrocketSprite.length; ++i) {
-            for (int j = 0; j < enemyrocketSprite.length; ++j) {
-            if ((srrocketSprite[i].isVisible()) && (enemyrocketSprite[j].isVisible())) {
-            if (srrocketSprite[i].checkCollision(enemyrocketSprite[j])) {
-            for (int k = 0; k < explosion.length; ++k) {
-            if (explosion[k].isVisible() == false) {
-            explosion[k].explode(srrocketSprite[i].getX(),
-            srrocketSprite[i].getY());
-            break;
-            }
-            }
-            if (i < srrocketSprite.length - 1) {
-            ++i;
-            } else {
-            break;
-            }
-            }
-            }
-            }
-            }
-            for (int i = 0; i < tripleRocketSpriteCenter.length; ++i) {
-            for (int j = 0; j < enemyrocketSprite.length; ++j) {
-            if ((tripleRocketSpriteCenter[i].isVisible()) &&
-            (enemyrocketSprite[j].isVisible())) {
-            if (tripleRocketSpriteCenter[i].checkCollision(enemyrocketSprite[j])) {
-            for (int k = 0; k < explosion.length; ++k) {
-            if (explosion[k].isVisible() == false) {
-            explosion[k].explode(tripleRocketSpriteCenter[i].getX(),
-            tripleRocketSpriteCenter[i].getY());
-            break;
-            }
-            }
-            if (i < tripleRocketSpriteCenter.length - 1) {
-            ++i;
-            } else {
-            break;
-            }
-            }
-            }
-            }
-            }
-            for (int i = 0; i < tripleRocketSpriteLeft.length; ++i) {
-            for (int j = 0; j < enemyrocketSprite.length; ++j) {
-            if ((tripleRocketSpriteLeft[i].isVisible()) &&
-            (enemyrocketSprite[j].isVisible())) {
-            if (tripleRocketSpriteLeft[i].checkCollision(enemyrocketSprite[j])) {
-            for (int k = 0; k < explosion.length; ++k) {
-            if (explosion[k].isVisible() == false) {
-            explosion[k].explode(tripleRocketSpriteLeft[i].getX(),
-            tripleRocketSpriteLeft[i].getY());
-            break;
-            }
-            }
-            if (i < tripleRocketSpriteLeft.length - 1) {
-            ++i;
-            } else {
-            break;
-            }
-            }
-            }
-            }
-            }
-            for (int i = 0; i < tripleRocketSpriteRight.length; ++i) {
-            for (int j = 0; j < enemyrocketSprite.length; ++j) {
-            if ((tripleRocketSpriteRight[i].isVisible()) &&
-            (enemyrocketSprite[j].isVisible())) {
-            if (tripleRocketSpriteRight[i].checkCollision(enemyrocketSprite[j])) {
-            for (int k = 0; k < explosion.length; ++k) {
-            if (explosion[k].isVisible() == false) {
-            explosion[k].explode(tripleRocketSpriteRight[i].getX(),
-            tripleRocketSpriteRight[i].getY());
-            break;
-            }
-            }
-            if (i < tripleRocketSpriteRight.length - 1) {
-            ++i;
-            } else {
-            break;
-            }
-            }
-            }
-            }
-            }
-            for (int i = 0; i < doubleDamageRocketSprite.length; ++i) {
-            for (int j = 0; j < enemyrocketSprite.length; ++j) {
-            if ((doubleDamageRocketSprite[i].isVisible()) &&
-            (enemyrocketSprite[j].isVisible())) {
-            if (doubleDamageRocketSprite[i].checkCollision(enemyrocketSprite[j])) {
-            for (int k = 0; k < explosion.length; ++k) {
-            if (explosion[k].isVisible() == false) {
-            explosion[k].explode(doubleDamageRocketSprite[i].getX(),
-            doubleDamageRocketSprite[i].getY());
-            break;
-            }
-            }
-            if (i < doubleDamageRocketSprite.length - 1) {
-            ++i;
-            } else {
-            break;
-            }
-            }
-            }
-            }
-            }*/
-            /*	for(int i = 0; i < enemy.length; ++i) {
-            for(int j = 0; j < srrocketSprite.length; ++j) {
-            if(enemy[i].collisionCheck(srrocketSprite[j])) {
-            System.out.println("Lovit");
-            }
-            }
-            }*/
             for (int i = 0; i < srrocketLeftSprite.length; ++i) {
                 if (srrocketLeftSprite[i].isVisible()) {
                     srrocketLeftSprite[i].advance();
@@ -2319,14 +1612,14 @@
             for (int i = 0; i < enemyrocketSprite.length; ++i) {
                 if (enemyrocketSprite[i].isVisible()) {
                     enemyrocketSprite[i].advance();
-                    if (spaceCanvas.getStatus().FirstTime == false) {
+                    if (spaceCanvas.getStatus().firstTime == false) {
                         if (spaceRocket.collisionCheck(enemyrocketSprite[i])) {
                             //    synchronized (this) {
                             /*    --status.LivesRemaining;
 
                             ++status.TotalNumLivesLost;
                             spaceRocket.LifeLost();*/
-                            UpdateScore(isMP, true);
+                            updateScore(isMP, true);
                             //    }
                         }
                     }
@@ -2408,14 +1701,6 @@
                 }
             }
 
-            /*    if((isMP) && (otherSpaceRocket != null)) {
-            if(otherSpaceRocket.GetScore() <= 0) {
-            otherSpaceRocket.setVisible(false);
-            } else {
-            otherSpaceRocket.setVisible(true);
-            }
-            }*/
-
             for (int i = 0; i < explosion.length; ++i) {
                 if (explosion[i].isVisible()) {
                     explosion[i].advance();
@@ -2460,8 +1745,8 @@
             if (rocket[k].isVisible() && (enemy[i].isVisible())) {
                 if (enemy[i].collisionCheck(rocket[k])) {
                     if (updateScore) {
-                    	spaceCanvas.getStatus().GameTicks += 100;
-                        ++spaceCanvas.getStatus().Score;
+                    	spaceCanvas.getStatus().gameTicks += 100;
+                        ++spaceCanvas.getStatus().score;
                     }
 
                     if (i < (enemy.length - 1)) {
@@ -2481,7 +1766,7 @@
                 if (bossSprite[i].collisionCheck(rocket[j])) {
                     //    alreadyChecked = true;
                     if (updateScore) {    
-                    	++spaceCanvas.getStatus().Score;
+                    	++spaceCanvas.getStatus().score;
                     }
                     return true;
                 }
@@ -2497,112 +1782,47 @@
         if (isMP) {
             synchronized (this) {
                 //	scoreIncreased  = true;
-                ++ScoreQueue;
+                ++scoreQueue;
             }
         }
     }
 
-	/**
-	 * @return the arrowsSprite
-	 */
 	public synchronized Sprite getArrowsSprite() {
 		return arrowsSprite;
 	}
 
-	/**
-	 * @return the fireSprite
-	 */
 	public synchronized Sprite getFireSprite() {
 		return fireSprite;
 	}
 
-	/**
-	 * @return the arrowsBitmap
-	 */
 	public synchronized Bitmap getArrowsBitmap() {
 		return arrowsBitmap;
 	}
 
-	/**
-	 * @return the arrowsPressedBitmap
-	 */
 	public synchronized Bitmap getArrowsPressedBitmap() {
 		return arrowsPressedBitmap;
 	}
 
-	/**
-	 * @return the fireBitmap
-	 */
 	public synchronized Bitmap getFireBitmap() {
 		return fireBitmap;
 	}
 
-	/**
-	 * @return the firePressedBitmap
-	 */
 	public synchronized Bitmap getFirePressedBitmap() {
 		return firePressedBitmap;
 	}
 
-	/**
-	 * @return the fireTransparentBitmap
-	 */
 	public synchronized Bitmap getFireTransparentBitmap() {
 		return fireTransparentBitmap;
 	}
 
-	/**
-	 * @return the controlTransparency
-	 */
-	public ReentrantLock getControlTransparency() {
-		return controlTransparency;
-	}
-
-	/**
-	 * @return the fireSpriteTransparent
-	 */
 	public AtomicBoolean getFireSpriteTransparent() {
 		return fireSpriteTransparent;
 	}
 
-	/**
-	 * @param dISP_WIDTH the dISP_WIDTH to set
-	 */
-	public static synchronized void setDISP_WIDTH(int dISP_WIDTH) {
-		DISP_WIDTH = dISP_WIDTH;
-	}
-
-	/**
-	 * @return the dISP_WIDTH
-	 */
-	public static synchronized int getDISP_WIDTH() {
-		return DISP_WIDTH;
-	}
-
-	/**
-	 * @param dISP_HEIGHT the dISP_HEIGHT to set
-	 */
-	public static synchronized void setDISP_HEIGHT(int dISP_HEIGHT) {
-		DISP_HEIGHT = dISP_HEIGHT;
-	}
-
-	/**
-	 * @return the dISP_HEIGHT
-	 */
-	public static synchronized int getDISP_HEIGHT() {
-		return DISP_HEIGHT;
-	}
-
-	/**
-	 * @return the animatedBackground
-	 */
 	public AnimatedBackground getAnimatedBackground() {
 		return animatedBackground;
 	}
 
-	/**
-	 * @param animatedBackground the animatedBackground to set
-	 */
 	public void setAnimatedBackground(AnimatedBackground animatedBackground) {
 		this.animatedBackground = animatedBackground;
 	}

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/old/SendThread.java
--- a/core/src/com/headwayent/spacerocket/old/SendThread.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/SendThread.java	Sun Nov 28 20:15:56 2021 +0200
@@ -251,11 +251,11 @@
                     data.putFloat(xPosPerc);
                     data.putFloat(yPosPerc);
                     Status status = spaceCanvas.getStatus();
-                    int score = status.Score;
+                    int score = status.score;
                 /*    if(score > 0) {
                         System.out.println("Error: Score increased to " + score);
                     }*/
-                    int lives = status.LivesRemaining;
+                    int lives = status.livesRemaining;
                 /*    data[5] = (byte)(score >> 8);
                     data[6] = (byte)(score);
                     data[7] = (byte)(lives);*/

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/old/SpaceRocketMain.java
--- a/core/src/com/headwayent/spacerocket/old/SpaceRocketMain.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/SpaceRocketMain.java	Sun Nov 28 20:15:56 2021 +0200
@@ -12,7 +12,6 @@
 import com.headwayent.spacerocket.OrientationManager;
 import com.headwayent.spacerocket.ReceiveMessageActivity;
 import com.headwayent.spacerocket.SendMessageActivity;
-import com.headwayent.spacerocket.SessionStore;
 import com.headwayent.spacerocket.SpaceRocketActivity;
 import com.headwayent.spacerocket.Twitter.TwitterUtils;
 import com.headwayent.microedition.midlet.MIDlet;
@@ -548,25 +547,6 @@
     	return accelerometerOn;
     }
 
-    /*    public Command getBeginCommand() {
-    return BeginCommand;
-    }*/
-    public boolean getIsPIMSupported() {
-        return isPIMSupported;
-    }
-
-    public boolean getIsSMSSupported() {
-        return isSMSSupported;
-    }
-
-    /*    public String getPMIVersion() {
-    return PMIVersion;
-    }
-
-    public String getSMSVersion() {
-    return SMSVersion;
-    }*/
-    
     synchronized public void setSelectionMade() {
         selectionMade = true;
     }
@@ -587,210 +567,30 @@
         return spaceCanvas;
     }
 
-    /*	public DatagramConnection getSocketConnection() {
-    return socketconn;
-    }
-
-    public InputStream getInputStream() {
-    return in;
-    }
-
-    public OutputStream getOutputStream() {
-    return out;
-    }
-
-    public ConnectionThread getConnectionThread() {
-    return connectionThread;
-    }*/
     public String getName() {
         return Name;
     }
 
- /*   public String getEncryptedName() {
-        return encryptedName;
-    }*/
-
     public String getPassword() {
         return Password;
     }
 
- /*   public String getEncryptedPassword() {
-        return encryptedPassword;
-    }*/
-
     public String[] getUserID() {
         return UserID;
     }
 
-/*    public String[] getEncryptedUserID() {
-        return encryptedUserID;
-    }*/
-
-    public RecordStore getNameRecordStore() {
-        return rsName;
-    }
-
-    public RecordStore getPasswordRecordStore() {
-        return rsPassword;
-    }
-
-    public RecordStore getUserIDRecordStore() {
-        return rsUserID;
-    }
-
-    public RecordStore getIPRecordStore() {
-        return rsIP;
-    }
-
-    public RecordEnumeration getNameEnum() {
-        return recName;
-    }
-
-    public RecordEnumeration getPasswordEnum() {
-        return recPassword;
-    }
-
-    public RecordEnumeration getUserIDEnum() {
-        return recUserID;
-    }
-
-    public RecordEnumeration getIPEnum() {
-        return recIP;
-    }
-
     public String getCurrentIP() {
         return currentIP;
     }
 
- /*   public Encryptor getEncryptor() {
-        return encryptor;
-    }*/
-    
-    public Context getContext() {
-    	return context;
-    }
-    
-    public synchronized View getView() {
-    	return view;
-    }
-    
-    public synchronized void setView(View view) {
-    	this.view = view;
-    	if (spaceCanvas != null) {
-    		spaceCanvas.setView(view);
-    	}
-    }
-    
-    public SurfaceHolder getSurfaceHolder() {
-    	surfaceHolderLock.lock();
-    	try {
-    		return surfaceHolder;
-    	} finally {
-    		surfaceHolderLock.unlock();
-    	}
-    }
-    
-    public void setSurfaceHolder(SurfaceHolder surfaceHolder) {
-    	surfaceHolderLock.lock();
-    	try {
-    		this.surfaceHolder = surfaceHolder;
-    	} finally {
-    		surfaceHolderLock.unlock();
-    	}
-    }
-    
-    public void sendTweet(String message) {
-    	SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(
-				getCurrentActivity());
-		if (TwitterUtils.isAuthenticated(preferences)) {
-			try {
-				
-				if (message.length() <= 
-						com.headwayent.SpaceRocket.Twitter.Constants.TWITTER_MAX_CHARACTERS) {
-					TwitterUtils.sendTweet(preferences, message);
-				}
-			} catch (Exception e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-		}
-    }
-    
-    public void uploadDataToFacebook(String message) {
-    	if (facebook.isSessionValid()) {
-	    	Status status = getSpaceCanvas().getStatus();
-			Bundle params = new Bundle();
-			params.putString("title", "SpaceRocket");
-		    params.putString("message", message);
-		//    params.putString("picture", 
-		//    		"http://spacerocket-game.chickenkiller.com/ic_launcher.png");
-			getmAsyncRunner().request("me/feed", params, "POST", 
-					new WallPostRequestListener(), null);
-    	}
-    }
-
-	public SpaceRocketMain(Context context, SurfaceHolder holder, View view) {
-		
-		// TODO Auto-generated constructor stub
-		synchronized (this) {
-			this.context = context;
-			this.surfaceHolder = holder;
-			this.view = view;
-		}
-		
-//	    encryptor = new Encryptor("whjmd8d8brv3cxf8gc76fq2wg");
-        try {
-            highScore = RecordStore.openRecordStore(context , "highscores", true);
-        } catch (RecordStoreFullException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (RecordStoreNotFoundException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (RecordStoreException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        RecordStore rsShipOptions = null;
-        try {
-            rsName = RecordStore.openRecordStore(context , "name", true);
-            rsPassword = RecordStore.openRecordStore(context , "password", true);
-            rsUserID = RecordStore.openRecordStore(context , "UserID", true);
-            rsIP = RecordStore.openRecordStore(context , "httpip", true);
+ 	public SpaceRocketMain() {
+        highScore = RecordStore.openRecordStore(context , "highscores", true);
+        rsName = RecordStore.openRecordStore(context , "name", true);
+        rsPassword = RecordStore.openRecordStore(context , "password", true);
+        rsUserID = RecordStore.openRecordStore(context , "UserID", true);
+        rsIP = RecordStore.openRecordStore(context , "httpip", true);
             
-      /*      byte [] b = rsName.getRecord(0);
-            int namesize = rsName.getRecordSize(1);
-            int passwordsize = rsPassword.getRecordSize(1);
-            NameByte = new byte[namesize];
-            PasswordByte = new byte[passwordsize];
-            if(namesize != 0) {
-            NameByte = rsName.getRecord(0);
-            Name = NameByte.toString();
-            }
-            if(passwordsize != 0) {
-            PasswordByte = rsPassword.getRecord(0);
-            Password = PasswordByte.toString();
-            }*/
-        } catch (RecordStoreFullException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (RecordStoreNotFoundException e) {
-            // TODO Auto-generated catch block
-        //    e.printStackTrace();
-        //       this.setShipOptionsIndex(0);
-        } catch (RecordStoreException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-        try {
-			rsShipOptions = RecordStore.openRecordStore(context , "shipoptions", false);
-		} catch (RecordStoreFullException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (RecordStoreException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (RecordStoreNotFoundException e1) {
+        rsShipOptions = RecordStore.openRecordStore(context , "shipoptions", false);
 			// TODO Auto-generated catch block
 			this.setSoundOn(true);
 			this.setAccelerometerOn(true);
@@ -798,49 +598,6 @@
 			//If no options selected then save screen orientation based on current
 			//screen orientation. Don't do it in the constructor. Do it when set
 			this.setOrientationIndex(-1);
-		}
-        boolean noFb = false;
-        try {
-			rsFB = RecordStore.openRecordStore(context, "fb", false);
-		} catch (RecordStoreFullException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (RecordStoreException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-		} catch (RecordStoreNotFoundException e1) {
-			// TODO Auto-generated catch block
-			e1.printStackTrace();
-			noFb = true;
-		}
-        if (!noFb) {
-        	try {
-				recFB = rsFB.enumerateRecords(null, null, false);
-				if (recFB.hasNextElement()) {
-					try {
-						byte[] b = recFB.nextRecord();
-						if (b[0] == 1) {
-							boolean restored = SessionStore.restore(facebook, context);
-							if (!restored) {
-								facebook.authorize((SpaceRocketActivity)context, 
-										new String[] { "publish_stream" }, 
-										new LoginButton.LoginDialogListener());
-								setWaitingForFacebookAuth();
-							}
-						}
-					} catch (InvalidRecordIDException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					} catch (RecordStoreException e) {
-						// TODO Auto-generated catch block
-						e.printStackTrace();
-					}
-				}
-			} catch (RecordStoreNotOpenException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-        }
         comparator = new HighScoreComparator();
         try {
             recEnum = highScore.enumerateRecords(null,
@@ -884,95 +641,6 @@
         checkIP();
 	}
 	
-	public void checkIP() {
-        try {
-            if(recIP.hasNextElement()) {
-
-                currentIP = new String(recIP.nextRecord());
-            } else {
-                currentIP = HttpSend.IP;
-            }
-        } catch (InvalidRecordIDException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (RecordStoreNotOpenException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        } catch (RecordStoreException e) {
-            // TODO Auto-generated catch block
-            e.printStackTrace();
-        }
-    }
-
-    public void updateUserID() {
-        if (recUserID.hasNextElement()) {
-            try {
-                UserID = new String[recUserID.numRecords()];
-            //    encryptedUserID = new String[recUserID.numRecords()];
-                int i = 0;
-                while (recUserID.hasNextElement()) {
-                    UserID[i++] = new String(recUserID.nextRecord());
-            //        UserID[i++] = encryptor.decryptString(encryptedUserID[i].getBytes());
-                }
-            } catch (InvalidRecordIDException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreNotOpenException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }/* catch(CryptoException e) {
-                e.printStackTrace();
-            }*/
-            recUserID.reset();
-        }
-    }
-
-    public void updateUsernameAndPassword() {
-        if (recName.hasNextElement()) {
-            try {
-                Name = new String(recName.nextRecord()).trim();
-            //    Name = encryptor.decryptString(encryptedName.getBytes());
-            } catch(NullPointerException e) {
-                Name = "";
-            } catch (InvalidRecordIDException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreNotOpenException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }/* catch(CryptoException e) {
-                e.printStackTrace();
-            }*/
-            recName.reset();
-        }
-        if (recPassword.hasNextElement()) {
-            try {
-                Password = new String(recPassword.nextRecord()).trim();
-            //    Password = encryptor.decryptString(encryptedPassword.getBytes());
-            } catch(NullPointerException e) {
-                Password = "";
-            } catch (InvalidRecordIDException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreNotOpenException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }/* catch(CryptoException e) {
-                e.printStackTrace();
-            }*/
-            recPassword.reset();
-        }
-    }
-    
     public boolean getInMessageMenu() {
         return inMessageMenu.get();
     }
@@ -1014,20 +682,6 @@
         return shouldStart;
     }
     
-    public void setSaveCommand() {
-    //    spaceCanvas.removeCommand(OkCommand);
-    //    spaceCanvas.addCommand(ExitCommand);
-    //    spaceCanvas.addCommand(NewCommand);
-        //	setNewCommand();
-        
-        OptionsMenuManager.removeCommand(SpaceRocketActivity.MENU_NAME, 
-        		OkCommand.getName());
-        OptionsMenuManager.addCommand(SpaceRocketActivity.MENU_NAME,
-        		0, ExitCommand.getId(), ExitCommand.getOrder(), ExitCommand.getName());
-        OptionsMenuManager.addCommand(SpaceRocketActivity.MENU_NAME,
-        		0, NewCommand.getId(), NewCommand.getOrder(), NewCommand.getName());
-    }
-
 	@Override
 	public void destroyApp(boolean unconditional)
 			throws MIDletStateChangeException {
@@ -1051,49 +705,6 @@
             	
             }
             
-            /*     if((gameThread != null) && (connectionThread != null) && (isMP())) {
-            gameThread.interrupt();
-            connectionThread.interrupt();
-            gameThread.getSendThread().interrupt();
-            }*/
-            if (this.isMP()) {
-                closeConnection();
-            }
-            if (spaceCanvas.getHighScoreEnum() != null) {
-                spaceCanvas.getHighScoreEnum().destroy();
-                spaceCanvas.setHighScoreEnumNull();
-            }
-            /*	if((connectionThread != null) && (isMP())) {
-            connectionThread.requestStop();
-            }*/
-            connectionThread = null;
-            gameThread = null;
-            spaceCanvas = null;
-            if (!isMP()) {
-                try {
-                    highScore.closeRecordStore();
-                } catch (RecordStoreNotOpenException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                } catch (RecordStoreException e) {
-                    // TODO Auto-generated catch block
-                    e.printStackTrace();
-                }
-            }
-            try {
-                rsName.closeRecordStore();
-                rsPassword.closeRecordStore();
-                rsUserID.closeRecordStore();
-                //    rsIP.closeRecordStore();
-            } catch (RecordStoreNotOpenException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            } catch (RecordStoreException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
-
-            System.gc();
         } catch (Exception e) {
             System.out.println("Exception in destroyApp" + e.toString());
         }
@@ -1166,23 +777,6 @@
             		setShouldOpenMenu(true);
             	}
             }
-       /*     new Thread(new Runnable() {
-
-				@Override
-				public void run() {
-					// TODO Auto-generated method stub
-					synchronized (this) {
-						try {
-							wait(3000);
-						} catch (InterruptedException e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
-						}
-					}
-					((SpaceRocketActivity)getContext()).openOptionsMenu();
-				}
-            	
-            }).start();*/
 		}
 		
 	}
@@ -1308,26 +902,6 @@
                 (!spaceCanvas.getStatus().getGameOver())) {
             saveSession();
         }
-        synchronized (this) {
-
-
-            if (recName != null) {
-                recName.destroy();
-            }
-            if (recPassword != null) {
-                recPassword.destroy();
-            }
-            if (recUserID != null) {
-                recUserID.destroy();
-            }
-            if (recIP != null) {
-                recIP.destroy();
-            }
-            if (http != null) {
-                //    http.destroyConnection();
-                }
-        }
-
         try {
             destroyApp(false);
         } catch (MIDletStateChangeException ex) {
@@ -1370,8 +944,8 @@
 		        xPos = Float.floatToIntBits(xPosF);
 		        yPos = Float.floatToIntBits(yPosF);
 		        Status status = spaceCanvas.getStatus();
-		        score = status.Score;
-		        lives = status.LivesRemaining;
+		        score = status.score;
+		        lives = status.livesRemaining;
 		        BossSprite [] boss = gfxMgmt.getBossSprite();
 		        for(int i = 0; i < boss.length; ++i) {
 		            if((boss[i].getLaunched()) && (!boss[i].getBossDestroyedSP())) {
@@ -1412,18 +986,8 @@
 		if (exitingLock.tryLock()) {
 			try {
 		        Exit();
-		        /*     spaceCanvas = new ExtendedCanvas(this);
-		        spaceCanvas.addCommand(SPCommand);
-		        spaceCanvas.addCommand(MPCommand);
-		        spaceCanvas.addCommand(ExitCommand);
-		        spaceCanvas.setCommandListener(this);
-		        gameThread = new GameThread(spaceCanvas, this);
-		        spaceCanvas.start();
-		        gameThread.start();*/
 		        spaceCanvas = null;
 		        gameThread = null;
-		    //    pimList = null;
-		    //    smsSender = null;
 		        System.gc();
 		        try {
 		            startApp();
@@ -1433,8 +997,6 @@
 				exitingLock.unlock();
 			}
 		}
-    //    setMP(false);
-        //    spaceCanvas.reset();
     }
 	
 	public void commandAction(int id) {
@@ -1649,12 +1211,7 @@
 	private void resumeSession() {
 		try {
 		    RecordStore rs = RecordStore.openRecordStore(context, "save", false);
-		/*    spaceCanvas.removeCommand(MPCommand);
-		    spaceCanvas.removeCommand(SPCommand);
-		    spaceCanvas.removeCommand(ContinueCommand);
-		    spaceCanvas.addCommand(ExitCommand);
-		    spaceCanvas.addCommand(PauseCommand);*/
-		    
+
 		    OptionsMenuManager.removeCommand(SpaceRocketActivity.MENU_NAME, 
 					MPCommand.getName());
 		    OptionsMenuManager.removeCommand(SpaceRocketActivity.MENU_NAME, 
@@ -1728,7 +1285,7 @@
         String name = new String(b);
         //	Status status = spaceCanvas.getStatus();
         //	int score = spaceCanvas.getStatus().Score;
-        String str = String.valueOf(spaceCanvas.getStatus().Score);
+        String str = String.valueOf(spaceCanvas.getStatus().score);
         int difficulty = difficultySelection.getDifficulty();
         String temp = name + ", " + str;
         String HighScoreString = "";
@@ -1998,27 +1555,4 @@
 	public boolean isReady() {
 		return ready.get();
 	}
-	
-	/**
-	 * @return the facebook
-	 */
-	public Facebook getFacebook() {
-		return facebook;
-	}
-
-	/**
-	 * @return the mAsyncRunner
-	 */
-	public AsyncFacebookRunner getmAsyncRunner() {
-		return mAsyncRunner;
-	}
-	
-	public void setFacebookNameCreated(boolean b) {
-		facebookNameCreated.set(b);
-	}
-	
-	public boolean isFaceBookNameCreated() {
-		return facebookNameCreated.get();
-	}
-
 }

diff -r 2b50b86952e8 -r 05cc135621c2 core/src/com/headwayent/spacerocket/old/Status.java
--- a/core/src/com/headwayent/spacerocket/old/Status.java	Fri Nov 26 20:21:46 2021 +0200
+++ b/core/src/com/headwayent/spacerocket/old/Status.java	Sun Nov 28 20:15:56 2021 +0200
@@ -3,26 +3,85 @@
 
 public class Status {
 
-    public int Score;
-    public int LivesRemaining;
-    private boolean GameOver = false;
-    public int GameTicks;
-    public boolean FirstTime = true;
-    public int NumPowerupsTaken;
-    public int CoopNumPowerupsTaken;
-    public int TotalNumLivesLost;
-    public int CoopTotalNumLivesLost;
+    public int score;
+    public int livesRemaining;
+    private boolean gameOver;
+    public int gameTicks;
+    public boolean firstTime = true;
+    public int numPowerupsTaken;
+    public int coopNumPowerupsTaken;
+    public int totalNumLivesLost;
+    public int coopTotalNumLivesLost;
 
-    synchronized public void setGameOver(boolean gameOver) {
-        GameOver = gameOver;
-        /*    try {
-        throw(new Exception());
-        } catch(Exception e) {
-        e.printStackTrace();
-        }*/
+    public int getScore() {
+        return score;
     }
 
-    synchronized public boolean getGameOver() {
-        return GameOver;
+    public void setScore(int score) {
+        this.score = score;
+    }
+
+    public int getLivesRemaining() {
+        return livesRemaining;
+    }
+
+    public void setLivesRemaining(int livesRemaining) {
+        this.livesRemaining = livesRemaining;
+    }
+
+    public boolean isGameOver() {
+        return gameOver;
+    }
+
+    public void setGameOver(boolean gameOver) {
+        this.gameOver = gameOver;
+    }
+
+    public int getGameTicks() {
+        return gameTicks;
+    }
+
+    public void setGameTicks(int gameTicks) {
+        this.gameTicks = gameTicks;
+    }
+
+    public boolean isFirstTime() {
+        return firstTime;
+    }
+
+    public void setFirstTime(boolean firstTime) {
+        this.firstTime = firstTime;
+    }
+
+    public int getNumPowerupsTaken() {
+        return numPowerupsTaken;
+    }
+
+    public void setNumPowerupsTaken(int numPowerupsTaken) {
+        this.numPowerupsTaken = numPowerupsTaken;
+    }
+
+    public int getCoopNumPowerupsTaken() {
+        return coopNumPowerupsTaken;
+    }
+
+    public void setCoopNumPowerupsTaken(int coopNumPowerupsTaken) {
+        this.coopNumPowerupsTaken = coopNumPowerupsTaken;
+    }
+
+    public int getTotalNumLivesLost() {
+        return totalNumLivesLost;
+    }
+
+    public void setTotalNumLivesLost(int totalNumLivesLost) {
+        this.totalNumLivesLost = totalNumLivesLost;
+    }
+
+    public int getCoopTotalNumLivesLost() {
+        return coopTotalNumLivesLost;
+    }
+
+    public void setCoopTotalNumLivesLost(int coopTotalNumLivesLost) {
+        this.coopTotalNumLivesLost = coopTotalNumLivesLost;
     }
 }