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

- moved several setup methods into the map loader

Browse source 
Code hasn't been moved yet, this only changes the declarations.
This commit is contained in:
Christoph Oelckers 2019-01-24 00:22:18 +01:00
parent ac7a9183aa
commit 85b5f8d0a0
8 changed files with 81 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/maploader/maploader.cpp
View file

@ -3206,7 +3206,7 @@ void MapLoader::LoadLevel(MapData *map, const char *lumpname, int position)
} }
// set up world state // set up world state
P_SpawnSpecials(this); SpawnSpecials();
// disable reflective planes on sloped sectors. // disable reflective planes on sloped sectors.
for (auto &sec : Level->sectors) for (auto &sec : Level->sectors)

20
src/maploader/maploader.h
View file

@ -1,6 +1,7 @@
#pragma once #pragma once
#include "nodebuild.h" #include "nodebuild.h"
#include "p_spec.h"
struct EDMapthing struct EDMapthing
{ {
@ -170,7 +171,24 @@ private:
void FixHoles(); void FixHoles();
void ReportUnpairedMinisegs(); void ReportUnpairedMinisegs();
void CalcIndices(); void CalcIndices();
// Specials
void SpawnSpecials();
void InitSectorSpecial(sector_t *sector, int special);
void SpawnLights(sector_t *sector);
void CreateScroller(EScroll type, double dx, double dy, sector_t *affectee, int accel, EScrollPos scrollpos = EScrollPos::scw_all);
void SpawnScrollers();
void SpawnFriction();
void SpawnPushers();
AActor *GetPushThing (int s);
void SpawnPortal(line_t *line, int sectortag, int plane, int bytealpha, int linked);
void CopyPortal(int sectortag, int plane, unsigned pnum, double alpha, bool tolines);
void SetPortal(sector_t *sector, int plane, unsigned pnum, double alpha);
void SetupPortals();
void SpawnSkybox(AActor *origin);
void SetupFloorPortal (AActor *point);
void SetupCeilingPortal (AActor *point);
void SetTexture(side_t *side, int position, const char *name, FMissingTextureTracker &track); void SetTexture(side_t *side, int position, const char *name, FMissingTextureTracker &track);
void SetTexture(sector_t *sector, int index, int position, const char *name, FMissingTextureTracker &track, bool truncate); void SetTexture(sector_t *sector, int index, int position, const char *name, FMissingTextureTracker &track, bool truncate);
void SetTexture(side_t *side, int position, uint32_t *blend, const char *name); void SetTexture(side_t *side, int position, uint32_t *blend, const char *name);

4
src/maploader/udmf.cpp
View file

@ -2285,12 +2285,12 @@ public:
const double scrollfactor = 1 / 3.2; // I hope this is correct, it's just a guess taken from Eternity's code. const double scrollfactor = 1 / 3.2; // I hope this is correct, it's just a guess taken from Eternity's code.
if (scroll.type == NAME_Both || scroll.type == NAME_Visual) if (scroll.type == NAME_Both || scroll.type == NAME_Visual)
{ {
P_CreateScroller(scroll.ceiling ? EScroll::sc_ceiling : EScroll::sc_floor, scroll.x * scrollfactor, scroll.y * scrollfactor, &Level->sectors[scroll.index], 0); loader->CreateScroller(scroll.ceiling ? EScroll::sc_ceiling : EScroll::sc_floor, scroll.x * scrollfactor, scroll.y * scrollfactor, &Level->sectors[scroll.index], 0);
} }
if (scroll.type == NAME_Both || scroll.type == NAME_Physical) if (scroll.type == NAME_Both || scroll.type == NAME_Physical)
{ {
// sc_carry_ceiling doesn't do anything yet. // sc_carry_ceiling doesn't do anything yet.
P_CreateScroller(scroll.ceiling ? EScroll::sc_carry_ceiling : EScroll::sc_carry, scroll.x * scrollfactor, scroll.y * scrollfactor, &Level->sectors[scroll.index], 0); loader->CreateScroller(scroll.ceiling ? EScroll::sc_carry_ceiling : EScroll::sc_carry, scroll.x * scrollfactor, scroll.y * scrollfactor, &Level->sectors[scroll.index], 0);
} }
} }

3
src/p_lights.cpp
View file

@ -37,6 +37,7 @@
#include "doomstat.h" #include "doomstat.h"
#include "p_maputl.h" #include "p_maputl.h"
#include "g_levellocals.h" #include "g_levellocals.h"
#include "maploader/maploader.h"
// State. // State.
#include "serializer.h" #include "serializer.h"
@ -997,7 +998,7 @@ void EV_StopLightEffect (int tag)
} }
void P_SpawnLights(sector_t *sector) void MapLoader::SpawnLights(sector_t *sector)
{ {
switch (sector->special) switch (sector->special)
{ {

13
src/p_pusher.cpp
View file

@ -36,6 +36,7 @@
#include "d_player.h" #include "d_player.h"
#include "g_levellocals.h" #include "g_levellocals.h"
#include "actorinlines.h" #include "actorinlines.h"
#include "maploader/maploader.h"
CVAR(Bool, var_pushers, true, CVAR_SERVERINFO); CVAR(Bool, var_pushers, true, CVAR_SERVERINFO);
@ -338,12 +339,12 @@ void DPusher::Tick ()
// P_GetPushThing() returns a pointer to an MT_PUSH or MT_PULL thing, // P_GetPushThing() returns a pointer to an MT_PUSH or MT_PULL thing,
// NULL otherwise. // NULL otherwise.
AActor *P_GetPushThing (int s) AActor *MapLoader::GetPushThing (int s)
{ {
AActor* thing; AActor* thing;
sector_t* sec; sector_t* sec;
sec = &level.sectors[s]; sec = &Level->sectors[s];
thing = sec->thinglist; thing = sec->thinglist;
while (thing && while (thing &&
@ -360,12 +361,12 @@ AActor *P_GetPushThing (int s)
// Initialize the sectors where pushers are present // Initialize the sectors where pushers are present
// //
void P_SpawnPushers () void MapLoader::SpawnPushers ()
{ {
line_t *l = &level.lines[0]; line_t *l = &Level->lines[0];
int s; int s;
for (unsigned i = 0; i < level.lines.Size(); i++, l++) for (unsigned i = 0; i < Level->lines.Size(); i++, l++)
{ {
switch (l->special) switch (l->special)
{ {
@ -392,7 +393,7 @@ void P_SpawnPushers ()
FSectorTagIterator itr(l->args[0]); FSectorTagIterator itr(l->args[0]);
while ((s = itr.Next()) >= 0) while ((s = itr.Next()) >= 0)
{ {
AActor *thing = P_GetPushThing (s); AActor *thing = GetPushThing (s);
if (thing) { // No MT_P* means no effect if (thing) { // No MT_P* means no effect
// [RH] Allow narrowing it down by tid // [RH] Allow narrowing it down by tid
if (!l->args[1] || l->args[1] == thing->tid) if (!l->args[1] || l->args[1] == thing->tid)

5
src/p_scroll.cpp
View file

@ -62,6 +62,7 @@
#include "p_lnspec.h" #include "p_lnspec.h"
#include "r_data/r_interpolate.h" #include "r_data/r_interpolate.h"
#include "g_levellocals.h" #include "g_levellocals.h"
#include "maploader/maploader.h"
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
@ -421,7 +422,7 @@ DScroller::DScroller (double dx, double dy, const line_t *l, sector_t * control,
// //
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
void P_SpawnScrollers(FLevelLocals *Level) void MapLoader::SpawnScrollers()
{ {
line_t *l = &Level->lines[0]; line_t *l = &Level->lines[0];
side_t *side; side_t *side;
@ -733,7 +734,7 @@ void SetScroller (FLevelLocals *Level, int tag, EScroll type, double dx, double
} }
} }
void P_CreateScroller(EScroll type, double dx, double dy, sector_t *affectee, int accel, EScrollPos scrollpos) void MapLoader::CreateScroller(EScroll type, double dx, double dy, sector_t *affectee, int accel, EScrollPos scrollpos)
{ {
Create<DScroller>(type, dx, dy, nullptr, affectee, nullptr, accel, scrollpos); Create<DScroller>(type, dx, dy, nullptr, affectee, nullptr, accel, scrollpos);
} }

106
src/p_spec.cpp
View file

@ -104,13 +104,6 @@ static FRandom pr_playerinspecialsector ("PlayerInSpecialSector");
EXTERN_CVAR(Bool, cl_predict_specials) EXTERN_CVAR(Bool, cl_predict_specials)
// killough 3/7/98: Initialize generalized scrolling
void P_SpawnScrollers(FLevelLocals *Level);
static void P_SpawnFriction (FLevelLocals *l); // phares 3/16/98
void P_SpawnPushers (); // phares 3/20/98
// [RH] Check dmflags for noexit and respond accordingly // [RH] Check dmflags for noexit and respond accordingly
bool FLevelLocals::CheckIfExitIsGood (AActor *self, level_info_t *info) bool FLevelLocals::CheckIfExitIsGood (AActor *self, level_info_t *info)
{ {
@ -916,7 +909,7 @@ void DWallLightTransfer::DoTransfer (short lightlevel, int target, uint8_t flags
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
// Upper stacks go in the top sector. Lower stacks go in the bottom sector. // Upper stacks go in the top sector. Lower stacks go in the bottom sector.
static void SetupFloorPortal (AActor *point) void MapLoader::SetupFloorPortal (AActor *point)
{ {
NActorIterator it (NAME_LowerStackLookOnly, point->tid); NActorIterator it (NAME_LowerStackLookOnly, point->tid);
sector_t *Sector = point->Sector; sector_t *Sector = point->Sector;
@ -931,7 +924,7 @@ static void SetupFloorPortal (AActor *point)
} }
} }
static void SetupCeilingPortal (AActor *point) void MapLoader::SetupCeilingPortal (AActor *point)
{ {
NActorIterator it (NAME_UpperStackLookOnly, point->tid); NActorIterator it (NAME_UpperStackLookOnly, point->tid);
sector_t *Sector = point->Sector; sector_t *Sector = point->Sector;
@ -946,7 +939,7 @@ static void SetupCeilingPortal (AActor *point)
} }
} }
void P_SetupPortals(FLevelLocals *Level) void MapLoader::SetupPortals()
{ {
TThinkerIterator<AActor> it("StackPoint"); TThinkerIterator<AActor> it("StackPoint");
AActor *pt; AActor *pt;
@ -992,7 +985,7 @@ void P_SetupPortals(FLevelLocals *Level)
} }
} }
static void SetPortal(FLevelLocals *Level, sector_t *sector, int plane, unsigned pnum, double alpha) void MapLoader::SetPortal(sector_t *sector, int plane, unsigned pnum, double alpha)
{ {
// plane: 0=floor, 1=ceiling, 2=both // plane: 0=floor, 1=ceiling, 2=both
if (plane > 0) if (plane > 0)
@ -1021,13 +1014,13 @@ static void SetPortal(FLevelLocals *Level, sector_t *sector, int plane, unsigned
} }
} }
static void CopyPortal(FLevelLocals *Level, int sectortag, int plane, unsigned pnum, double alpha, bool tolines) void MapLoader::CopyPortal(int sectortag, int plane, unsigned pnum, double alpha, bool tolines)
{ {
int s; int s;
FSectorTagIterator itr(sectortag); FSectorTagIterator itr(sectortag);
while ((s = itr.Next()) >= 0) while ((s = itr.Next()) >= 0)
{ {
SetPortal(Level, &Level->sectors[s], plane, pnum, alpha); SetPortal(&Level->sectors[s], plane, pnum, alpha);
} }
for (auto &line : Level->lines) for (auto &line : Level->lines)
@ -1041,14 +1034,14 @@ static void CopyPortal(FLevelLocals *Level, int sectortag, int plane, unsigned p
{ {
if (line.args[0] == 0) if (line.args[0] == 0)
{ {
SetPortal(Level, line.frontsector, plane, pnum, alpha); SetPortal(line.frontsector, plane, pnum, alpha);
} }
else else
{ {
FSectorTagIterator itr(line.args[0]); FSectorTagIterator itr(line.args[0]);
while ((s = itr.Next()) >= 0) while ((s = itr.Next()) >= 0)
{ {
SetPortal(Level, &Level->sectors[s], plane, pnum, alpha); SetPortal(&Level->sectors[s], plane, pnum, alpha);
} }
} }
} }
@ -1073,7 +1066,7 @@ static void CopyPortal(FLevelLocals *Level, int sectortag, int plane, unsigned p
} }
void P_SpawnPortal(FLevelLocals *Level, line_t *line, int sectortag, int plane, int bytealpha, int linked) void MapLoader::SpawnPortal(line_t *line, int sectortag, int plane, int bytealpha, int linked)
{ {
if (plane < 0 || plane > 2 || (linked && plane == 2)) return; if (plane < 0 || plane > 2 || (linked && plane == 2)) return;
for (auto &oline : Level->lines) for (auto &oline : Level->lines)
@ -1090,7 +1083,7 @@ void P_SpawnPortal(FLevelLocals *Level, line_t *line, int sectortag, int plane,
DVector2 pos1 = line->v1->fPos() + line->Delta() / 2; DVector2 pos1 = line->v1->fPos() + line->Delta() / 2;
DVector2 pos2 = oline.v1->fPos() + oline.Delta() / 2; DVector2 pos2 = oline.v1->fPos() + oline.Delta() / 2;
unsigned pnum = P_GetPortal(linked ? PORTS_LINKEDPORTAL : PORTS_PORTAL, plane, line->frontsector, oline.frontsector, pos2 - pos1); unsigned pnum = P_GetPortal(linked ? PORTS_LINKEDPORTAL : PORTS_PORTAL, plane, line->frontsector, oline.frontsector, pos2 - pos1);
CopyPortal(Level, sectortag, plane, pnum, bytealpha / 255., false); CopyPortal(sectortag, plane, pnum, bytealpha / 255., false);
return; return;
} }
} }
@ -1098,7 +1091,7 @@ void P_SpawnPortal(FLevelLocals *Level, line_t *line, int sectortag, int plane,
// This searches the viewpoint's sector // This searches the viewpoint's sector
// for a skybox line special, gets its tag and transfers the skybox to all tagged sectors. // for a skybox line special, gets its tag and transfers the skybox to all tagged sectors.
void P_SpawnSkybox(FLevelLocals *Level, AActor *origin) void MapLoader::SpawnSkybox(AActor *origin)
{ {
sector_t *Sector = origin->Sector; sector_t *Sector = origin->Sector;
if (Sector == NULL) if (Sector == NULL)
@ -1114,7 +1107,7 @@ void P_SpawnSkybox(FLevelLocals *Level, AActor *origin)
{ {
// We found the setup linedef for this skybox, so let's use it for our init. // We found the setup linedef for this skybox, so let's use it for our init.
unsigned pnum = P_GetSkyboxPortal(origin); unsigned pnum = P_GetSkyboxPortal(origin);
CopyPortal(Level, refline->args[0], refline->args[2], pnum, 0, true); CopyPortal(refline->args[0], refline->args[2], pnum, 0, true);
return; return;
} }
} }
@ -1129,7 +1122,7 @@ void P_SpawnSkybox(FLevelLocals *Level, AActor *origin)
// Sets damage properties for one sector. Allows combination of original specials with explicit use of the damage properties // Sets damage properties for one sector. Allows combination of original specials with explicit use of the damage properties
// //
static void P_SetupSectorDamage(sector_t *sector, int damage, int interval, int leakchance, FName type, int flags) static void SetupSectorDamage(sector_t *sector, int damage, int interval, int leakchance, FName type, int flags)
{ {
// Only set if damage is not yet initialized. This ensures that UDMF takes precedence over sector specials. // Only set if damage is not yet initialized. This ensures that UDMF takes precedence over sector specials.
if (sector->damageamount == 0) if (sector->damageamount == 0)
@ -1148,9 +1141,8 @@ static void P_SetupSectorDamage(sector_t *sector, int damage, int interval, int
// Sets up everything derived from 'sector->special' for one sector // Sets up everything derived from 'sector->special' for one sector
// ('fromload' is necessary to allow conversion upon savegame load.) // ('fromload' is necessary to allow conversion upon savegame load.)
// //
void P_SpawnLights(sector_t *sector);
void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special) void MapLoader::InitSectorSpecial(sector_t *sector, int special)
{ {
// [RH] All secret sectors are marked with a BOOM-ish bitfield // [RH] All secret sectors are marked with a BOOM-ish bitfield
if (sector->special & SECRET_MASK) if (sector->special & SECRET_MASK)
@ -1168,33 +1160,33 @@ void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special)
} }
if ((sector->special & DAMAGE_MASK) == 0x100) if ((sector->special & DAMAGE_MASK) == 0x100)
{ {
P_SetupSectorDamage(sector, 5, 32, 0, NAME_Fire, 0); SetupSectorDamage(sector, 5, 32, 0, NAME_Fire, 0);
} }
else if ((sector->special & DAMAGE_MASK) == 0x200) else if ((sector->special & DAMAGE_MASK) == 0x200)
{ {
P_SetupSectorDamage(sector, 10, 32, 0, NAME_Slime, 0); SetupSectorDamage(sector, 10, 32, 0, NAME_Slime, 0);
} }
else if ((sector->special & DAMAGE_MASK) == 0x300) else if ((sector->special & DAMAGE_MASK) == 0x300)
{ {
P_SetupSectorDamage(sector, 20, 32, 5, NAME_Slime, 0); SetupSectorDamage(sector, 20, 32, 5, NAME_Slime, 0);
} }
sector->special &= 0xff; sector->special &= 0xff;
// [RH] Normal DOOM special or BOOM specialized? // [RH] Normal DOOM special or BOOM specialized?
bool keepspecial = false; bool keepspecial = false;
P_SpawnLights(sector); SpawnLights(sector);
switch (sector->special) switch (sector->special)
{ {
case dLight_Strobe_Hurt: case dLight_Strobe_Hurt:
P_SetupSectorDamage(sector, 20, 32, 5, NAME_Slime, 0); SetupSectorDamage(sector, 20, 32, 5, NAME_Slime, 0);
break; break;
case dDamage_Hellslime: case dDamage_Hellslime:
P_SetupSectorDamage(sector, 10, 32, 0, NAME_Slime, 0); SetupSectorDamage(sector, 10, 32, 0, NAME_Slime, 0);
break; break;
case dDamage_Nukage: case dDamage_Nukage:
P_SetupSectorDamage(sector, 5, 32, 0, NAME_Slime, 0); SetupSectorDamage(sector, 5, 32, 0, NAME_Slime, 0);
break; break;
case dSector_DoorCloseIn30: case dSector_DoorCloseIn30:
@ -1202,7 +1194,7 @@ void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special)
break; break;
case dDamage_End: case dDamage_End:
P_SetupSectorDamage(sector, 20, 32, 256, NAME_None, SECF_ENDGODMODE|SECF_ENDLEVEL); SetupSectorDamage(sector, 20, 32, 256, NAME_None, SECF_ENDGODMODE|SECF_ENDLEVEL);
break; break;
case dSector_DoorRaiseIn5Mins: case dSector_DoorRaiseIn5Mins:
@ -1216,42 +1208,42 @@ void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special)
break; break;
case dDamage_SuperHellslime: case dDamage_SuperHellslime:
P_SetupSectorDamage(sector, 20, 32, 5, NAME_Slime, 0); SetupSectorDamage(sector, 20, 32, 5, NAME_Slime, 0);
break; break;
case dDamage_LavaWimpy: case dDamage_LavaWimpy:
P_SetupSectorDamage(sector, 5, 16, 256, NAME_Fire, SECF_DMGTERRAINFX); SetupSectorDamage(sector, 5, 16, 256, NAME_Fire, SECF_DMGTERRAINFX);
break; break;
case dDamage_LavaHefty: case dDamage_LavaHefty:
P_SetupSectorDamage(sector, 8, 16, 256, NAME_Fire, SECF_DMGTERRAINFX); SetupSectorDamage(sector, 8, 16, 256, NAME_Fire, SECF_DMGTERRAINFX);
break; break;
case dScroll_EastLavaDamage: case dScroll_EastLavaDamage:
P_SetupSectorDamage(sector, 5, 16, 256, NAME_Fire, SECF_DMGTERRAINFX); SetupSectorDamage(sector, 5, 16, 256, NAME_Fire, SECF_DMGTERRAINFX);
P_CreateScroller(EScroll::sc_floor, -4., 0, sector, 0); CreateScroller(EScroll::sc_floor, -4., 0, sector, 0);
keepspecial = true; keepspecial = true;
break; break;
case hDamage_Sludge: case hDamage_Sludge:
P_SetupSectorDamage(sector, 4, 32, 0, NAME_Slime, 0); SetupSectorDamage(sector, 4, 32, 0, NAME_Slime, 0);
break; break;
case sLight_Strobe_Hurt: case sLight_Strobe_Hurt:
P_SetupSectorDamage(sector, 5, 32, 0, NAME_Slime, 0); SetupSectorDamage(sector, 5, 32, 0, NAME_Slime, 0);
break; break;
case sDamage_Hellslime: case sDamage_Hellslime:
P_SetupSectorDamage(sector, 2, 32, 0, NAME_Slime, SECF_HAZARD); SetupSectorDamage(sector, 2, 32, 0, NAME_Slime, SECF_HAZARD);
break; break;
case Damage_InstantDeath: case Damage_InstantDeath:
// Strife's instant death sector // Strife's instant death sector
P_SetupSectorDamage(sector, TELEFRAG_DAMAGE, 1, 256, NAME_InstantDeath, 0); SetupSectorDamage(sector, TELEFRAG_DAMAGE, 1, 256, NAME_InstantDeath, 0);
break; break;
case sDamage_SuperHellslime: case sDamage_SuperHellslime:
P_SetupSectorDamage(sector, 4, 32, 0, NAME_Slime, SECF_HAZARD); SetupSectorDamage(sector, 4, 32, 0, NAME_Slime, SECF_HAZARD);
break; break;
case Sector_Hidden: case Sector_Hidden:
@ -1260,7 +1252,7 @@ void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special)
case Sector_Heal: case Sector_Heal:
// CoD's healing sector // CoD's healing sector
P_SetupSectorDamage(sector, -1, 32, 0, NAME_None, 0); SetupSectorDamage(sector, -1, 32, 0, NAME_None, 0);
break; break;
case Sky2: case Sky2:
@ -1286,13 +1278,13 @@ void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special)
int i = sector->special - Scroll_North_Slow; int i = sector->special - Scroll_North_Slow;
double dx = hexenScrollies[i][0] / 2.; double dx = hexenScrollies[i][0] / 2.;
double dy = hexenScrollies[i][1] / 2.; double dy = hexenScrollies[i][1] / 2.;
P_CreateScroller(EScroll::sc_floor, dx, dy, sector, 0); CreateScroller(EScroll::sc_floor, dx, dy, sector, 0);
} }
else if (sector->special >= Carry_East5 && sector->special <= Carry_East35) else if (sector->special >= Carry_East5 && sector->special <= Carry_East35)
{ {
// Heretic scroll special // Heretic scroll special
// Only east scrollers also scroll the texture // Only east scrollers also scroll the texture
P_CreateScroller(EScroll::sc_floor, -0.5 * (1 << ((sector->special & 0xff) - Carry_East5)), 0, sector, 0); CreateScroller(EScroll::sc_floor, -0.5 * (1 << ((sector->special & 0xff) - Carry_East5)), 0, sector, 0);
} }
keepspecial = true; keepspecial = true;
break; break;
@ -1306,35 +1298,31 @@ void P_InitSectorSpecial(FLevelLocals *Level, sector_t *sector, int special)
// After the map has been loaded, scan for specials that spawn thinkers // After the map has been loaded, scan for specials that spawn thinkers
// //
void P_SpawnSpecials (MapLoader *ml) void MapLoader::SpawnSpecials ()
{ {
auto Level = ml->Level; SetupPortals();
P_SetupPortals(Level);
for (auto &sec : Level->sectors) for (auto &sec : Level->sectors)
{ {
if (sec.special == 0) if (sec.special == 0)
continue; continue;
P_InitSectorSpecial(Level, &sec, sec.special); InitSectorSpecial(&sec, sec.special);
} }
#ifndef NO_EDATA ProcessEDSectors();
ml->ProcessEDSectors();
#endif
// Init other misc stuff // Init other misc stuff
P_SpawnScrollers(Level); // killough 3/7/98: Add generalized scrollers SpawnScrollers(); // killough 3/7/98: Add generalized scrollers
P_SpawnFriction(Level); // phares 3/12/98: New friction model using linedefs SpawnFriction(); // phares 3/12/98: New friction model using linedefs
P_SpawnPushers(); // phares 3/20/98: New pusher model using linedefs SpawnPushers(); // phares 3/20/98: New pusher model using linedefs
TThinkerIterator<AActor> it2("SkyCamCompat"); TThinkerIterator<AActor> it2("SkyCamCompat");
AActor *pt2; AActor *pt2;
while ((pt2 = it2.Next())) while ((pt2 = it2.Next()))
{ {
P_SpawnSkybox(Level, pt2); SpawnSkybox(pt2);
} }
for (auto &line : Level->lines) for (auto &line : Level->lines)
@ -1431,12 +1419,12 @@ void P_SpawnSpecials (MapLoader *ml)
// arg 4 = for the anchor only: alpha // arg 4 = for the anchor only: alpha
if ((line.args[1] == 0 || line.args[1] == 6) && line.args[3] == 0) if ((line.args[1] == 0 || line.args[1] == 6) && line.args[3] == 0)
{ {
P_SpawnPortal(Level, &line, line.args[0], line.args[2], line.args[4], line.args[1]); SpawnPortal(&line, line.args[0], line.args[2], line.args[4], line.args[1]);
} }
else if (line.args[1] == 3 || line.args[1] == 4) else if (line.args[1] == 3 || line.args[1] == 4)
{ {
unsigned pnum = P_GetPortal(line.args[1] == 3 ? PORTS_PLANE : PORTS_HORIZON, line.args[2], line.frontsector, NULL, { 0,0 }); unsigned pnum = P_GetPortal(line.args[1] == 3 ? PORTS_PLANE : PORTS_HORIZON, line.args[2], line.frontsector, NULL, { 0,0 });
CopyPortal(Level, line.args[0], line.args[2], pnum, 0, true); CopyPortal(line.args[0], line.args[2], pnum, 0, true);
} }
break; break;
@ -1514,7 +1502,7 @@ void P_SpawnSpecials (MapLoader *ml)
} }
} }
// [RH] Start running any open scripts on this map // [RH] Start running any open scripts on this map
level.Behaviors.StartTypedScripts (SCRIPT_Open, NULL, false); Level->Behaviors.StartTypedScripts (SCRIPT_Open, NULL, false);
} }
//////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////
@ -1570,7 +1558,7 @@ void P_SpawnSpecials (MapLoader *ml)
// //
// Initialize the sectors where friction is increased or decreased // Initialize the sectors where friction is increased or decreased
static void P_SpawnFriction(FLevelLocals *Level) void MapLoader::SpawnFriction()
{ {
line_t *l = &Level->lines[0]; line_t *l = &Level->lines[0];

3
src/p_spec.h
View file

@ -63,7 +63,6 @@ enum EScrollPos : int
scw_all = 7, scw_all = 7,
}; };
void P_CreateScroller(EScroll type, double dx, double dy, sector_t *affectee, int accel, EScrollPos scrollpos = EScrollPos::scw_all);
//jff 2/23/98 identify the special classes that can share sectors //jff 2/23/98 identify the special classes that can share sectors
@ -88,8 +87,6 @@ const double CARRYFACTOR = 3 / 32.;
class MapLoader; class MapLoader;
// at map load
void P_SpawnSpecials (MapLoader *ml);
// every tic // every tic
void P_UpdateSpecials (FLevelLocals *); void P_UpdateSpecials (FLevelLocals *);