From 7a0be7c719906a54cf58cc34d37249b0dbeed5ea Mon Sep 17 00:00:00 2001
From: Giel van Schijndel <giel@wz2100.net>
Date: Sun, 30 Dec 2007 16:59:20 +0000
Subject: [PATCH]  * Move the send/recv-Droid functions over to the new net
 primitives API (patch #905 by myself)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3235 4a71c877-e1ca-e34f-864e-861f7616d084
---
 src/multibot.c  | 80 ++++++++++++++++++++++++-------------------------
 src/multiplay.c |  2 +-
 src/multiplay.h |  2 +-
 src/multirecv.h |  2 +-
 4 files changed, 42 insertions(+), 44 deletions(-)

diff --git a/src/multibot.c b/src/multibot.c
index 28afb9ab5..d5f6f7b54 100644
--- a/src/multibot.c
+++ b/src/multibot.c
@@ -371,10 +371,8 @@ BOOL recvDroidMove(NETMSG *m)
 
 // ////////////////////////////////////////////////////////////////////////////
 // Send a new Droid to the other players
-BOOL SendDroid(DROID_TEMPLATE *pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id)
+BOOL SendDroid(const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id)
 {
-	NETMSG m;
-
 	// Dont send other droids during campaign setup
 	if (ingame.localJoiningInProgress)
 	{
@@ -388,42 +386,44 @@ BOOL SendDroid(DROID_TEMPLATE *pTemplate, uint32_t x, uint32_t y, uint8_t player
 		return FALSE;
 	}
 
+	NETbeginEncode(NET_DROID, NET_ALL_PLAYERS);
+	{
+		Vector3uw pos = { x, y, 0 };
+		uint32_t templateID = pTemplate->multiPlayerID;
 
-	NetAdd(m,0,player);						//ok since <255  players!
-	NetAdd(m,1,x);									//x pos of new droid
-	NetAdd(m,5,y);									//y pos of new droid
-	NetAdd(m,9,id);									//id of droid to create
-
-	m.body[13] = powerCalculated;
-
-	// new version
-	NetAdd(m,14,pTemplate->multiPlayerID);
-	m.size = 14+sizeof(pTemplate->multiPlayerID);
-
-	m.type=NET_DROID;
-	NETbcast(&m,FALSE);						// send it.
-	return TRUE;
-
+		NETuint8_t(&player);
+		NETuint32_t(&id);
+		NETVector3uw(&pos);
+		NETuint32_t(&templateID);
+		NETbool(&powerCalculated);
+	}
+	return NETend();
 }
 
 // ////////////////////////////////////////////////////////////////////////////
 // receive droid creation information from other players
-BOOL recvDroid(NETMSG * m)
+BOOL recvDroid()
 {
-	DROID_TEMPLATE *pT;
-	UDWORD			x,y,id;
-	UDWORD			player;
-	UDWORD			targetRef;
-	DROID			*d;
+	DROID_TEMPLATE* pT;
+	DROID* psDroid;
+    uint8_t player;
+    uint32_t id;
+    Vector3uw pos;
+    BOOL power;
 
-	player=m->body[0];
-	NetGet(m,1,x);									// new droids x position
-	NetGet(m,5,y);									// new droids y position
-	NetGet(m,9,id);									// droid to build's id.
+	NETbeginDecode();
+	{
+		uint32_t templateID;
 
-	NetGet(m,14,targetRef);
+		NETuint8_t(&player);
+		NETuint32_t(&id);
+		NETVector3uw(&pos);
+		NETuint32_t(&templateID);
+		NETbool(&power);
 
-	pT = IdToTemplate(targetRef,player);
+		pT = IdToTemplate(templateID, player);
+	}
+	NETend();
 
 	// If we can not find the template ask for the entire droid instead
 	if (!pT)
@@ -434,26 +434,24 @@ BOOL recvDroid(NETMSG * m)
 	}
 
 	// If the power to build the droid has been calculated
-	if(m->body[13] != 0)
+	if (power
+	// Use the power required to build the droid
+	 && !usePower(player, pT->powerPoints))
 	{
-		// Use the power required to build the droid
-		if (!usePower(player,pT->powerPoints))
-		{
-			debug(LOG_NET, "Not enough power to build recvd droid, player=%u", player);
-			// Build anyway..
-		}
+		debug(LOG_NET, "Not enough power to build recvd droid, player = %hhu", player);
+		// Build anyway..
 	}
 
 	// Create that droid on this machine.
 	turnOffMultiMsg(TRUE);
-	d = buildDroid(pT, x, y, player, FALSE);
+	psDroid = buildDroid(pT, pos.x, pos.y, player, FALSE);
 	turnOffMultiMsg(FALSE);
 
 	// If we were able to build the droid set it up
-	if (d)
+	if (psDroid)
 	{
-		d->id = id;
-		addDroid(d, apsDroidLists);
+		psDroid->id = id;
+		addDroid(psDroid, apsDroidLists);
 	}
 	else
 	{
diff --git a/src/multiplay.c b/src/multiplay.c
index e0b57ee9c..e3d49205c 100644
--- a/src/multiplay.c
+++ b/src/multiplay.c
@@ -634,7 +634,7 @@ BOOL recvMessage(void)
 				recvAudioMsg(&msg);
 				break;
 			case NET_DROID:						// new droid of known type
-				recvDroid(&msg);
+				recvDroid();
 				break;
 			case NET_DROIDINFO:					//droid update info
 				recvDroidInfo(&msg);
diff --git a/src/multiplay.h b/src/multiplay.h
index 3b5c14e8d..665ad1fee 100644
--- a/src/multiplay.h
+++ b/src/multiplay.h
@@ -241,7 +241,7 @@ extern BOOL sendLasSat			(UBYTE player, STRUCTURE *psStruct, BASE_OBJECT *psObj)
 
 
 // droids . multibot
-extern BOOL SendDroid			(DROID_TEMPLATE *pTemplate, UDWORD x, UDWORD y, UBYTE player, UDWORD id);
+extern BOOL SendDroid			(const DROID_TEMPLATE* pTemplate, uint32_t x, uint32_t y, uint8_t player, uint32_t id);
 extern BOOL SendDestroyDroid	(const DROID* psDroid);
 extern BOOL SendDemolishFinished(STRUCTURE *psS,DROID *psD);
 extern BOOL SendDroidInfo		(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWORD y, BASE_OBJECT *psObj);
diff --git a/src/multirecv.h b/src/multirecv.h
index 5b2563d25..99cd91c62 100644
--- a/src/multirecv.h
+++ b/src/multirecv.h
@@ -26,7 +26,7 @@
  * to avoid a load of warnings
  */
 
-extern BOOL recvDroid				(NETMSG *pMsg);
+extern BOOL recvDroid				(void);
 extern BOOL recvDroidInfo			(NETMSG *pMsg);
 extern BOOL recvDestroyDroid		(void);
 extern BOOL recvGroupOrder			(NETMSG *pMsg);