Merge branch 'master' of https://github.tamu.edu/brj2013/Breakthrough

Client.java

@@ -272,6 +272,18 @@ public class Client {
 			userInput = stdIn.readLine();
 			output.println(userInput);
 			
+			String diff = "?";
+			in.read(b, 0, 256);
+			temp = String.valueOf(b).trim();
+			System.out.print(temp);
+			while(!diff.equals("EASY") && !diff.equals("MEDIUM") && !diff.equals("HARD")) {
+				diff = stdIn.readLine();
+				if(!diff.equals("EASY") && !diff.equals("MEDIUM") && !diff.equals("HARD")) {
+					System.out.print(diff + "\nInvalid difficulty.\n" + temp);
+				}
+			}
+			output.println(userInput);
+			
 			while(!end) {
 				char[] buffer = new char[256];
 				in.read(buffer, 0, 256);

Server.cpp

@@ -118,18 +118,15 @@ int main(int argc, char *argv[])
 	cout << "OK" << endl;
 	bzero(info,256); //Resets info back to normal
 	
-	/*//Becca- once your AI code is working, use this code:
+	string difficulty_select = "Choose Difficulty\n1. Easy\n2. Medium\n3. Hard\nEnter choice: \n";
-	
-	string difficulty_select = "Choose Difficulty\n1. Easy\n2. Medium\n4. Hard\nEnter choice: \n";
 	write(newsockfd, difficulty_select.c_str(), difficulty_select.length());
 	n = read(newsockfd,info,255);
-	istringstream convert(info);
+	istringstream con(info);
-	convert >> choice_difficulty;
+	string choice_difficulty = "EASY";
+	con >> choice_difficulty;
 	cout << "OK" << endl;
 	bzero(info,256);
 	
-	*/
-	
 	while(true) {
 		 
 		 while(gameOver != true)
@@ -162,15 +159,12 @@ int main(int argc, char *argv[])
 			
 			while(e.getBoard()->getTurn() == 'X' )
 			{
-				e.easyAI();
+				if(choice_difficulty == "EASY")
-				/*Becca- once you finish your AI, uncomment this out and remove the line directly above this
+					e.AI(3);
-				if(choice_difficulty == 1)
+				else if(choice_difficulty == "MEDIUM")
-					easyAI();
+					e.AI(5);
-				else if(choice_difficulty == 2)
-					mediumAI();
 				else
-					hardAI();
+					e.AI(7);
-				*/
 			}
 			
 			gameOver = e.getBoard()->isGameOver();