agabrielNetworkCodeDSGClient.vs.amiles.client.dif RJL061211 --------------------------------------------- mercury(106)> lg agabriel/F*/NetworkCode/DSG_* agabriel/FinalProject/NetworkCode/DSG_Client: total 84 drwxr-xr-x 2 06f522 4096 Nov 20 10:05 . drwxr-xr-x 4 06f522 4096 Nov 20 10:05 .. -rw-r--r-- 1 06f522 5051 Nov 22 12:37 cardset.c -rw-r--r-- 1 06f522 839 Nov 22 12:37 cardset.h -rw-r--r-- 1 06f522 814 Nov 22 12:37 globals.c -rw-r--r-- 1 06f522 1628 Nov 22 12:37 globals.h -rw-r--r-- 1 06f522 9985 Nov 22 12:37 main.c -rw-r--r-- 1 06f522 470 Nov 22 12:37 main.h -rw-r--r-- 1 06f522 682 Nov 22 12:37 Makefile agabriel/FinalProject/NetworkCode/DSG_Server: total 108 drwxr-xr-x 2 06f522 4096 Nov 20 10:05 . drwxr-xr-x 4 06f522 4096 Nov 20 10:05 .. -rw-r--r-- 1 06f522 5058 Nov 22 12:37 cardset.c -rw-r--r-- 1 06f522 839 Nov 22 12:37 cardset.h -rw-r--r-- 1 06f522 1556 Nov 22 12:37 globals.c -rw-r--r-- 1 06f522 3069 Nov 22 12:37 globals.h -rw-r--r-- 1 06f522 17455 Nov 22 12:37 main.c -rw-r--r-- 1 06f522 663 Nov 22 12:37 main.h -rw-r--r-- 1 06f522 760 Nov 22 12:37 Makefile -rw-r--r-- 1 06f522 2457 Nov 22 12:37 queue.c -rw-r--r-- 1 06f522 509 Nov 22 12:37 queue.h mercury(107)> lg amiles/final total 32 drwxr-sr-x 4 06f522 4096 Dec 4 09:10 . drwxrwsr-x 5 06f522 4096 Nov 28 14:33 .. drwxr-sr-x 2 06f522 4096 Dec 4 16:56 client drwxr-sr-x 2 06f522 4096 Dec 4 16:56 server mercury(109)> diff amiles/final/client agabriel/FinalProject/NetworkCode/DSG_Client | wc 87 261 2443 mercury(110)> diff amiles/final/client agabriel/FinalProject/NetworkCode/DSG_Client | grepdiff 1:diff -bitw amiles/final/client/cardset.c agabriel/FinalProject/NetworkCode/DSG_Client/cardset.c 35:Only in amiles/final/client: cardset.c~ 36:diff -bitw amiles/final/client/cardset.h agabriel/FinalProject/NetworkCode/DSG_Client/cardset.h 40:Only in amiles/final/client: cardset.h~ 41:Only in amiles/final/client: cardset.o 42:Only in amiles/final/client: client 43:Only in amiles/final/client: client.bak 44:Only in amiles/final/client: client.c 45:Only in amiles/final/client: client.c~ 46:Only in amiles/final/client: client.h 47:Only in amiles/final/client: client.o 48:diff -bitw amiles/final/client/globals.c agabriel/FinalProject/NetworkCode/DSG_Client/globals.c 57:Only in amiles/final/client: globals.c~ 58:diff -bitw amiles/final/client/globals.h agabriel/FinalProject/NetworkCode/DSG_Client/globals.h 61:Only in amiles/final/client: globals.h~ 62:Only in amiles/final/client: globals.o 63:Only in agabriel/FinalProject/NetworkCode/DSG_Client: main.c 64:Only in agabriel/FinalProject/NetworkCode/DSG_Client: main.h 65:diff -bitw amiles/final/client/Makefile agabriel/FinalProject/NetworkCode/DSG_Client/Makefile 87:Only in amiles/final/client: Makefile~ -------------------------------------------------- mercury(111)> diff -bitw amiles/final/client/cardset.h agabriel/FinalProject/NetworkCode/DSG_Client/cardset.h 9a10,11 > > mercury(112)> diff -bitw amiles/final/client/globals.c agabriel/FinalProject/NetworkCode/DSG_Client/globals.c 11a12 > #include "cardset.h" 12a14 > char strCardLayout[12][100]; /* This array holds all card information */ 20a23 > card currentGame[12]; /* Current set hand of cards */ 22d24 < //card currentGame[12];/* Current set hand of cards */ mercury(113)> diff -bitw amiles/final/client/globals.h agabriel/FinalProject/NetworkCode/DSG_Client/globals.h 70a71 ---------------------------------------------> mercury(114)> diff -bitw amiles/final/client/Makefile agabriel/FinalProject/NetworkCode/DSG_Client/Makefile 16c16 < all: client --- > all: player 18,19c18,19 < client.o: client.c client.h cardset.h globals.h < $(CC) $(INCLUDES) -g3 -c client.c --- > main.o: main.c main.h cardset.h globals.h > $(CC) $(INCLUDES) -g3 -c main.c 27,28c27,28 < client: client.o globals.o < $(CC) $(LDOPTS) $(LDLIBS) client.o cardset.o globals.o -o client --- > player: main.o cardset.o globals.o > $(CC) $(LDOPTS) $(LDLIBS) main.o cardset.o globals.o -o player 31c31,32 < rm -f *.o client --- > rm -f *.o player >