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-08-17 18:54:26 +00:00
parent 08e187289a
commit 28ed71d254
4 changed files with 69 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
source/player/player.cpp
View file

@ -3158,10 +3158,9 @@ void CPlayer::setPlayerCollisionSize(int _x,int _y,int _w,int _h)
setCollisionSize(_w,_h);
setCollisionCentreOffset(_x,_y);
}
void CPlayer::getPlayerCollisionSize(int *_x,int *_y,int *_w,int *_h)
{
// DVECTOR offset,size;
DVECTOR const &offset=getCollisionCentreOffset();
DVECTOR const &size=getCollisionSize();
@ -3171,5 +3170,13 @@ DVECTOR const &size=getCollisionSize();
*_h=size.vy;
}
void CPlayer::getPlayerNormalCollisionSize(int *_x,int *_y,int *_w,int *_h)
{
*_x=0;
*_y=-COLSIZE_BASE_HEIGHT/2;
*_w=COLSIZE_BASE_WIDTH;
*_h=COLSIZE_BASE_HEIGHT;
}
/*===========================================================================
end */

1
source/player/player.h
View file

@ -491,6 +491,7 @@ public:
void resetPlayerCollisionSizeToBase();
void setPlayerCollisionSize(int _x,int _y,int _w,int _h);
void getPlayerCollisionSize(int *_x,int *_y,int *_w,int *_h);
void getPlayerNormalCollisionSize(int *_x,int *_y,int *_w,int *_h);

25
source/triggers/tsecret.cpp
View file

@ -22,6 +22,10 @@
#include "sound\sound.h"
#endif
#ifndef __PLAYER_PLAYER_H__
#include "player\player.h"
#endif
/* Std Lib
------- */
@ -58,9 +62,30 @@ void CSecretAreaTrigger::collidedWith(CThing *_thisThing)
{
case TYPE_PLAYER:
{
// SB *might* be chopping to hit this trigger, so we only do the collision
// if he would normally hit it.
int x,y,w,h;
DVECTOR pos;
CRECT thisRect;
CRECT const &thatRect=getCollisionArea();
int collided=true;
((CPlayer*)_thisThing)->getPlayerNormalCollisionSize(&x,&y,&w,&h);
pos=_thisThing->getPos();
thisRect.x1=pos.vx+x-(w/2);
thisRect.y1=pos.vy+y-(h/2);
thisRect.x2=thisRect.x1+w;
thisRect.y2=thisRect.y1+h;
if (thisRect.x2<thatRect.x1 || thisRect.x1>thatRect.x2) collided=false;
if (thisRect.y2<thatRect.y1 || thisRect.y1>thatRect.y2) collided=false;
if(collided)
{
// Ok.. so we've actually hit the thing properly :)
CSoundMediator::playSfx(CSoundMediator::SFX_SECRET_AREA);
shutdown();
delete this;
}
break;
}

21
source/triggers/tteleprt.cpp
View file

@ -73,6 +73,26 @@ void CTeleportTrigger::collidedWith(CThing *_thisThing)
{
case TYPE_PLAYER:
{
// SB *might* be chopping to hit this trigger, so we only do the collision
// if he would normally hit it.
int x,y,w,h;
DVECTOR pos;
CRECT thisRect;
CRECT const &thatRect=getCollisionArea();
int collided=true;
((CPlayer*)_thisThing)->getPlayerNormalCollisionSize(&x,&y,&w,&h);
pos=_thisThing->getPos();
thisRect.x1=pos.vx+x-(w/2);
thisRect.y1=pos.vy+y-(h/2);
thisRect.x2=thisRect.x1+w;
thisRect.y2=thisRect.y1+h;
if (thisRect.x2<thatRect.x1 || thisRect.x1>thatRect.x2) collided=false;
if (thisRect.y2<thatRect.y1 || thisRect.y1>thatRect.y2) collided=false;
if(collided)
{
// Ok.. so we've actually hit the thing properly :)
if ( chapter == 5 && level == 5 )
{
if ( !CNpcGaryFriend::hasReachedDoor() )
@ -89,6 +109,7 @@ void CTeleportTrigger::collidedWith(CThing *_thisThing)
((CPlayer*)_thisThing)->clearPlatform();
((CPlayer*)_thisThing)->teleportTo(m_boxX1+8,m_boxY1+16);
}
}
break;
}