mirror of
https://github.com/ZDoom/gzdoom-gles.git
synced 2024-11-11 15:22:15 +00:00
Merge branch 'master' of https://github.com/Gaerzi/zdoom
This commit is contained in:
commit
361341e07e
2 changed files with 7 additions and 3 deletions
|
@ -4795,10 +4795,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
|
|||
|
||||
// Set various UDMF options
|
||||
if (mthing->alpha != -1)
|
||||
{
|
||||
DPrintf("Setting alpha to %f", FIXED2FLOAT(mthing->alpha));
|
||||
mobj->alpha = mthing->alpha;
|
||||
}
|
||||
if (mthing->RenderStyle != STYLE_Count)
|
||||
mobj->RenderStyle = (ERenderStyle)mthing->RenderStyle;
|
||||
if (mthing->scaleX)
|
||||
|
|
|
@ -1764,6 +1764,9 @@ void P_LoadThings (MapData * map)
|
|||
mti[i].Conversation = 0;
|
||||
mti[i].SkillFilter = MakeSkill(flags);
|
||||
mti[i].ClassFilter = 0xffff; // Doom map format doesn't have class flags so spawn for all player classes
|
||||
mti[i].RenderStyle = STYLE_Count;
|
||||
mti[i].alpha = -1;
|
||||
mti[i].health = 1;
|
||||
flags &= ~MTF_SKILLMASK;
|
||||
mti[i].flags = (short)((flags & 0xf) | 0x7e0);
|
||||
if (gameinfo.gametype == GAME_Strife)
|
||||
|
@ -1837,6 +1840,10 @@ void P_LoadThings2 (MapData * map)
|
|||
mti[i].flags &= ~(MTF_SKILLMASK|MTF_CLASS_MASK);
|
||||
mti[i].Conversation = 0;
|
||||
mti[i].gravity = FRACUNIT;
|
||||
mti[i].RenderStyle = STYLE_Count;
|
||||
mti[i].alpha = -1;
|
||||
mti[i].health = 1;
|
||||
mti[i].fillcolor = mti[i].scaleX = mti[i].scaleY = mti[i].score = 0;
|
||||
}
|
||||
delete[] mtp;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue