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

Browse source
This commit is contained in:
Daveo 2001-05-01 12:20:47 +00:00
parent bf6d4300c4
commit 17a78fdd73
2 changed files with 21 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
source/level/level.cpp
View file

@ -135,12 +135,6 @@ sLvlTab *lvlTab=&LvlTable[LevelNo];
LevelHdr->VtxList=(sVtx*) MakePtr(LevelHdr,(int)LevelHdr->VtxList); LevelHdr->VtxList=(sVtx*) MakePtr(LevelHdr,(int)LevelHdr->VtxList);
LevelHdr->ModelList=(sModel*) MakePtr(LevelHdr,(int)LevelHdr->ModelList); LevelHdr->ModelList=(sModel*) MakePtr(LevelHdr,(int)LevelHdr->ModelList);
printf("ActorList %i\n",(int)LevelHdr->ActorList);
printf("ItemList %i\n",(int)LevelHdr->ItemList);
printf("Platfrom List %i\n",(int)LevelHdr->PlatformList);
printf("TriggerList %i\n",(int)LevelHdr->TriggerList);
printf("FXList %i\n",(int)LevelHdr->FXList);
CModelGfx::SetData(LevelHdr->ModelList,LevelHdr->TriList,LevelHdr->QuadList,LevelHdr->VtxList); CModelGfx::SetData(LevelHdr->ModelList,LevelHdr->TriList,LevelHdr->QuadList,LevelHdr->VtxList);
m_levelTPage=TPLoadTex(lvlTab->TexFilename); m_levelTPage=TPLoadTex(lvlTab->TexFilename);
@ -201,6 +195,7 @@ void CLevel::initLayers()
ItemList=0; ItemList=0;
PlatformList=0; PlatformList=0;
FXList=0; FXList=0;
HazardList=0;
// Back // Back
if (LevelHdr->BackLayer) if (LevelHdr->BackLayer)
@ -322,6 +317,20 @@ PAUL_DBGMSG("%d triggers",TriggerCount);
FXCount=Hdr->Count; FXCount=Hdr->Count;
FXList=(sThingFX*)MakePtr(Hdr,sizeof(sThingHdr)); FXList=(sThingFX*)MakePtr(Hdr,sizeof(sThingHdr));
} }
// Hazards
if (LevelHdr->HazardList)
{
sThingHdr *Hdr=(sThingHdr*)MakePtr(LevelHdr,LevelHdr->HazardList);
HazardCount=Hdr->Count;
HazardList=(sThingHazard**)MemAlloc(HazardCount*sizeof(sThingHazard**),"Hazard List");
u8 *ThingPtr=(u8*)MakePtr(Hdr,sizeof(sThingHdr));
for (int i=0; i<HazardCount; i++)
{
HazardList[i]=(sThingHazard*)ThingPtr;
ThingPtr+=sizeof(sThingHazard);
ThingPtr+=HazardList[i]->PointCount*sizeof(u16)*2;
}
}
} }
@ -348,6 +357,7 @@ void CLevel::shutdown()
if (ActorList) MemFree(ActorList); if (ActorList) MemFree(ActorList);
if (PlatformList) MemFree(PlatformList); if (PlatformList) MemFree(PlatformList);
if (HazardList) MemFree(HazardList);
MemFree(LevelHdr); MemFree(LevelHdr);
CActorPool::Reset(); CActorPool::Reset();

5
source/level/level.h
View file

@ -38,6 +38,9 @@ public:
sThingActor **getActorList() {return ActorList;} sThingActor **getActorList() {return ActorList;}
int getPlatformCount() {return PlatformCount;} int getPlatformCount() {return PlatformCount;}
sThingPlatform **getPlatformList() {return PlatformList;} sThingPlatform **getPlatformList() {return PlatformList;}
int getHazardCount() {return HazardCount;}
sThingHazard **getHazardList() {return HazardList;}
CLayerCollision *getCollisionLayer() {return CollisionLayer;} CLayerCollision *getCollisionLayer() {return CollisionLayer;}
DVECTOR getMapSize(); DVECTOR getMapSize();
@ -70,6 +73,8 @@ private:
sThingTrigger *TriggerList; sThingTrigger *TriggerList;
int FXCount; int FXCount;
sThingFX *FXList; sThingFX *FXList;
int HazardCount;
sThingHazard **HazardList;
}; };