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

[<ali...@us...>]

Revision: 50
          http://cruce.svn.sourceforge.net/cruce/?rev=50&view=rev
Author:   alinposho
Date:     2010-03-22 18:33:28 +0000 (Mon, 22 Mar 2010)

Log Message:
-----------
Am impartit functiile din Server pe 2 fisier ca erau fisierul server.c era deja prea mare. Am facur update la Makefile-ul server-ului deci este Ok ana acum. Nu cred ca mai este necesar sa detaliez ce contine fisierul gameLogic.c.

Modified Paths:
--------------
    C/trunk/server/Makefile
    C/trunk/server/server.c
    C/trunk/server/server.h

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

Modified: C/trunk/server/Makefile
===================================================================
--- C/trunk/server/Makefile	2010-03-22 17:48:08 UTC (rev 49)
+++ C/trunk/server/Makefile	2010-03-22 18:33:28 UTC (rev 50)
@@ -14,9 +14,17 @@
 serverObj = $(serverObjectFolder)server.o
 
 protocolObj = $(protocolFolder)Object/protocol.o 
+
+gameLogicObj = $(serverObjectFolder)gameLogic.o
+
+gameLogicSource = $(serverFolder)gameLogic.c
  
-$(serverObjectFolder)$(execName) : $(protocolObj) $(serverObj) 
-	cc -o $(serverObjectFolder)$(execName) $(protocolObj) $(serverObj) 
+$(serverObjectFolder)$(execName) : $(protocolObj) $(serverObj) $(gameLogicObj)
+	cc -o $(serverObjectFolder)$(execName) $(protocolObj) $(serverObj)  $(gameLogicObj)
+	
+#Creating gameLogic object file
+$(gameLogicObj) : $(gameLogicSource) $(protocolFolder)protocol.h
+	gcc -c $(gameLogicSource) -o $(gameLogicObj)
 		
 #Creating the server object file
 $(serverObj): $(serverSource) $(protocolFolder)protocol.h

Added: C/trunk/server/gameLogic.c
===================================================================
--- C/trunk/server/gameLogic.c	                        (rev 0)
+++ C/trunk/server/gameLogic.c	2010-03-22 18:33:28 UTC (rev 50)
@@ -0,0 +1,62 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "server.h"
+#include "../protocol/protocol.h"
+
+int bidAmount = -1;
+int noOfTeamWhoBidded = -1;
+
+
+
+//functia pentru o mana
+
+int playHand()
+{
+	bid();
+	echipe[0].scor++;
+
+}
+
+//functiacare se ocupa de tot bid-ul de la inceput de joc
+//returneaza
+int bid()
+{
+
+}
+
+//Functie care returneaza true cand s-a sfarsit jocul sfarsitul jocului
+int endOfGame()
+{
+	int i;
+	for(i = 0; i < NUMAR_ECHIPE; i++)
+	{
+		if(echipe[i].scor >= MAX_SCOR)
+		{
+			return true;
+		}
+	}
+
+	return false;
+}
+
+void inforAllAboutEndOfGame()
+{
+	displayInfoMessage(stdout, "Informam toti jucatorii despre cum s-a sfarsit jocul!\n");
+}
+
+
+
+void playGame()
+{
+
+	while(false == endOfGame())
+	{
+		displayInfoMessage(stdout, "***\nJucam o noua mana!\n***");
+		playHand();
+	}
+
+	//s-a sfarsit jocul ii informam pe toti
+	inforAllAboutEndOfGame();
+
+}


Property changes on: C/trunk/server/gameLogic.c
___________________________________________________________________
Added: svn:executable
   + *

Modified: C/trunk/server/server.c
===================================================================
--- C/trunk/server/server.c	2010-03-22 17:48:08 UTC (rev 49)
+++ C/trunk/server/server.c	2010-03-22 18:33:28 UTC (rev 50)
@@ -13,12 +13,7 @@
 #include "server.h"
 #include "../protocol/protocol.h"
 
-#define	NUMAR_ECHIPE	2
-#define true 1
-#define false 0
 
-struct echipa echipe[NUMAR_ECHIPE];
-
 struct sockaddr_in addr;
 char ip[16];
 
@@ -292,11 +287,13 @@
 						displayInfoMessage(stdout, buffer);
 						player->active = true;
 					}
-					else//inform the others who joined the game
-					{
-						sprintf(resp, "%d %s wants to start the game.", INFO_MSG, player->nume);
-						sendInfoMessage(player->sfd, resp);
-					}
+					else //inform the others who pressed start game
+						if (true == player->active)
+						{
+							sprintf(resp, "%d %s wants to start the game.", INFO_MSG,
+									player->nume);
+							sendInfoMessage(player->sfd, resp);
+						}
 				}
 			break;
 		}
@@ -487,6 +484,8 @@
 }
 
 
+
+
 int main(int argc, char *argv[])
 {
 	displayInfoMessage(stdout, "Server started!\n");
@@ -579,10 +578,11 @@
 	sprintf(infoMessage, "\n\n*************************Game has started********************\n\n");
 	displayInfoMessage(stdout, infoMessage);
 
+	//functia pentru un joc
+	playGame();
+
 	displayInfoMessage(stdout, "Press any key to close server\n" );
 
-
-
 	getchar();
 
 	return 1;

Modified: C/trunk/server/server.h
===================================================================
--- C/trunk/server/server.h	2010-03-22 17:48:08 UTC (rev 49)
+++ C/trunk/server/server.h	2010-03-22 18:33:28 UTC (rev 50)
@@ -6,6 +6,11 @@
 #define	CARTI_MANA		6
 #define JUCATORI_PER_ECHIPA 2
 
+#define MAX_SCOR 21
+#define	NUMAR_ECHIPE	2
+#define true 1
+#define false 0
+
 /**
 Structura pentru o carte
 valoare - valoare cartii (0,2,3,4,10,11)
@@ -38,4 +43,15 @@
 	struct carte carti_luate[MAX_CARTI];
 };
 
+//cele 2 echipe care joaca
+struct echipa echipe[NUMAR_ECHIPE];
+
+//logica pentru tot jocul
+void playGame();
+
+/**
+ * Prints the message to the output file making sure to flush the buffer
+ */
+void displayInfoMessage(FILE* infoMessageOutput, char *messag);
+
 #endif /* __SERVER_H__ */


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