From: gitknilch <gitknilch@cwde.de>
Date: Tue, 26 Feb 2013 09:01:17 +0000 (+0100)
Subject: renumber difficulty: 1=Easy, 2=Hard
X-Git-Url: https://git.zerfleddert.de/cgi-bin/gitweb.cgi/FreeShisen/commitdiff_plain/e41eaffe2055db74199b79284188b41af0997816?ds=sidebyside

renumber difficulty: 1=Easy, 2=Hard
---

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 14a60b4..e7ded55 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -10,13 +10,12 @@
         <item>Hard</item>
     </string-array>
     <string-array name="difficulty_values">
-        
-        <item >2</item><item>1</item>
+        <item>1</item>
+        <item>2</item>
     </string-array>
     <string-array name="size_values">
-        <item >1</item>
-        <item >2</item>
-        <item >3</item>
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
     </string-array>
-    
 </resources>
diff --git a/src/de/cwde/shisensho/Board.java b/src/de/cwde/shisensho/Board.java
index f1627b0..146b1d8 100644
--- a/src/de/cwde/shisensho/Board.java
+++ b/src/de/cwde/shisensho/Board.java
@@ -71,9 +71,9 @@ public class Board {
 		this.difficulty=difficulty;
 		this.gravity=gravity;
 
-		int numDifferentPieces=((boardSize[0]-2)*(boardSize[1]-2)/((difficulty+1)*2))+1;
-		for (int n=0;n<((difficulty+1)*2);n++) {
-			for (int k=0;k<numDifferentPieces;k++) {
+		int numDifferentPieces=((boardSize[0]-2)*(boardSize[1]-2)/((4-difficulty)*2))+1;
+		for (int n=0; n<((4-difficulty)*2); n++) {
+			for (int k=0; k<numDifferentPieces; k++) {
 				int i,j;
 				do {
 					j=(myrand() % (boardSize[1]-2))+1;