Permalink
Browse files

Merge branch 'master' of https://github.com/coelckers/gzdoom

  • Loading branch information...
coelckers committed Jan 9, 2019
2 parents 0180bcb + 32cf79c commit cf967b36ffe0abb3da6da99a408a76c4d2d88373
Showing with 5 additions and 6 deletions.
  1. +1 −1 src/p_lnspec.cpp
  2. +2 −2 src/p_xlat.cpp
  3. +1 −2 src/portal.cpp
  4. +1 −1 src/portal.h
@@ -3403,7 +3403,7 @@ FUNC(LS_Thing_SetConversation)
FUNC(LS_Line_SetPortalTarget)
// Line_SetPortalTarget(thisid, destid)
{
return P_ChangePortal(ln, arg0, arg1);
return P_ChangePortal(Level, ln, arg0, arg1);
}

FUNC(LS_Sector_SetPlaneReflection)
@@ -62,7 +62,6 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld, int lineindexforid)
short tag = mld->tag;
uint32_t flags =mld->flags;
INTBOOL passthrough = 0;
auto Level = ld->GetLevel();

uint32_t flags1 = flags;
uint32_t newflags = 0;
@@ -103,6 +102,7 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld, int lineindexforid)
// line also needs to have its ID set to the same as its tag.
// An external conversion program would need to do this more
// intelligently.
auto Level = ld->GetLevel();
Level->tagManager.AddLineID(lineindexforid, tag);
}

@@ -499,4 +499,4 @@ const int* (*XlatExprEval[XEXP_COUNT])(int *dest, const int *xnode, FXlatExprSta
Expr_Or,
Expr_Xor,
Expr_Neg
};
};
@@ -485,11 +485,10 @@ static bool ChangePortalLine(line_t *line, int destid)
//
//============================================================================

bool P_ChangePortal(line_t *ln, int thisid, int destid)
bool P_ChangePortal(FLevelLocals *Level, line_t *ln, int thisid, int destid)
{
int lineno;

auto Level = ln->GetLevel();
if (thisid == 0) return ChangePortalLine(ln, destid);
FLineIdIterator it(Level->tagManager, thisid);
bool res = false;
@@ -265,7 +265,7 @@ struct FSectorPortalGroup

void P_SpawnLinePortal(line_t* line);
void P_FinalizePortals(FLevelLocals *Level);
bool P_ChangePortal(line_t *ln, int thisid, int destid);
bool P_ChangePortal(FLevelLocals *Level, line_t *ln, int thisid, int destid);
void P_CreateLinkedPortals(FLevelLocals *Level);
bool P_CollectConnectedGroups(FLevelLocals *Level, int startgroup, const DVector3 &position, double upperz, double checkradius, FPortalGroupArray &out);
void P_CollectLinkedPortals(FLevelLocals *Level);

0 comments on commit cf967b3

Please sign in to comment.