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-13 18:43:39 +00:00
parent 7f5ce48617
commit 7a0e068054
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/game/healthman.cpp
View file

@ -156,8 +156,10 @@ sItem *item=ItemList;
void CHealthManager::think(int frames) void CHealthManager::think(int frames)
{ {
sItem *item=ItemList; sItem *item=ItemList;
int mapHeight;
CLayerCollision *ColLayer=CGameScene::getCollision(); CLayerCollision *ColLayer=CGameScene::getCollision();
mapHeight=GameScene.GetLevel().getMapSize().vy*16;
for (int i=0; i<ITEM_MAX; i++) for (int i=0; i<ITEM_MAX; i++)
{ {
@ -176,7 +178,8 @@ sItem *item=ItemList;
// if (item->Vel.vy>0) // if (item->Vel.vy>0)
{ {
int DistY = ColLayer->getHeightFromGround( item->ScrPos.vx, item->ScrPos.vy, 16 ); int DistY = ColLayer->getHeightFromGround( item->ScrPos.vx, item->ScrPos.vy, 16 );
if (DistY<=0) int newBlock=ColLayer->getCollisionBlock(item->ScrPos.vx,item->ScrPos.vy)&COLLISION_TYPE_MASK;
if (DistY<=0&&newBlock!=COLLISION_TYPE_FLAG_DEATH_FALL )
{ {
if (item->Vel.vy<0) if (item->Vel.vy<0)
{ {
@ -186,6 +189,11 @@ sItem *item=ItemList;
item->Vel.vx>>=1; item->Vel.vx>>=1;
// item->Pos.vy-=DistY<<(HealthManShift-1); // item->Pos.vy-=DistY<<(HealthManShift-1);
} }
if(item->ScrPos.vy>mapHeight)
{
item->Life=0;
}
} }
int XOfs; int XOfs;