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

newnet: Remove GAME_VTOL, the VTOLs are happy without it.

master
Cyp 2010-02-26 14:18:03 +01:00
parent e2067f4470
commit f4bd5e257a
7 changed files with 1 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/netplay/netplay.c
View File

@ -4040,7 +4040,6 @@ const char *messageTypeToString(unsigned messageType_)
case GAME_ALLIANCE: return "GAME_ALLIANCE";
case GAME_GIFT: return "GAME_GIFT";
case GAME_ARTIFACTS: return "GAME_ARTIFACTS";
case GAME_VTOL: return "GAME_VTOL";
case GAME_DROIDEMBARK: return "GAME_DROIDEMBARK";
case GAME_DROIDDISEMBARK: return "GAME_DROIDDISEMBARK";
case GAME_RESEARCHSTATUS: return "GAME_RESEARCHSTATUS";

1
lib/netplay/netplay.h
View File

@ -98,7 +98,6 @@ typedef enum
GAME_ALLIANCE, ///< alliance data.
GAME_GIFT, ///< a luvly gift between players.
GAME_ARTIFACTS, ///< artifacts randomly placed.
GAME_VTOL, ///< vtol rearmed
GAME_DROIDEMBARK, ///< droid embarked on a Transporter
GAME_DROIDDISEMBARK, ///< droid disembarked from a Transporter
GAME_RESEARCHSTATUS, ///< research state.

58
src/multibot.c
View File

@ -60,64 +60,6 @@ static void ProcessDroidOrder(DROID *psDroid, DROID_ORDER order, UDWORD x, UDWOR
// sod em.
// ////////////////////////////////////////////////////////////////////////////
// vtol bits.
// happy vtol = vtol ready to go back to attack.
BOOL sendHappyVtol(const DROID* psDroid)
{
if (!bMultiMessages)
return true;
if (!myResponsibility(psDroid->player))
{
return false;
}
NETbeginEncode(NETgameQueue(selectedPlayer), GAME_VTOL);
{
uint8_t player = psDroid->player;
uint32_t droid = psDroid->id;
NETuint8_t(&player);
NETuint32_t(&droid);
}
return NETend();
}
BOOL recvHappyVtol(NETQUEUE queue)
{
DROID* pD;
unsigned int i;
NETbeginDecode(queue, GAME_VTOL);
{
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;
for (i = 0; i < pD->numWeaps; i++)
{
pD->sMove.iAttackRuns[i] = 0; // finish it for next time round.
pD->asWeaps[i].ammo = asWeaponStats[pD->asWeaps[i].nStat].numRounds;
pD->asWeaps[i].lastFired = 0;
}
return true;
}
// ////////////////////////////////////////////////////////////////////////////
// Secondary Orders.

5
src/multiplay.c
View File

@ -614,7 +614,7 @@ BOOL recvMessage(void)
case GAME_DROIDDISEMBARK:
//case GAME_GIFT: //32 down, 10 to go
//case NET_SCORESUBMIT:
case GAME_VTOL:
//case GAME_VTOL: //37 down, 5 to go. <--- Removed completely, the VTOLs are happy without them.
case GAME_LASSAT:
case GAME_TEMPLATE:
@ -711,9 +711,6 @@ BOOL recvMessage(void)
case GAME_GIFT: // an alliance gift from one player to another.
recvGift(queue);
break;
case GAME_VTOL:
recvHappyVtol(queue);
break;
case GAME_LASSAT:
recvLasSat(queue);
break;

1
src/multiplay.h
View File

@ -189,7 +189,6 @@ extern BOOL SendGroupOrderGroup(const DROID_GROUP* psGroup, DROID_ORDER order, u
extern BOOL sendDroidSecondary (const DROID* psDroid, SECONDARY_ORDER sec, SECONDARY_STATE state);
extern BOOL sendDroidEmbark (const DROID* psDroid, const DROID* psTransporter);
extern BOOL sendDroidDisEmbark (const DROID* psDroid, const DROID* psTransporter);
extern BOOL sendHappyVtol (const DROID* psDroid);
// Startup. mulitopt
extern BOOL multiTemplateSetup (void);

1
src/multirecv.h
View File

@ -58,7 +58,6 @@ extern BOOL recvPositionRequest (NETQUEUE queue);
extern void recvOptions (NETQUEUE queue);
extern void sendOptions (void);
extern BOOL recvHappyVtol (NETQUEUE queue);
extern BOOL recvResearchStatus (NETQUEUE queue);
extern BOOL recvLasSat (NETQUEUE queue);
extern void recvStructureInfo (NETQUEUE queue);

5
src/structure.c
View File

@ -3782,11 +3782,6 @@ static void aiUpdateStructure(STRUCTURE *psStructure, bool mission)
//check for fully armed and fully repaired
if (vtolHappy(psDroid))
{
if( bMultiMessages)
{
sendHappyVtol(psDroid);
}
//clear the rearm pad
psDroid->action = DACTION_NONE;
bFinishAction = true;