From cc821197e029d16c9fc157738170c1d5185e1e47 Mon Sep 17 00:00:00 2001
From: Alexander Huddleston <shadow8t4@linux2.cs.tamu.edu>
Date: Thu, 29 Oct 2015 22:56:07 -0500
Subject: [PATCH] Fixing merge issues.

---
 Server.cpp | 113 -----------------------------------------------------
 1 file changed, 113 deletions(-)

diff --git a/Server.cpp b/Server.cpp
index 53c648a..ef0d679 100644
--- a/Server.cpp
+++ b/Server.cpp
@@ -11,10 +11,7 @@
 #include <netinet/in.h>
 #include <vector>
 #include "Board.h"
-<<<<<<< HEAD
-=======
 #include "Engine.h"
->>>>>>> master
 using namespace std;
 
 void error(const char *msg)
@@ -22,13 +19,6 @@ void error(const char *msg)
     perror(msg);
     exit(1);
 }
-
-<<<<<<< HEAD
-int main(int argc, char *argv[])
-{
-     int sockfd, newsockfd, portno;
-     socklen_t clilen;
-=======
 string tempParse(string move) {
 	string output = "";
 	int tempa = move[0] - '0';
@@ -67,7 +57,6 @@ int main(int argc, char *argv[])
 {
     int sockfd, newsockfd, portno;
     socklen_t clilen;
->>>>>>> master
     
 	struct sockaddr_in serv_addr, cli_addr;
 
@@ -76,58 +65,6 @@ int main(int argc, char *argv[])
 	if (argc < 2) {
          fprintf(stderr,"ERROR, no port provided\n");
          exit(1);
-<<<<<<< HEAD
-     }
-     
-	 sockfd = socket(AF_INET, SOCK_STREAM, 0);
-     
-	 if (sockfd < 0) 
-        error("ERROR opening socket");
-     
-	 bzero((char *) &serv_addr, sizeof(serv_addr));
-     
-	 portno = atoi(argv[1]);
-     
-	 serv_addr.sin_family = AF_INET;
-     
-	 serv_addr.sin_addr.s_addr = INADDR_ANY;
-     
-	 serv_addr.sin_port = htons(portno);
-     
-	 if (bind(sockfd, (struct sockaddr *) &serv_addr,
-              sizeof(serv_addr)) < 0) 
-              error("ERROR on binding");
-     
-	 listen(sockfd,5);
-     
-	 clilen = sizeof(cli_addr);
-     
-	 newsockfd = accept(sockfd, 
-                 (struct sockaddr *) &cli_addr, 
-                 &clilen);
-     
-	 if (newsockfd < 0) 
-          error("ERROR on accept");
-	
-	//After all the server setup crap is done, we start the board
-	
-	// cout<<"WELCOME\n";
-	
-	// cout<<"1. Play against AI?\n";
-	// cout<<"2. Play against a human?\n";
-	// cout<<"Enter choice: \n";
-	
-	
-	// cin >> choice;
-	// cout << "OK" << endl;
-	
-	Board b;
-	string move;
-	
-	
-	bool gameOver = false; 
-	b.snapshot();
-=======
     }
      
 	sockfd = socket(AF_INET, SOCK_STREAM, 0);
@@ -165,32 +102,11 @@ int main(int argc, char *argv[])
 	bool gameOver = false; 
 	vector<Board> record;
 	e.getBoard()->snapshot(record,(*e.getBoard()));
->>>>>>> master
     char buffer[256];
     char info[256];
 	int choice;
 	int move_counter = 0;
 	string final_move;
-<<<<<<< HEAD
-	
-	//Waiting for client to select game type
-	n = read(newsockfd,info,255);
-	istringstream convert(info);
-	convert >> choice; //Sets choice equal to 1 or 2, based on clients input
-	bzero(info,256); //Resets info back to normal, "choice" now contains client's value
-	
-	 while(true) {
-		 
-		 while(gameOver != true)
-		 {
-			gameOver = b.isGameOver();
-			
-			while(b.getTurn() == 'O' )
-			{
-				b.displayBoard();//Display the board on the server
-				string boardState = b.boardToString();
-				final_move = b.boardToString();
-=======
 		
 	//Ask client about game type
 	string introduction = "WELCOME\n1. Play against AI?\n2. Watch AI vs. AI?\nEnter choice: \n";
@@ -225,38 +141,10 @@ int main(int argc, char *argv[])
 				e.getBoard()->displayBoard();//Display the board on the server
 				string boardState = e.getBoard()->boardToString();
 				final_move = e.getBoard()->boardToString();
->>>>>>> master
 				write(newsockfd, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
 				cout<<"\nWaiting for client: ";
 				n = read(newsockfd,buffer,255);
 				move = buffer;
-<<<<<<< HEAD
-				b.interpret(move,b);
-				gameOver = b.isGameOver();
-				if(gameOver == true) {
-					string endGame = "Game_Over";
-					write(newsockfd, endGame.c_str(), endGame.length()); //Display the board to the client (line by line)
-					break;
-				}	
-				else {
-					string continueGame = "Continue_Game";
-					write(newsockfd, continueGame.c_str(), continueGame.length()); //Display the board to the client (line by line)
-				}
-			}
-			
-			vector<moves> possibleMoves = b.viewPossibleMoves();
-			if(choice == 1)
-				b.easyAI();
-			b.snapshot();	
-		 }
-		 
-		string final_move = b.boardToString();
-		write(newsockfd, final_move.c_str(), final_move.length());//Display the board to the client (line by line)
-		write(newsockfd, final_move.c_str(), final_move.length());
-		cout << "\n\nGAME OVER!!!";
-		//b.displayRecord();for debugging undo/snapchot fnctions
-		usleep(1);
-=======
 				bzero(buffer,256);
 				//cout << move << "\n\n";
 				move = tempParse(move);
@@ -296,7 +184,6 @@ int main(int argc, char *argv[])
 		write(newsockfd, game_over.c_str(), game_over.length()); //Tell the client the game is over
 		cout << game_over;
 		usleep(1); 
->>>>>>> master
 		close(newsockfd);
 		close(sockfd);
 		break;