mirror of
https://github.com/ZDoom/qzdoom.git
synced 2025-02-07 08:21:04 +00:00
Merge branch 'master' of https://github.com/rheit/zdoom
This commit is contained in:
commit
a915c934b5
3 changed files with 12 additions and 1 deletions
|
@ -1018,6 +1018,7 @@ CCMD (playerinfo)
|
||||||
if (!playeringame[i])
|
if (!playeringame[i])
|
||||||
{
|
{
|
||||||
Printf(TEXTCOLOR_ORANGE "Player %d is not in the game\n", i);
|
Printf(TEXTCOLOR_ORANGE "Player %d is not in the game\n", i);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Print special info
|
// Print special info
|
||||||
|
|
|
@ -608,6 +608,11 @@ void R_ProjectSprite (AActor *thing, int fakeside, F3DFloor *fakefloor, F3DFloor
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (spritescaleX < 0)
|
||||||
|
{
|
||||||
|
spritescaleX = -spritescaleX;
|
||||||
|
flip = !flip;
|
||||||
|
}
|
||||||
if (voxel == NULL && (tex == NULL || tex->UseType == FTexture::TEX_Null))
|
if (voxel == NULL && (tex == NULL || tex->UseType == FTexture::TEX_Null))
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
|
|
|
@ -776,8 +776,13 @@ void FTextureManager::ParseAnimatedDoor(FScanner &sc)
|
||||||
{
|
{
|
||||||
sc.ScriptError ("Unknown texture %s", sc.String);
|
sc.ScriptError ("Unknown texture %s", sc.String);
|
||||||
}
|
}
|
||||||
frames.Push (v);
|
|
||||||
}
|
}
|
||||||
|
frames.Push(v);
|
||||||
|
if (!sc.CheckString("allowdecals"))
|
||||||
|
{
|
||||||
|
Texture(v)->bNoDecals = true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in a new issue