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

newnet: When droids are taken over, don't send droid count, since droid count isn't read, making the message unparsable. Take over droids before waiting for the message (which makes the message redundant, anyway).

master
Cyp 2010-02-27 11:12:56 +01:00
parent 94a555329a
commit 70d4c5fc92
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/structure.c
View File

@ -6421,13 +6421,13 @@ BOOL electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer)
}
}
// TODO: Should either do it directly (if everyone else knows to do the same), or tell the world, but not both.
//(void)giftSingleDroid(psDroid, attackPlayer);
giftSingleDroid(psDroid, attackPlayer);
// tell the world!
// If the world is in synch, the world already knows, though.
if (bMultiMessages)
{
uint8_t giftType = DROID_GIFT, droid_count = 1;
uint8_t giftType = DROID_GIFT;
NETbeginEncode(NETgameQueue(selectedPlayer), GAME_GIFT);
{
@ -6439,9 +6439,7 @@ BOOL electronicDamage(BASE_OBJECT *psTarget, UDWORD damage, UBYTE attackPlayer)
NETuint8_t(&psDroid->player);
NETuint8_t(&attackPlayer);
// the amount of droids (1 in this case)
// followed by the droid's ID
NETuint8_t(&droid_count);
NETuint32_t(&psDroid->id);
}
NETend();