This commit is contained in:
parent
921bdbac48
commit
e8d9b4ed68
3 changed files with 23 additions and 2 deletions
|
@ -229,7 +229,8 @@ thing_src := thing
|
||||||
|
|
||||||
triggers_src := tlevexit \
|
triggers_src := tlevexit \
|
||||||
tlook \
|
tlook \
|
||||||
trestart
|
trestart \
|
||||||
|
tteleprt
|
||||||
|
|
||||||
utils_src := utils \
|
utils_src := utils \
|
||||||
sincos \
|
sincos \
|
||||||
|
|
|
@ -27,6 +27,10 @@
|
||||||
#include "triggers\trestart.h"
|
#include "triggers\trestart.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __TRIGGERS_TTELEPRT_H__
|
||||||
|
#include "triggers\tteleprt.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
#ifndef __PICKUPS_PICKUP_H__
|
#ifndef __PICKUPS_PICKUP_H__
|
||||||
#include "pickups\pickup.h"
|
#include "pickups\pickup.h"
|
||||||
#endif
|
#endif
|
||||||
|
@ -288,7 +292,6 @@ void CLevel::initLayers()
|
||||||
TriggerCount=Hdr->Count;
|
TriggerCount=Hdr->Count;
|
||||||
TriggerList=(sThingTrigger*)MakePtr(Hdr,sizeof(sThingHdr));
|
TriggerList=(sThingTrigger*)MakePtr(Hdr,sizeof(sThingHdr));
|
||||||
|
|
||||||
PAUL_DBGMSG("%d triggers",TriggerCount);
|
|
||||||
for(int i=0;i<TriggerCount;i++)
|
for(int i=0;i<TriggerCount;i++)
|
||||||
{
|
{
|
||||||
CTriggerThing *trigger=NULL; // I hate having to do this just to keep the compiler quiet :/ (pkg)
|
CTriggerThing *trigger=NULL; // I hate having to do this just to keep the compiler quiet :/ (pkg)
|
||||||
|
@ -303,6 +306,11 @@ PAUL_DBGMSG("%d triggers",TriggerCount);
|
||||||
case 1:
|
case 1:
|
||||||
trigger=(CRestartPointTrigger*)new ("RestartTrigger") CRestartPointTrigger();
|
trigger=(CRestartPointTrigger*)new ("RestartTrigger") CRestartPointTrigger();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
// Teleport trigger
|
||||||
|
case 2:
|
||||||
|
trigger=(CTeleportTrigger*)new ("TeleportTrigger") CTeleportTrigger();
|
||||||
|
break;
|
||||||
}
|
}
|
||||||
trigger->init();
|
trigger->init();
|
||||||
trigger->setPositionAndSize(TriggerList->Pos.X<<4,TriggerList->Pos.Y<<4,
|
trigger->setPositionAndSize(TriggerList->Pos.X<<4,TriggerList->Pos.Y<<4,
|
||||||
|
|
|
@ -637,6 +637,10 @@ SOURCE=..\..\..\source\gfx\font.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\gfx\otpos.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\gfx\prim.cpp
|
SOURCE=..\..\..\source\gfx\prim.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
@ -1567,6 +1571,14 @@ SOURCE=..\..\..\source\triggers\trestart.cpp
|
||||||
|
|
||||||
SOURCE=..\..\..\source\triggers\trestart.h
|
SOURCE=..\..\..\source\triggers\trestart.h
|
||||||
# End Source File
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\triggers\tteleprt.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\triggers\tteleprt.h
|
||||||
|
# End Source File
|
||||||
# End Group
|
# End Group
|
||||||
# Begin Group "utils"
|
# Begin Group "utils"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue