Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Move the send/recv-HappyVtol functions over to the new net primitives API (patch #905 by myself) 

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3243 4a71c877-e1ca-e34f-864e-861f7616d084
master
Giel van Schijndel 2007-12-30 17:13:23 +00:00
parent 6d19aa6473
commit 05d14b995a
4 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/multibot.c
View File

@ -68,37 +68,44 @@ static void ProcessDroidOrder(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWOR
// ////////////////////////////////////////////////////////////////////////////
// vtol bits.
// happy vtol = vtol ready to go back to attack.
BOOL sendHappyVtol(DROID *psDroid)
BOOL sendHappyVtol(const DROID* psDroid)
{
NETMSG m;
if (!myResponsibility(psDroid->player))
{
return FALSE;
}
NetAdd(m,0,psDroid->player);
NetAdd(m,1,psDroid->id);
m.size =5;
m.type =NET_VTOL;
NETbeginEncode(NET_VTOL, NET_ALL_PLAYERS);
{
uint8_t player = psDroid->player;
uint32_t droid = psDroid->id;
return NETbcast(&m,FALSE);
NETuint8_t(&player);
NETuint32_t(&droid);
}
return NETend();
}
BOOL recvHappyVtol(NETMSG *pMsg)
BOOL recvHappyVtol()
{
DROID *pD;
UBYTE player;
UDWORD id;
int i;
DROID* pD;
unsigned int i;
NetGet(pMsg,0,player);
NetGet(pMsg,1,id);
if (!IdToDroid(id,player,&pD)) //find droid.
NETbeginDecode();
{
return FALSE;
uint8_t player;
uint32_t droid;
NETuint8_t(&player);
NETuint32_t(&droid);
if (!IdToDroid(droid, player, &pD))
{
NETend();
return FALSE;
}
}
NETend();
// Rearming also repairs VTOLs
pD->body = pD->originalBody;
@ -113,7 +120,6 @@ BOOL recvHappyVtol(NETMSG *pMsg)
return TRUE;
}
// ////////////////////////////////////////////////////////////////////////////
// Secondary Orders.

2
src/multiplay.c
View File

@ -703,7 +703,7 @@ BOOL recvMessage(void)
recvScoreSubmission();
break;
case NET_VTOL:
recvHappyVtol(&msg);
recvHappyVtol();
break;
case NET_LASSAT:
recvLasSat();

2
src/multiplay.h
View File

@ -257,7 +257,7 @@ extern BOOL sendDroidSecondaryAll(const DROID* psDroid);
extern BOOL sendDroidEmbark (const DROID* psDroid);
extern BOOL sendDroidDisEmbark (const DROID* psDroid);
extern BOOL sendDestroyExtra (BASE_OBJECT *psKilled,BASE_OBJECT *psKiller);
extern BOOL sendHappyVtol (DROID *psDroid);
extern BOOL sendHappyVtol (const DROID* psDroid);
// Startup. mulitopt
extern BOOL multiTemplateSetup (void);

2
src/multirecv.h
View File

@ -61,7 +61,7 @@ extern void sendOptions (UDWORD dest, UDWORD play);
extern BOOL recvScoreSubmission ();
extern BOOL recvDestroyExtra (NETMSG *pMsg);
extern BOOL recvAudioMsg (NETMSG *pMsg);
extern BOOL recvHappyVtol (NETMSG *pMsg);
extern BOOL recvHappyVtol (void);
extern BOOL recvResearchStatus (NETMSG *pMsg);
extern BOOL recvLasSat ();
extern BOOL recvMapFileData (NETMSG *pMsg);