Merge branch 'master' of github.com:diasurgical/devilution

This commit is contained in:
Anders Jenbo 2020-03-29 23:40:05 +02:00
commit 776ab10476
116 changed files with 1840 additions and 1285 deletions

View file

@ -1,3 +1,8 @@
/**
* @file multi.cpp
*
* Implementation of functions for keeping multiplaye games in sync.
*/
#include "all.h"
#include "../3rdParty/Storm/Source/storm.h"
#include "../DiabloUI/diabloui.h"
@ -237,7 +242,7 @@ void multi_player_left_msg(int pnum, int left)
RemovePlrFromMap(pnum);
RemovePortalMissile(pnum);
DeactivatePortal(pnum);
RemovePlrPortal(pnum);
delta_close_portal(pnum);
RemovePlrMissiles(pnum);
if (left) {
pszFmt = "Player '%s' just left the game";
@ -404,7 +409,7 @@ void multi_process_network_packets()
multi_clear_left_tbl();
multi_process_tmsgs();
while (SNetReceiveMessage((int *)&dwID, &data, (int *)&dwMsgSize)) {
pkt_counter++;
dwRecCount++;
multi_clear_left_tbl();
pkt = (TPktHdr *)data;
if (dwMsgSize < sizeof(TPktHdr))