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

Browse source
This commit is contained in:
Charles 2001-06-14 21:27:25 +00:00
parent 100e11e98b
commit 1e03a74618
7 changed files with 76 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

22
source/hazard/hazard.cpp
View file

@ -123,6 +123,14 @@
#include "hazard\hbrock.h"
#endif
#ifndef __HAZARD_HSRDFISH_H__
#include "hazard\hsrdfish.h"
#endif
#ifndef __HAZARD_HLOG_H__
#include "hazard\hlog.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -151,6 +159,8 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
NPC_INERT_HAZARD,
NPC_CONVEYOR_SWITCH_HAZARD,
NPC_BOUNCING_ROCK_HAZARD,
NPC_SWORDFISH_HAZARD,
NPC_LOG_HAZARD,
};
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -301,6 +311,18 @@ CNpcHazard *hazard;
break;
}
case NPC_SWORDFISH_HAZARD:
{
hazard = new ("swordfish hazard") CNpcSwordfishHazard;
break;
}
case NPC_LOG_HAZARD:
{
hazard = new ("log hazard") CNpcLogHazard;
break;
}
default:
{
hazard = NULL;

2
source/hazard/hazard.h
View file

@ -62,6 +62,8 @@ public:
NPC_INERT_HAZARD,
NPC_CONVEYOR_SWITCH_HAZARD,
NPC_BOUNCING_ROCK_HAZARD,
NPC_SWORDFISH_HAZARD,
NPC_LOG_HAZARD,
NPC_HAZARD_TYPE_MAX,
};

10
source/hazard/hfirebal.cpp
View file

@ -68,6 +68,16 @@ void CNpcFireballHazard::setWaypoints( sThingHazard *ThisHazard )
m_width = maxX - minX;
m_npcPath.getPathYExtents( &minY, &maxY );
m_height = maxY - minY;
if ( ThisHazard->PointCount > 1 )
{
newXPos = (u16) *PntList;
if ( ( ( newXPos << 4 ) + 8 ) < startPos.vx )
{
m_width = -m_width;
}
}
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////