[Cruce-commit] SF.net SVN: cruce:[80] C/trunk/server

[<ca...@us...>]

Revision: 80
          http://cruce.svn.sourceforge.net/cruce/?rev=80&view=rev
Author:   caiusb
Date:     2010-03-23 21:34:05 +0000 (Tue, 23 Mar 2010)

Log Message:
-----------
Am adaugat un mesaj de info, care anunta clientii cine anume a castigat mana.

Modified Paths:
--------------
    C/trunk/server/gameLogic.c
    C/trunk/server/server.c

Modified: C/trunk/server/gameLogic.c
===================================================================
--- C/trunk/server/gameLogic.c	2010-03-23 21:13:53 UTC (rev 79)
+++ C/trunk/server/gameLogic.c	2010-03-23 21:34:05 UTC (rev 80)
@@ -1,6 +1,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+
 #include "server.h"
 #include "../protocol/protocol.h"
 
@@ -36,7 +37,7 @@
 	}
 }
 
-//functiacare se ocupa de tot bid-ul de la inceput de joc
+//functia care se ocupa de tot bid-ul de la inceput de joc
 //returneaza
 void bid()
 {
@@ -629,6 +630,10 @@
 	{
 		echipe[handWinnerTeam].carti_luate[echipe[handWinnerTeam].nr_carti_luate++] = carti_luate[i];
 	}
+	
+	//anunt ceilalti jucatori cine a castigat mana
+	sprintf(buff,"%s a castigat mana\n",echipe[handWinnerTeam].jucatori[handWinner].nume);
+	sendMessageToAll(INFO_MSG,buff);
 }
 
 

Modified: C/trunk/server/server.c
===================================================================
--- C/trunk/server/server.c	2010-03-23 21:13:53 UTC (rev 79)
+++ C/trunk/server/server.c	2010-03-23 21:34:05 UTC (rev 80)
@@ -315,9 +315,8 @@
 				//trimitem NACK pentru mesajul ilegal
 				int fileDescriptor = getFirst_fd_set(set);
 				while(fileDescriptor != -1)
-				{
 					sendMessage(fileDescriptor, NACK, "Ai trimis un mesaj ilegal!\n");
-				}
+					
 				//Am receptionat mesaje de la cine nu trebuia
 				return -1;
 			}
@@ -353,7 +352,7 @@
 	/* a venit mesajul de la cine trebe */
 	int messageLength = -1;
 	
-	messageLength = read(fd,msg,MSG_SIZE);
+	messageLength = read(fd, msg, MSG_SIZE);
 	char infoMSG[1024];
 	sprintf(infoMSG, "Message read. It has %d bytes\n",messageLength);
 	//displayInfoMessage(stdout, infoMSG);
@@ -364,15 +363,12 @@
 		leave_game();
 	}
 	if (messageLength != MSG_SIZE)
-	{
 		displayInfoMessage(stdout, "Warning: too few bytes read\n");
-	}
 
 	int code = decode_message(msg);
 
 	//verificam daca mesajul receptionat este intre cele care erau astepate
-	for (i=0;expected[i];i++)
-	{
+	for (i=0; expected[i]; i++)
 		if(expected[i] == code)
 		{
 			//dispatchMSG(code, msg ,fd);
@@ -382,7 +378,6 @@
 				*sender_sfd = fd;
 			return code;
 		}
-	}
 
 	displayInfoMessage(stdout, "Am receptionat mesajul gresit!\n");
 	return -1;
@@ -396,12 +391,9 @@
 	int j;
 
 	for(i = 0; i < NUMAR_ECHIPE; i++)
-	{
 		for(j = 0; j<JUCATORI_PER_ECHIPA;j++)
-		{
 			close(echipe[i].jucatori[j].sfd);
-		}
-	}
+
 	exit(EXIT_SUCCESS);
 }
 
@@ -448,14 +440,9 @@
 
 	//trimitem mesajul pe socket
 	if (write(receiver_sfd, &buffer, MSG_SIZE) != MSG_SIZE)
-	{
 		return false;
-	}
 	else
-	{
-		//succes
-		return true;
-	}
+		return true; //succes
 }
 
 /**
@@ -474,12 +461,8 @@
 	int j;
 	for (i = 0; i < NUMAR_ECHIPE; i++)
 		for (j = 0; j < MAX_JUCATORI; j++)
-		{
 			if (write(echipe[i].jucatori[j].sfd, &buffer, MSG_SIZE) != MSG_SIZE)
-			{
 				return false;
-			}
-		}
 	return true;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.