zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-11-11 23:32:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source
This commit is contained in:
Gaerzi 2014-04-15 20:38:13 +02:00
commit 017c919f39
3 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/p_mobj.cpp
View file

@ -4795,10 +4795,7 @@ AActor *P_SpawnMapThing (FMapThing *mthing, int position)
// Set various UDMF options // Set various UDMF options
if (mthing->alpha != -1) if (mthing->alpha != -1)
{
DPrintf("Setting alpha to %f", FIXED2FLOAT(mthing->alpha));
mobj->alpha = mthing->alpha; mobj->alpha = mthing->alpha;
}
if (mthing->RenderStyle != STYLE_Count) if (mthing->RenderStyle != STYLE_Count)
mobj->RenderStyle = (ERenderStyle)mthing->RenderStyle; mobj->RenderStyle = (ERenderStyle)mthing->RenderStyle;
if (mthing->scaleX) if (mthing->scaleX)

7
src/p_setup.cpp
View file

@ -1764,6 +1764,9 @@ void P_LoadThings (MapData * map)
mti[i].Conversation = 0; mti[i].Conversation = 0;
mti[i].SkillFilter = MakeSkill(flags); 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].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; flags &= ~MTF_SKILLMASK;
mti[i].flags = (short)((flags & 0xf) | 0x7e0); mti[i].flags = (short)((flags & 0xf) | 0x7e0);
if (gameinfo.gametype == GAME_Strife) if (gameinfo.gametype == GAME_Strife)
@ -1837,6 +1840,10 @@ void P_LoadThings2 (MapData * map)
mti[i].flags &= ~(MTF_SKILLMASK|MTF_CLASS_MASK); mti[i].flags &= ~(MTF_SKILLMASK|MTF_CLASS_MASK);
mti[i].Conversation = 0; mti[i].Conversation = 0;
mti[i].gravity = FRACUNIT; 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; delete[] mtp;
} }

2
wadsrc/static/xlat/defines.i
View file

@ -240,5 +240,5 @@ enum
// //
ML_PASSTHROUGH = -1, ML_PASSTHROUGH = -1,
ML_TRANSLUCENT = -2, ML_TRANSLUCENT = -2,
ML_TRANSPARENT = -3, ML_TRANSPARENT = -3
} }