zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-26 14:01:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #521 from alexey-lysiuk/fix_corpse_scale

Browse source 
Scale of player's skin is now preserved on corpses after reborn
This commit is contained in:
coelckers 2016-01-30 17:37:19 +01:00
commit d826ef8be1
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/g_game.cpp
View file

@ -1631,6 +1631,18 @@ static void G_QueueBody (AActor *body)
translationtables[TRANSLATION_PlayerCorpses][modslot]->UpdateNative();
}
const int skinidx = body->player->userinfo.GetSkin();
if (0 != skinidx && !(body->flags4 & MF4_NOSKIN))
{
// Apply skin's scale to actor's scale, it will be lost otherwise
const AActor *const defaultActor = body->GetDefault();
const FPlayerSkin &skin = skins[skinidx];
body->scaleX = Scale(body->scaleX, skin.ScaleX, defaultActor->scaleX);
body->scaleY = Scale(body->scaleY, skin.ScaleY, defaultActor->scaleY);
}
bodyqueslot++;
}