X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/blobdiff_plain/92b19250a620252d642c0abaf8dd3d733c299f3d..aa2f597b741eacca2929c0e31ee6e9fe77151d2c:/src/de/cwde/freeshisen/ShisenShoView.java

diff --git a/src/de/cwde/freeshisen/ShisenShoView.java b/src/de/cwde/freeshisen/ShisenShoView.java
index a4280b7..6a38ffc 100644
--- a/src/de/cwde/freeshisen/ShisenShoView.java
+++ b/src/de/cwde/freeshisen/ShisenShoView.java
@@ -1,17 +1,19 @@
 package de.cwde.freeshisen;
 
+import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.Locale;
 import java.util.Timer;
 import java.util.TimerTask;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.Context;
+import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.graphics.Color;
-import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.Paint.Align;
 import android.graphics.Paint.Cap;
@@ -21,6 +23,7 @@ import android.graphics.Rect;
 import android.graphics.Typeface;
 import android.os.Handler;
 import android.os.Message;
+import android.preference.PreferenceManager;
 import android.view.MenuItem;
 import android.view.MotionEvent;
 import android.view.SurfaceHolder;
@@ -28,44 +31,68 @@ import android.view.SurfaceView;
 
 class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
+	private static final String INVALID_TIME = "9:99:99";
+	private static final String COLOR_TEXT = "#FFFFFF";
+	private static final String COLOR_TEXT_SHADOW = "#000000";
+	private static final String COLOR_HINT = "#F0C000";
+	private static final String COLOR_SELECTED = "#FF0000";
+
 	private enum StatePlay { UNINITIALIZED, IDLE, SELECTED1, SELECTED2, GAMEOVER };
 	private enum StatePaint { BOARD, SELECTED1, SELECTED2, MATCHED, WIN, LOSE, HINT, TIME };
 
 	private int screenWidth;
 	private int screenHeight;
-	private int tilesetRows;
-	private int tilesetCols;
-	private int tileHeight;
-	private int tileWidth;
 	private Bitmap bg;
-	private Bitmap tile[];
-	private int[] selection1=new int[2];
-	private int[] selection2=new int[2];
-	private List<Point> path=null;
-	private List<Line> pairs=null;
+	private Point selection1 = new Point(0, 0);
+	private Point selection2 = new Point(0, 0);
+	private List<Point> path = null;
+	private List<Line> pairs = null;
 	private long startTime;
 	private long playTime;
 	private long baseTime;
 	private Timer timer;
-	private static Handler timerHandler;
+	private Tileset tileset;
+
+	static class hHandler extends Handler {
+		private final WeakReference<ShisenShoView> mTarget;
+
+		hHandler(ShisenShoView target) {
+			mTarget = new WeakReference<ShisenShoView>(target);
+		}
+
+		@Override
+		public void handleMessage(Message msg) {
+			ShisenShoView target = mTarget.get();
+			if (target != null)
+				target.onUpdateTime();
+		}
+	}
+
+	private Handler timerHandler = new hHandler(this);
 
-	private boolean timerRegistered=false;
+	private boolean timerRegistered = false;
 	private ShisenSho app;
 	private StatePlay cstate;
 	private StatePaint pstate;
 	private Canvas canvas = null;
 	private SurfaceHolder surfaceHolder = null;
-	public ShisenShoView(ShisenSho shishenSho) {
-		super((Context)shishenSho);
-		this.app = shishenSho;
+	private String time = INVALID_TIME;
+
+	public ShisenShoView(ShisenSho shisenSho) {
+		super((Context) shisenSho);
+		this.app = shisenSho;
 		cstate = StatePlay.UNINITIALIZED;
 		surfaceHolder = getHolder();
 		surfaceHolder.addCallback(this);
+		tileset = new Tileset(shisenSho);
 	}
 
 	public ShisenShoView(Context ctx) {
-		super((Context)ctx);
-		// silence lint?
+		super(ctx);
+		this.app = (ShisenSho) ctx;
+		cstate = StatePlay.UNINITIALIZED;
+		surfaceHolder = getHolder();
+		surfaceHolder.addCallback(this);
 	}
 
 	private void paint(StatePaint pstate) {
@@ -77,45 +104,6 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		this.cstate=cstate;
 	}
 
-	private void loadTileset() {
-		BitmapFactory.Options ops = new BitmapFactory.Options();
-		ops.inScaled = false;
-		Bitmap tileset = BitmapFactory.decodeResource(getResources(), R.drawable.tileset, ops);
-		tileset.setDensity(Bitmap.DENSITY_NONE);
-
-		// The tile set has 4 rows x 9 columns
-		tilesetRows = 4;
-		tilesetCols = 9;
-		int loadedtileWidth = tileset.getWidth()/tilesetCols;
-		int loadedtileHeight = tileset.getHeight()/tilesetRows;
-		tile = new Bitmap[tilesetRows*tilesetCols];
-
-		// align to screen:
-		// "large" is 16x6, and we want to have a nice border, so we use 17x7 and
-		// choose the lowest scale so everything fits
-		float scalex = ((float) screenWidth/17) / loadedtileWidth;
-		float scaley = ((float) screenHeight/7) / loadedtileHeight;
-		if (scaley < scalex) {
-			scalex = scaley;
-		} else {
-			scaley = scalex;
-		}
-		Matrix matrix = new Matrix();
-		matrix.setScale(scalex, scaley);
-
-		int k=0;
-		for (int i=0; i<tilesetRows; i++) {
-			for (int j=0; j<tilesetCols; j++) {
-				tile[k] = Bitmap.createBitmap(tileset, j*loadedtileWidth, i*loadedtileHeight,
-						loadedtileWidth, loadedtileHeight, matrix, false);
-				tile[k].setDensity(Bitmap.DENSITY_NONE);
-				k++;
-			}
-		}
-		tileWidth = tile[0].getWidth();
-		tileHeight = tile[0].getHeight();
-	}
-
 	private void loadBackground() {
 		BitmapFactory.Options ops = new BitmapFactory.Options();
 		ops.inScaled = false;
@@ -124,27 +112,23 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 
 	private void registerTimer() {
-		if (timer!=null) return; // Already registered
-		timerHandler = new Handler() {
-			public void handleMessage(Message msg) {
-				onUpdateTime();
-			}
-		};
-		timer=new Timer();
+		if (timer != null)
+			return; // Already registered
+		timer = new Timer();
 		timer.scheduleAtFixedRate(new TimerTask() {
 			public void run() {
 				timerHandler.sendEmptyMessage(Activity.RESULT_OK);
 			}
 		}, 0, 1000);
-		timerRegistered=true;
+		timerRegistered = true;
 	}
 
 	private void unregisterTimer() {
-		if (timer==null) return; // Already unregistered
+		if (timer == null)
+			return; // Already unregistered
 		timer.cancel();
 		timer = null;
-		timerHandler = null;
-		timerRegistered=false;
+		timerRegistered = false;
 	}
 
 	public void pauseTime() {
@@ -165,6 +149,10 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		}
 	}
 
+	public void loadTileset() {
+		tileset.loadTileset(screenWidth, screenHeight);
+	}
+	
 	private void initializeGame() {
 		loadBackground();
 		screenWidth=getWidth();
@@ -177,7 +165,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		startTime=System.currentTimeMillis();
 		playTime=0;
 		baseTime=0;
-		if (app.timeCounter && !timerRegistered) {
+		if (!timerRegistered) {
 			registerTimer();
 		}
 		pairs=app.board.getPairs(1);
@@ -221,7 +209,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onUndoActivate() {
 		if (app.board.getCanUndo()) {
-			if (cstate==StatePlay.GAMEOVER && app.timeCounter && !timerRegistered) {
+			if (cstate==StatePlay.GAMEOVER && !timerRegistered) {
 				// Reprogram the time update that had been
 				// deactivated with the game over status
 				registerTimer();
@@ -234,7 +222,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 	}
 
 	public void onTimeCounterActivate() {
-		if (app.timeCounter && cstate!=StatePlay.GAMEOVER && !timerRegistered) {
+		if (cstate!=StatePlay.GAMEOVER && !timerRegistered) {
 			// Reprogram the time update that had been
 			// deactivated with the time_counter=false
 			registerTimer();
@@ -243,21 +231,24 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onUpdateTime() {
 		paint(pstate);
-		if (!(app.timeCounter && cstate!=StatePlay.GAMEOVER)) {
+		if (cstate==StatePlay.GAMEOVER) {
 			unregisterTimer();
 		}
 	}
 
 	@SuppressWarnings("deprecation")
-	public void drawMessage(Canvas canvas, int x, int y, boolean centered, String message, String color, float textSize)  {
+	public static void drawMessage(Canvas canvas, int x, int y,
+			boolean centered, String message, float textSize) {
 		Paint paint = new Paint();
-		paint.setColor(Color.parseColor(color));
 		paint.setLinearText(true);
 		paint.setAntiAlias(true);
-		paint.setTextAlign(centered?Align.CENTER:Align.LEFT);
+		paint.setTextAlign(centered ? Align.CENTER : Align.LEFT);
 		paint.setTypeface(Typeface.SANS_SERIF);
 		paint.setFakeBoldText(true);
 		paint.setTextSize(textSize);
+		paint.setColor(Color.parseColor(COLOR_TEXT_SHADOW));
+		canvas.drawText(message, x + 1, y + 1, paint);
+		paint.setColor(Color.parseColor(COLOR_TEXT));
 		canvas.drawText(message, x, y, paint);
 	}
 
@@ -266,7 +257,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		try {
 			if (canvas == null) canvas = surfaceHolder.lockCanvas(null);
 			if (canvas == null) return;
-			if (cstate==StatePlay.UNINITIALIZED) initializeGame();
+			if (cstate == StatePlay.UNINITIALIZED) initializeGame();
 			synchronized (surfaceHolder) {
 				doDraw(canvas);
 			}
@@ -280,27 +271,19 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	protected void doDraw(Canvas canvas) {
 		try {
-			// Double buffering
-			// Bitmap buffer = Bitmap.createBitmap(canvas.getWidth(), canvas.getHeight(), Bitmap.Config.ARGB_8888);
-			//Canvas cbuffer = new Canvas(buffer);
-			Canvas cbuffer = canvas;
 			if (canvas == null) return;
 
-			//super.onDraw(canvas);
-
 			// Board upper left corner on screen
 			int x0=0;
 			int y0=0;
 
 			if (app!=null && app.board!=null) {
-				x0=(screenWidth-app.board.boardSize[1]*tileWidth)/2;
-				y0=(screenHeight-app.board.boardSize[0]*tileHeight)/2;
+				x0=(screenWidth-app.board.boardSize[1]*tileset.tileWidth)/2;
+				y0=(screenHeight-app.board.boardSize[0]*tileset.tileHeight)/2;
 			}
 
-			int red = Color.parseColor("#FF0000");
-			int orange = Color.parseColor("#F0C000");
-			Paint paint = new Paint();
-			paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+			int selectcolor = Color.parseColor(COLOR_SELECTED);
+			int hintcolor = Color.parseColor(COLOR_HINT);
 
 			// Background & board painting
 			switch (pstate) {
@@ -317,7 +300,7 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 				int bgHeight = bg.getHeight();
 				for (int i=0; i<screenHeight/bgHeight+1; i++) {
 					for (int j=0; j<screenWidth/bgWidth+1; j++) {
-						cbuffer.drawBitmap(bg, j*bgWidth, i*bgHeight, paint);
+						canvas.drawBitmap(bg, j*bgWidth, i*bgHeight, null);
 					}
 				}
 
@@ -329,7 +312,11 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 							// Tiles are 56px height, 40px width each
 							char piece=app.board.board[i][j];
 							if (piece!=0) {
-								cbuffer.drawBitmap(tile[piece], x0+j*tileWidth, y0+i*tileHeight, paint);
+								canvas.drawBitmap(
+										tileset.tile[piece],
+										x0+j*tileset.tileWidth,
+										y0+i*tileset.tileHeight,
+										null);
 							}
 						}
 					}
@@ -337,62 +324,31 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 				break;
 			}
 
-			// Red rectangle for selection 1
+			// rectangle for selection 1
 			switch (pstate) {
 			case SELECTED1:
 			case SELECTED2:
 			case MATCHED:
-				paint.setColor(red);
-				paint.setStyle(Style.STROKE);
-				paint.setStrokeCap(Cap.ROUND);
-				paint.setStrokeJoin(Join.ROUND);
-				paint.setStrokeWidth(3);
-				cbuffer.drawRect(new Rect(
-						x0+selection1[1]*tileWidth-2,
-						y0+selection1[0]*tileHeight-2,
-						x0+selection1[1]*tileWidth-2+tileWidth+2*2,
-						y0+selection1[0]*tileHeight-2+tileHeight+2*2),
-						paint);
+				highlightTile(canvas, x0, y0, selection1, selectcolor);
 				break;
 			}
 
-			// Red rectangle for selection 2
+			// rectangle for selection 2
 			switch (pstate) {
 			case SELECTED2:
 			case MATCHED:
-				paint.setColor(red);
-				paint.setStyle(Style.STROKE);
-				paint.setStrokeCap(Cap.ROUND);
-				paint.setStrokeJoin(Join.ROUND);
-				paint.setStrokeWidth(3);
-				cbuffer.drawRect(new Rect(
-						x0+selection2[1]*tileWidth-2,
-						y0+selection2[0]*tileHeight-2,
-						x0+selection2[1]*tileWidth-2+tileWidth+2*2,
-						y0+selection2[0]*tileHeight-2+tileHeight+2*2),
-						paint);
+				highlightTile(canvas, x0, y0, selection2, selectcolor);
 				break;
 			}
 
 			// Matching path
 			switch (pstate) {
 			case MATCHED:
-				paint.setColor(red);
-				paint.setStyle(Style.STROKE);
-				paint.setStrokeCap(Cap.ROUND);
-				paint.setStrokeJoin(Join.ROUND);
-				paint.setStrokeWidth(3);
-
 				if (path!=null) {
 					Point p0=null;
 					for (Point p1 : path) {
 						if (p0!=null) {
-							cbuffer.drawLine(
-									x0+p0.j*tileWidth-2+(tileWidth/2),
-									y0+p0.i*tileHeight-2+(tileHeight/2),
-									x0+p1.j*tileWidth-2+(tileWidth/2),
-									y0+p1.i*tileHeight-2+(tileHeight/2),
-									paint);
+							drawLine(canvas, x0, y0, p0, p1, selectcolor);
 						}
 						p0=p1;
 					}
@@ -400,49 +356,29 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 				break;
 			}
 
-			// Orange hint rectangles
+			// hint rectangles
 			switch (pstate) {
 			case HINT:
-				if (pairs!=null && pairs.size()>0) {
-					Line pair=pairs.get(0);
-					Point a=pair.a;
-					Point b=pair.b;
-					path=app.board.getPath(a,b);
-					paint.setColor(orange);
-					paint.setStyle(Style.STROKE);
-					paint.setStrokeCap(Cap.ROUND);
-					paint.setStrokeJoin(Join.ROUND);
-					paint.setStrokeWidth(3);
-
-					cbuffer.drawRect(new Rect(
-							x0+a.j*tileWidth-2,
-							y0+a.i*tileHeight-2,
-							x0+a.j*tileWidth-2+tileWidth+2*2,
-							y0+a.i*tileHeight-2+tileHeight+2*2),
-							paint);
-
-					if (path!=null) {
-						Point p0=null;
+				if (pairs != null && pairs.size() > 0) {
+					Line pair = pairs.get(0);
+					Point a = pair.a;
+					Point b = pair.b;
+					path = app.board.getPath(a, b);
+
+					highlightTile(canvas, x0, y0, a, hintcolor);
+
+					if (path != null) {
+						Point p0 = null;
 						for (Point p1 : path) {
-							if (p0!=null) {
-								cbuffer.drawLine(
-										x0+p0.j*tileWidth-2+(tileWidth/2),
-										y0+p0.i*tileHeight-2+(tileHeight/2),
-										x0+p1.j*tileWidth-2+(tileWidth/2),
-										y0+p1.i*tileHeight-2+(tileHeight/2),
-										paint);
+							if (p0 != null) {
+								drawLine(canvas, x0, y0, p0, p1, hintcolor);
 							}
-							p0=p1;
+							p0 = p1;
 						}
-						path=null;
+						path = null;
 					}
 
-					cbuffer.drawRect(new Rect(
-							x0+b.j*tileWidth-2,
-							y0+b.i*tileHeight-2,
-							x0+b.j*tileWidth-2+tileWidth+2*2,
-							y0+b.i*tileHeight-2+tileHeight+2*2),
-							paint);
+					highlightTile(canvas, x0, y0, b, hintcolor);
 				}
 				break;
 			}
@@ -450,14 +386,16 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			// Win & loose notifications
 			switch (pstate) {
 			case WIN:
-				drawMessage(cbuffer, screenWidth/2,screenHeight/2,true,"You Win!", "#FFFFFF", 100);
+				drawMessage(canvas, screenWidth / 2, screenHeight / 2, true,
+						"You Win!", 100);
 				break;
 			case LOSE:
-				drawMessage(cbuffer, screenWidth/2,screenHeight/2,true,"Game Over", "#FFFFFF", 100);
+				drawMessage(canvas, screenWidth / 2, screenHeight / 2, true,
+						"Game Over", 100);
 				break;
 			}
 
-			if (app.timeCounter) switch (pstate) {
+			switch (pstate) {
 			case BOARD:
 			case SELECTED1:
 			case SELECTED2:
@@ -467,34 +405,24 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			case HINT:
 			case TIME:
 				updateTime();
-				int hours=(int)(playTime/(60*60));
-				int minutes=(int)((playTime/60)%60);
-				int seconds=(int)(playTime%60);
-				String time=String.format(Locale.US, "%01d:%02d:%02d", hours, minutes, seconds);
+				int hours = (int) (playTime / (60 * 60));
+				int minutes = (int) ((playTime / 60) % 60);
+				int seconds = (int) (playTime % 60);
+				if (hours < 10) {
+					time = String.format(Locale.US, "%01d:%02d:%02d",
+							hours, minutes, seconds);
+				} else {
+					time = INVALID_TIME;
+				}
 
 				int timePosX=screenWidth-120;
 				int timePosY=screenHeight-10;
-
-				drawMessage(cbuffer, timePosX+1,timePosY+1,false,time,"#000000",30);
-				drawMessage(cbuffer, timePosX,timePosY,false,time,"#FFFFFF",30);
-				break;
-			}
-
-			// Debug messages
-			/*
-			debugMessage="StatePlay: "+cstate+"\n"+"StatePaint: "+pstate;
-			if (debugMessage!=null && debugMessage.length()>0) {
-				int l = 20;
-				String lines[] = debugMessage.split("\n");
-				for (int i=0; i<lines.length; i++) {
-					drawMessage(cbuffer,1,l,false,lines[i],"#FFFF00",30);
-					l+=30;
+				
+				if (app.timeCounter) {
+					drawMessage(canvas, timePosX, timePosY, false, time, 30);
 				}
+				break;
 			}
-			 */
-
-			// Double buffer dumping
-			// canvas.drawBitmap(buffer, 0, 0, null);
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -502,6 +430,37 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	}
 
+	private void drawLine(Canvas canvas, int x0, int y0, Point p0, Point p1, int color) {
+		Paint paint = new Paint();
+		paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+		paint.setColor(color);
+		paint.setStyle(Style.STROKE);
+		paint.setStrokeCap(Cap.ROUND);
+		paint.setStrokeJoin(Join.ROUND);
+		paint.setStrokeWidth(3);
+		canvas.drawLine(
+				x0 + p0.j * tileset.tileWidth - 2 + (tileset.tileWidth / 2),
+				y0 + p0.i * tileset.tileHeight - 2 + (tileset.tileHeight / 2),
+				x0 + p1.j * tileset.tileWidth - 2 + (tileset.tileWidth / 2),
+				y0 + p1.i * tileset.tileHeight - 2 + (tileset.tileHeight / 2), paint);
+	}
+
+	private void highlightTile(Canvas canvas, int x0, int y0, Point p, int color) {
+		Paint paint = new Paint();
+		paint.setFlags(Paint.ANTI_ALIAS_FLAG);
+		paint.setColor(color);
+		paint.setStyle(Style.STROKE);
+		paint.setStrokeCap(Cap.ROUND);
+		paint.setStrokeJoin(Join.ROUND);
+		paint.setStrokeWidth(3);
+		Rect r = new Rect(
+				x0 + p.j * tileset.tileWidth - 2,
+				y0 + p.i * tileset.tileHeight - 2,
+				x0 + p.j * tileset.tileWidth + tileset.tileWidth + 2,
+				y0 + p.i * tileset.tileHeight + tileset.tileHeight + 2);
+		canvas.drawRect(r, paint);
+	}
+
 	@Override
 	public boolean onTouchEvent(MotionEvent event) {
 		if (event.getAction()==MotionEvent.ACTION_DOWN) {
@@ -512,49 +471,47 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 
 	private void onClick(int x, int y) {
 		try {
-			int i=(y-(screenHeight-app.board.boardSize[0]*tileHeight)/2)/tileHeight;
-			int j=(x-(screenWidth-app.board.boardSize[1]*tileWidth)/2)/tileWidth;
+			int i=(y-(screenHeight-app.board.boardSize[0]*tileset.tileHeight)/2)/tileset.tileHeight;
+			int j=(x-(screenWidth-app.board.boardSize[1]*tileset.tileWidth)/2)/tileset.tileWidth;
 
 			switch (cstate) {
 			case IDLE:
-				if (i>=0 &&
-				i<app.board.boardSize[0] &&
-				j>=0 && j<app.board.boardSize[1] &&
-				app.board.board[i][j]!=0) {
-					selection1[0]=i;
-					selection1[1]=j;
+				if (i >= 0 && i < app.board.boardSize[0] && j >= 0
+				&& j < app.board.boardSize[1]
+						&& app.board.board[i][j] != 0) {
+					selection1.set(i, j);
 					paint(StatePaint.SELECTED1);
 					control(StatePlay.SELECTED1);
 				}
 				break;
 			case SELECTED1:
-				if (i>=0 && i<app.board.boardSize[0] &&
-				j>=0 && j<app.board.boardSize[1] &&
-				app.board.board[i][j]!=0) {
-					if (i==selection1[0] && j==selection1[1]) {
+				if (i >= 0 && i < app.board.boardSize[0] && j >= 0
+				&& j < app.board.boardSize[1]
+						&& app.board.board[i][j] != 0) {
+					if (selection1.equals(i, j)) {
 						paint(StatePaint.BOARD);
 						control(StatePlay.IDLE);
 					} else {
-						selection2[0]=i;
-						selection2[1]=j;
+						selection2.set(i, j);
 						paint(StatePaint.SELECTED2);
 
-						Point a=new Point(selection1[0],selection1[1]);
-						Point b=new Point(selection2[0],selection2[1]);
-						path=app.board.getPath(a,b);
+						Point a = selection1.copy();
+						Point b = selection2.copy();
+						path = app.board.getPath(a, b);
 						paint(StatePaint.MATCHED);
 						app.sleep(2);
 						paint(StatePaint.BOARD);
-						if (path.size()>0) {
-							app.board.play(a,b);
+						if (path.size() > 0) {
+							app.board.play(a, b);
 						}
-						path=null;
+						path = null;
 						paint(StatePaint.BOARD);
 
-						pairs=app.board.getPairs(1);
-						if (pairs.size()==0) {
-							if (app.board.getNumPieces()==0) {
+						pairs = app.board.getPairs(1);
+						if (pairs.size() == 0) {
+							if (app.board.getNumPieces() == 0) {
 								paint(StatePaint.WIN);
+								checkforhiscore();
 							} else {
 								paint(StatePaint.LOSE);
 							}
@@ -576,10 +533,45 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 		}
 	}
 
+	private void checkforhiscore() {
+		if (timerRegistered) {
+			unregisterTimer();
+		}
+		final String[] sizes = { "S", "M", "L" };
+		final String[] diffs = { "E", "H" };
+		String prefname1 = "hiscore_" + diffs[app.difficulty-1] + sizes[app.size-1] + "1";
+		String prefname2 = "hiscore_" + diffs[app.difficulty-1] + sizes[app.size-1] + "2";
+		// get hiscores for current size/difficulty
+		SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(app);
+		String besttime1 = sp.getString(prefname1, INVALID_TIME);
+		String besttime2 = sp.getString(prefname2, INVALID_TIME);
+		// did we win something?
+		if (time.compareTo(besttime2) < 0) {
+			// score!
+			new AlertDialog.Builder(app.activity)
+				.setTitle(R.string.hiscore_title)
+				.setCancelable(true)
+				.setIcon(R.drawable.icon)
+				.setPositiveButton(android.R.string.ok, null)
+				.setMessage(R.string.hiscore_text)
+				.create()
+				.show();
+
+			SharedPreferences.Editor editor = sp.edit();
+			if (time.compareTo(besttime1) < 0) {
+				editor.putString(prefname1, time);
+				editor.putString(prefname2, besttime1);
+			} else {
+				editor.putString(prefname2, time);
+			}
+			editor.commit();
+		}
+	}
+
 	public void surfaceChanged(SurfaceHolder holder, int format, int width,
 			int height) {
 		surfaceHolder = holder;
-		if (cstate!=StatePlay.GAMEOVER && app.timeCounter && !timerRegistered) {
+		if (cstate!=StatePlay.GAMEOVER && !timerRegistered) {
 			registerTimer();
 		}
 		repaint();
@@ -596,87 +588,4 @@ class ShisenShoView extends SurfaceView implements SurfaceHolder.Callback {
 			unregisterTimer();
 		}
 	}
-
-	/*
-	@Override
-	protected void onDraw(Canvas canvas) {
-		super.onDraw(canvas);
-
-		if (!initialized) initialize();
-
-		long currTime = System.currentTimeMillis();
-
-		a = (float)(currTime - startTime) / (float)duration;
-		if (a > (float)1.0) a = (float)1.0;
-
-		x = Math.round(nextx*a + prevx*(1-a));
-		y = Math.round(nexty*a + prevy*(1-a));
-
-		if (a == (float)1.0) computeNextTarget();
-
-		int bgWidth = bg.getWidth();
-		int bgHeight = bg.getHeight();
-		for (int i=0; i<height/bgHeight+1; i++) {
-			for (int j=0; j<width/bgWidth+1; j++) {
-				canvas.drawBitmap(bg, j*bgWidth, i*bgHeight, paint);
-			}
-		}
-
-		canvas.drawBitmap(tile[randomtile], x, y, paint);
-
-		repaint();
-	}
-
-	@Override
-	public boolean onTouchEvent(MotionEvent event) {
-		if (event.getActionMasked()==MotionEvent.ACTION_DOWN) {
-			//computeNextTarget();
-			//nextx=Math.round(event.getX());
-			//nexty=Math.round(event.getY());
-		}
-		return super.onTouchEvent(event);
-	}
-
-	private void initialize() {
-		width = getWidth();
-		height = getHeight();
-
-		bg = BitmapFactory.decodeResource(getResources(), R.drawable.kshisen_bgnd);
-		Bitmap tileset = BitmapFactory.decodeResource(getResources(), R.drawable.tileset);
-
-		// The tile set has 4 rows x 9 columns
-		tsrows = 4;
-		tscols = 9;
-		twidth = tileset.getWidth()/tscols;
-		theight = tileset.getHeight()/tsrows;
-		tile = new Bitmap[tsrows*tscols];
-		int k=0;
-		for (int i=0; i<tsrows; i++) {
-			for (int j=0; j<tscols; j++) {
-				tile[k] = Bitmap.createBitmap(tileset, j*twidth, i*theight, twidth, theight, null, false);
-				k++;
-			}
-		}
-
-		x = width/2;
-		y = height/2;
-
-		computeNextTarget();
-
-		initialized = true;
-	}
-
-	private void computeNextTarget() {
-		startTime = System.currentTimeMillis();
-		prevx = x;
-		prevy = y;
-		nextx = (int) Math.floor(Math.random() * width);
-		nexty = (int) Math.floor(Math.random() * height);
-		randomtile = (int) Math.floor(Math.random() * tile.length);
-
-		paint = new Paint();
-		paint.setColor(Color.parseColor("#006666"));
-		paint.setFlags(Paint.ANTI_ALIAS_FLAG);
-	}
-	 */
 }