zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-24 13:01:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

- ensure that AInventory::Touch attributes everything to the correct player, even if the touching action results in a morph.

Browse source
This commit is contained in:
Christoph Oelckers 2016-01-27 00:56:40 +01:00
parent 8993f84087
commit d2beec4585
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/g_shared/a_pickups.cpp
View file

@ -979,10 +979,12 @@ static void PrintPickupMessage (const char *str)
void AInventory::Touch (AActor *toucher) void AInventory::Touch (AActor *toucher)
{ {
player_t *player = toucher->player;
// If a voodoo doll touches something, pretend the real player touched it instead. // If a voodoo doll touches something, pretend the real player touched it instead.
if (toucher->player != NULL) if (player != NULL)
{ {
toucher = toucher->player->mo; toucher = player->mo;
} }
bool localview = toucher->CheckLocalView(consoleplayer); bool localview = toucher->CheckLocalView(consoleplayer);
@ -1010,12 +1012,12 @@ void AInventory::Touch (AActor *toucher)
// Special check so voodoo dolls picking up items cause the // Special check so voodoo dolls picking up items cause the
// real player to make noise. // real player to make noise.
if (toucher->player != NULL) if (player != NULL)
{ {
PlayPickupSound (toucher->player->mo); PlayPickupSound (player->mo);
if (!(ItemFlags & IF_NOSCREENFLASH)) if (!(ItemFlags & IF_NOSCREENFLASH))
{ {
toucher->player->bonuscount = BONUSADD; player->bonuscount = BONUSADD;
} }
} }
else else
@ -1029,16 +1031,16 @@ void AInventory::Touch (AActor *toucher)
if (flags & MF_COUNTITEM) if (flags & MF_COUNTITEM)
{ {
if (toucher->player != NULL) if (player != NULL)
{ {
toucher->player->itemcount++; player->itemcount++;
} }
level.found_items++; level.found_items++;
} }
if (flags5 & MF5_COUNTSECRET) if (flags5 & MF5_COUNTSECRET)
{ {
P_GiveSecret(toucher, true, true, -1); P_GiveSecret(player != NULL? (AActor*)player->mo : toucher, true, true, -1);
} }
//Added by MC: Check if item taken was the roam destination of any bot //Added by MC: Check if item taken was the roam destination of any bot