zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-05-23 20:24:33 +00:00
parent 99a968af65
commit bcd9f36085
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
source/level/level.cpp
View file

@ -191,7 +191,7 @@ bool CLevel::GetNextLevel(int &Lvl)
bool Finished=false; bool Finished=false;
Lvl++; Lvl++;
if (Lvl>=LvlTableSize) if (Lvl>=LvlTableSize)
{ {
Lvl=0; Lvl=0;
Finished=true; Finished=true;
@ -253,7 +253,7 @@ void CLevel::initLayers()
HazardList=0; HazardList=0;
// Back // Back
if (LevelHdr->BackLayer) if (LevelHdr->BackLayer)
{ {
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->BackLayer); sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->BackLayer);
CLayerTile *NewLayer=new ("Back Layer") CLayerBack(LevelHdr,Layer); CLayerTile *NewLayer=new ("Back Layer") CLayerBack(LevelHdr,Layer);
@ -262,7 +262,7 @@ void CLevel::initLayers()
} }
// Mid // Mid
if (LevelHdr->MidLayer) if (LevelHdr->MidLayer)
{ {
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->MidLayer); sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->MidLayer);
CLayerTile *NewLayer=new ("Mid Layer") CLayerTile(LevelHdr,Layer); CLayerTile *NewLayer=new ("Mid Layer") CLayerTile(LevelHdr,Layer);
@ -271,7 +271,7 @@ void CLevel::initLayers()
} }
// Action // Action
if (LevelHdr->ActionLayer) if (LevelHdr->ActionLayer)
{ {
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->ActionLayer); sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->ActionLayer);
CLayerTile *NewLayer=new ("Action Layer") CLayerTile3d(LevelHdr,Layer); CLayerTile *NewLayer=new ("Action Layer") CLayerTile3d(LevelHdr,Layer);
@ -280,7 +280,7 @@ void CLevel::initLayers()
} }
// Collision // Collision
if (LevelHdr->CollisionLayer) if (LevelHdr->CollisionLayer)
{ {
sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->CollisionLayer); sLayerHdr *Layer=(sLayerHdr*)MakePtr(LevelHdr,LevelHdr->CollisionLayer);
CollisionLayer=new ("Collision Layer") CLayerCollision(Layer); CollisionLayer=new ("Collision Layer") CLayerCollision(Layer);
@ -307,7 +307,7 @@ void CLevel::initLayers()
// Platforms // Platforms
if (LevelHdr->PlatformList) if (LevelHdr->PlatformList)
{ {
sThingHdr *Hdr=(sThingHdr*)MakePtr(LevelHdr,LevelHdr->PlatformList); sThingHdr *Hdr=(sThingHdr*)MakePtr(LevelHdr,LevelHdr->PlatformList);
PlatformCount=Hdr->Count; PlatformCount=Hdr->Count;
PlatformList=(sThingPlatform**)MemAlloc(PlatformCount*sizeof(sThingPlatform**),"Platform List"); PlatformList=(sThingPlatform**)MemAlloc(PlatformCount*sizeof(sThingPlatform**),"Platform List");
@ -438,7 +438,7 @@ void CLevel::initThings(int _respawningLevel)
int createThisPickup; int createThisPickup;
int isSpat; int isSpat;
CBasePickup *newPickup; CBasePickup *newPickup;
createThisPickup=true; createThisPickup=true;
isSpat=(PICKUP_TYPE)ItemList->Type==PICKUP__SPATULA; isSpat=(PICKUP_TYPE)ItemList->Type==PICKUP__SPATULA;
@ -554,6 +554,7 @@ void CLevel::initThings(int _respawningLevel)
CJellyfishGenerator::init(); CJellyfishGenerator::init();
CThingManager::initAllThings(); CThingManager::initAllThings();
CThingManager::matchWheelsAndWeights();
} }
@ -583,7 +584,7 @@ void CLevel::shutdown()
if (CollisionLayer) if (CollisionLayer)
{ {
CollisionLayer->shutdown(); CollisionLayer->shutdown();
delete CollisionLayer; delete CollisionLayer;
} }
@ -675,7 +676,7 @@ const int ColT=COLLISION_TYPE_DESTRUCTABLE;
while (CollisionLayer->getCollisionBlock(BR.vx,BR.vy+16)>>COLLISION_TYPE_FLAG_SHIFT==ColT) BR.vy+=16; while (CollisionLayer->getCollisionBlock(BR.vx,BR.vy+16)>>COLLISION_TYPE_FLAG_SHIFT==ColT) BR.vy+=16;
DVECTOR DP; DVECTOR DP;
for (DP.vy=TL.vy; DP.vy<=BR.vy; DP.vy+=16) for (DP.vy=TL.vy; DP.vy<=BR.vy; DP.vy+=16)
{ {
for (DP.vx=TL.vx; DP.vx<=BR.vx; DP.vx+=16) for (DP.vx=TL.vx; DP.vx<=BR.vx; DP.vx+=16)
@ -712,4 +713,3 @@ sTileMapElem *MapElem=TileLayers[CLayerTile::LAYER_TILE_TYPE_ACTION]->getMapPtr(
} }
} }