mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-25 05:31:00 +00:00
- Fixed: If a player has the NOSKIN flag set, do not change their appearance to that of the
skin when spawning or changing the skin. SVN r3560 (trunk)
This commit is contained in:
parent
66a1b8be9d
commit
c0bc7532ac
2 changed files with 7 additions and 3 deletions
|
@ -765,6 +765,7 @@ void D_ReadUserInfoStrings (int i, BYTE **stream, bool update)
|
|||
if (players[i].mo != NULL)
|
||||
{
|
||||
if (players[i].cls != NULL &&
|
||||
!(players[i].mo->flags4 & MF4_NOSKIN) &&
|
||||
players[i].mo->state->sprite ==
|
||||
GetDefaultByType (players[i].cls)->SpawnState->sprite)
|
||||
{ // Only change the sprite if the player is using a standard one
|
||||
|
|
|
@ -4098,9 +4098,12 @@ APlayerPawn *P_SpawnPlayer (FMapThing *mthing, bool tempplayer)
|
|||
mobj->id = playernum;
|
||||
|
||||
// [RH] Set player sprite based on skin
|
||||
mobj->sprite = skins[p->userinfo.skin].sprite;
|
||||
mobj->scaleX = skins[p->userinfo.skin].ScaleX;
|
||||
mobj->scaleY = skins[p->userinfo.skin].ScaleY;
|
||||
if (!(mobj->flags4 & MF4_NOSKIN))
|
||||
{
|
||||
mobj->sprite = skins[p->userinfo.skin].sprite;
|
||||
mobj->scaleX = skins[p->userinfo.skin].ScaleX;
|
||||
mobj->scaleY = skins[p->userinfo.skin].ScaleY;
|
||||
}
|
||||
|
||||
p->DesiredFOV = p->FOV = 90.f;
|
||||
p->camera = p->mo;
|
||||
|
|
Loading…
Reference in a new issue