zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-02-07 16:31:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'zmaster'

Browse source
This commit is contained in:
Christoph Oelckers 2016-03-13 02:32:41 +01:00
commit 8b4f4d06ad
4 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/p_maputl.cpp
View file

@ -833,6 +833,7 @@ bool FMultiBlockLinesIterator::Next(FMultiBlockLinesIterator::CheckResult *item)
} }
if (onlast) if (onlast)
{ {
cursector = startsector;
// We reached the end of the list. Check if we still need to check up- and downwards. // We reached the end of the list. Check if we still need to check up- and downwards.
if (GoUp(checkpoint.x, checkpoint.y) || if (GoUp(checkpoint.x, checkpoint.y) ||
GoDown(checkpoint.x, checkpoint.y)) GoDown(checkpoint.x, checkpoint.y))

3
src/portal.cpp
View file

@ -244,6 +244,8 @@ static line_t *FindDestination(line_t *src, int tag)
//============================================================================ //============================================================================
static void SetRotation(FLinePortal *port) static void SetRotation(FLinePortal *port)
{
if (port != NULL && port->mDestination != NULL)
{ {
line_t *dst = port->mDestination; line_t *dst = port->mDestination;
line_t *line = port->mOrigin; line_t *line = port->mOrigin;
@ -252,6 +254,7 @@ static void SetRotation(FLinePortal *port)
port->mCosRot = FLOAT2FIXED(cos(angle)); port->mCosRot = FLOAT2FIXED(cos(angle));
port->mAngleDiff = RAD2ANGLE(angle); port->mAngleDiff = RAD2ANGLE(angle);
} }
}
//============================================================================ //============================================================================
// //

2
src/textures/multipatchtexture.cpp
View file

@ -1023,7 +1023,7 @@ void FMultiPatchTexture::ParsePatch(FScanner &sc, TexPart & part, bool silent, i
} }
if (part.Texture == NULL) if (part.Texture == NULL)
{ {
if (!silent) Printf(TEXTCOLOR_RED "Unknown patch '%s' in texture '%s'\n", sc.String, Name.GetChars()); if (!silent) sc.ScriptMessage(TEXTCOLOR_RED "Unknown patch '%s' in texture '%s'\n", sc.String, Name.GetChars());
} }
sc.MustGetStringName(","); sc.MustGetStringName(",");
sc.MustGetNumber(); sc.MustGetNumber();

1
src/zscript/zcc-parse.lemon
View file

@ -262,6 +262,7 @@ struct_body(X) ::= struct_member(A) struct_body(B). { X = A; A->AppendSibling(B
struct_member(X) ::= declarator_no_fun(A). { X = A; } struct_member(X) ::= declarator_no_fun(A). { X = A; }
struct_member(X) ::= enum_def(A). { X = A; } struct_member(X) ::= enum_def(A). { X = A; }
struct_member(X) ::= const_def(A). { X = A; }
/*----- Constant Definition ------*/ /*----- Constant Definition ------*/
/* Like UnrealScript, a constant's type is implied by its value's type. */ /* Like UnrealScript, a constant's type is implied by its value's type. */