TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Add special handling for multi_do_reappear get_ghost_id

Browse source 
multi_do_reappear is overloaded to be used both on ghosts and on live
players.  This causes a diagnostic because the *_id checks expect
exactly one type: either test for ghost or test for player, but not test
for and accept both.  Open code the type check to support both.
This commit is contained in:
Kp 2016-10-15 21:17:02 +00:00
parent e4e74fe09c
commit 779738fa80
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
similar/main/multi.cpp
View file

@ -1728,8 +1728,19 @@ static void multi_do_reappear(const playernum_t pnum, const ubyte *buf)
{
const objnum_t objnum = GET_INTEL_SHORT(buf + 2);
const auto obj = vobjptridx(objnum);
if (pnum != get_ghost_id(obj))
auto &obj = *vcobjptr(objnum);
if (obj.type != OBJ_PLAYER && obj.type != OBJ_GHOST)
{
con_printf(CON_URGENT, "%s:%u: BUG: object %hu has type %u, expected %u or %u", __FILE__, __LINE__, objnum, obj.type, OBJ_PLAYER, OBJ_GHOST);
return;
}
/* Override macro, call only the getter.
*
* This message is overloaded to be used on both players and ghosts,
* so the standard check cannot be used. Instead, the correct check
* is open-coded above.
*/
if (pnum != (get_player_id)(obj))
return;
multi_make_ghost_player(pnum);