From 6d306058415fec04f5e56421af1d95abb4620767 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Sun, 23 Jan 2011 19:09:02 +0100
Subject: started refactoring: separate server process for local client; moved
 net code from main.c to game.c

---
 src/main.c | 38 +++++++++++++++++++++++++-------------
 1 file changed, 25 insertions(+), 13 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index d48a3e6..bde5bf1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -11,7 +11,7 @@
 int main(int argc, char **argv)
 {
 	char* port = 0;
-	char *addr;
+	char* addr = NULL;
 	bool servermode = false;
 
 	int opponents = 1;
@@ -21,7 +21,21 @@ int main(int argc, char **argv)
 		printf("usage: '%s address port' for client mode, or '%s port' for server mode\n", argv[0], argv[0]);
 		return EXIT_SUCCESS;
 	}
-	else if (argc == 2) // Server mode
+	else if(argc == 2) // Server mode
+	{
+		addr = "localhost";
+		port = argv[1];
+	}
+	else if(argc == 3)
+	{
+		addr = argv[1];
+		port = argv[2];
+
+	}
+
+	start_game(servermode, addr, port);
+
+	/*else if (argc == 2) // Server mode
 	{
 		int ssock;
 		int* csocks;
@@ -38,14 +52,14 @@ int main(int argc, char **argv)
 		csocks = server_get_players(ssock, opponents);
 
 		players.count = opponents + 1;
-		players.names[0] = malloc(strlen(nickname)+1);
-		strcpy(players.names[0], nickname);
+		//players.names[0] = malloc(strlen(nickname)+1);
+		//strcpy(players.names[0], nickname);
 
 		for(int i=0; i<opponents; i++)
 		{
 			// wait for greeting from client i and read nick
 			char* name = net_recv(csocks[i], msg_type_hello);
-			players.names[i+1] = name;
+			//players.names[i+1] = name;
 			printf("player connected: len:%d, name:%s\n", strlen(name), name);
 		}
 
@@ -67,8 +81,8 @@ int main(int argc, char **argv)
 		}
 
 		// cleanup
-		for(int i=0; i<players.count; i++)
-			free(players.names[i]);
+		//for(int i=0; i<players.count; i++)
+		//	free(players.names[i]);
 		close(ssock);
 		free(csocks);
 	}
@@ -89,8 +103,8 @@ int main(int argc, char **argv)
 
 		// retrieve list of all players from server
 		players = net_recv(sock, msg_type_start_game);
-		for(int i=0; i<players->count; i++)
-			printf("Player %d: %s\n", i, players->names[i]);
+		//for(int i=0; i<players->count; i++)
+		//	printf("Player %d: %s\n", i, players->names[i]);
 
 		// receive test hand
 		testhand = net_recv(sock, msg_type_deal_cards);
@@ -114,10 +128,8 @@ int main(int argc, char **argv)
 		cleanup_playerlist(players);
 		free(testhand);
 		close(sock);
-	}
+	}*/
+
 
-	//ui_init();
-	//start_game(servermode, addr, port);
-	//ui_fini();
 	return EXIT_SUCCESS;
 }
-- 
cgit v1.2.3