zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-30 07:41:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Christoph Oelckers 2019-01-09 16:51:43 +01:00
commit cf967b36ff
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/p_lnspec.cpp
View file

@ -3403,7 +3403,7 @@ FUNC(LS_Thing_SetConversation)
FUNC(LS_Line_SetPortalTarget) FUNC(LS_Line_SetPortalTarget)
// Line_SetPortalTarget(thisid, destid) // Line_SetPortalTarget(thisid, destid)
{ {
return P_ChangePortal(ln, arg0, arg1); return P_ChangePortal(Level, ln, arg0, arg1);
} }
FUNC(LS_Sector_SetPlaneReflection) FUNC(LS_Sector_SetPlaneReflection)

4
src/p_xlat.cpp
View file

@ -62,7 +62,6 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld, int lineindexforid)
short tag = mld->tag; short tag = mld->tag;
uint32_t flags =mld->flags; uint32_t flags =mld->flags;
INTBOOL passthrough = 0; INTBOOL passthrough = 0;
auto Level = ld->GetLevel();
uint32_t flags1 = flags; uint32_t flags1 = flags;
uint32_t newflags = 0; 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. // line also needs to have its ID set to the same as its tag.
// An external conversion program would need to do this more // An external conversion program would need to do this more
// intelligently. // intelligently.
auto Level = ld->GetLevel();
Level->tagManager.AddLineID(lineindexforid, tag); Level->tagManager.AddLineID(lineindexforid, tag);
} }
@ -499,4 +499,4 @@ const int* (*XlatExprEval[XEXP_COUNT])(int *dest, const int *xnode, FXlatExprSta
Expr_Or, Expr_Or,
Expr_Xor, Expr_Xor,
Expr_Neg Expr_Neg
}; };

3
src/portal.cpp
View file

@ -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; int lineno;
auto Level = ln->GetLevel();
if (thisid == 0) return ChangePortalLine(ln, destid); if (thisid == 0) return ChangePortalLine(ln, destid);
FLineIdIterator it(Level->tagManager, thisid); FLineIdIterator it(Level->tagManager, thisid);
bool res = false; bool res = false;

2
src/portal.h
View file

@ -265,7 +265,7 @@ struct FSectorPortalGroup
void P_SpawnLinePortal(line_t* line); void P_SpawnLinePortal(line_t* line);
void P_FinalizePortals(FLevelLocals *Level); 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); void P_CreateLinkedPortals(FLevelLocals *Level);
bool P_CollectConnectedGroups(FLevelLocals *Level, int startgroup, const DVector3 &position, double upperz, double checkradius, FPortalGroupArray &out); bool P_CollectConnectedGroups(FLevelLocals *Level, int startgroup, const DVector3 &position, double upperz, double checkradius, FPortalGroupArray &out);
void P_CollectLinkedPortals(FLevelLocals *Level); void P_CollectLinkedPortals(FLevelLocals *Level);