ada/breakthroughpine64backup
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FIXING GITHUB STUPID THINGS.

Browse source
This commit is contained in:
Alexander Huddleston 2015-11-04 00:25:06 -06:00
parent 6cabd5aceb
commit 984753f564
1 changed files with 0 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
Server.cpp
View file

@ -171,7 +171,6 @@ 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();
<<<<<<< HEAD
if(choice1 == 1) {
cout<<"\nWaiting for client: ";
n = read(newsockfd,buffer,255);
@ -199,23 +198,6 @@ int main(int argc, char *argv[])
e.AI(47);
else
e.AI(77);
//e.getBoard()->changeTurns();
=======
cout<<"\nWaiting for client: ";
n = read(newsockfd,buffer,255);
move = buffer;
bzero(buffer,256);
parse(move,(*e.getBoard()));
if(e.getBoard()->isValid()) {
boardState = e.getBoard()->boardToString();
cout << boardState << "testing\n\n";
write(newsockfd, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
//write(newsockfd2, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
e.getBoard()->changeTurns();
e.getBoard()->setValidFalse();
>>>>>>> master
}
}
@ -237,7 +219,6 @@ int main(int argc, char *argv[])
string boardState = e.getBoard()->boardToString();
final_move = e.getBoard()->boardToString();
write(newsockfd2, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
<<<<<<< HEAD
if(choice2 == 1) {
cout<<"\nWaiting for client: ";
n = read(newsockfd2,buffer,255);
@ -256,16 +237,6 @@ int main(int argc, char *argv[])
}
}
else {
=======
cout<<"\nWaiting for client: ";
n = read(newsockfd2,buffer,255);
move = buffer;
bzero(buffer,256);
parse(move,(*e.getBoard()));
if(e.getBoard()->isValid()) {
boardState = e.getBoard()->boardToString();
>>>>>>> master
write(newsockfd, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
//write(newsockfd2, boardState.c_str(), boardState.length());//Display the board to the client (line by line)
if(choice2_difficulty == "EASY")