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

Browse source
This commit is contained in:
Paul 2001-07-26 20:00:55 +00:00
parent f1fe0ed2da
commit cf9a66a91e
11 changed files with 55 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/triggers/tlook.cpp
View file

@ -68,7 +68,7 @@ void CLookTrigger::collidedWith(CThing *_thisThing)
collArea.y2=collArea.y1+10;
if(checkCollisionAgainstArea(&collArea))
{
((CPlayer*)_thisThing)->setLedgeLookAhead(+4);
((CPlayer*)_thisThing)->setLedgeLookAhead(m_val0);
}
break;

19
source/triggers/trigger.cpp
View file

@ -163,6 +163,10 @@
#include "triggers\tspeech.h"
#endif
#ifndef __TRIGGERS_TLOOK_H__
#include "triggers\tlook.h"
#endif
#ifndef __GAME_GAME_H__
#include "game\game.h"
#endif
@ -427,6 +431,10 @@ CTrigger *trigger;
break;
}
case TRIGGER_CAMERAYPOSITIONTRIGGER:
trigger = (CLookTrigger*)new("LookTrigger") CLookTrigger();
break;
default:
trigger=NULL;
}
@ -445,6 +453,7 @@ CTrigger *trigger=Create(ThisTrigger->Type);
trigger->setPositionAndSize(ThisTrigger->Pos.X<<4,ThisTrigger->Pos.Y<<4,ThisTrigger->Width<<4,ThisTrigger->Height<<4);
trigger->setTargetBox(ThisTrigger->TargetPos.X<<4,ThisTrigger->TargetPos.Y<<4,ThisTrigger->TargetSize.X<<4,ThisTrigger->TargetSize.Y<<4);
trigger->setVal(ThisTrigger->Val0);
switch( ThisTrigger->Type )
{
@ -520,4 +529,14 @@ void CTrigger::setTargetBox(int _x,int _y,int _w,int _h)
m_boxY2=_y+_h;
}
/*----------------------------------------------------------------------
Function:
Purpose:
Params:
Returns:
---------------------------------------------------------------------- */
void CTrigger::setVal(int _val)
{
m_val0=_val;
}

3
source/triggers/trigger.h
View file

@ -67,6 +67,7 @@ enum TRIGGER_TYPE
TRIGGER_SPEECH_FIRST_BUBBLE,
TRIGGER_SPEECH_USE_BUBBLE,
TRIGGER_SPEECH_WEIGHT,
TRIGGER_CAMERAYPOSITIONTRIGGER,
// Code based triggers
TRIGGER_PLATFORM,
@ -90,11 +91,13 @@ static CTrigger *Create(int Type);
static CTrigger *Create(sThingTrigger *ThisTrigger);
virtual void setPositionAndSize(int _x,int _y,int _w,int _h);
virtual void setTargetBox(int _x,int _y,int _w,int _h);
void setVal(int _val);
protected:
virtual void collidedWith(CThing *_thisThing){};
int m_boxX1,m_boxY1,m_boxX2,m_boxY2;
int m_val0;
};