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

Browse source
This commit is contained in:
Daveo 2001-05-29 19:19:14 +00:00
parent 8b49a6d3a5
commit 6839a20427
2 changed files with 14 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
source/hazard/hazard.cpp
View file

@ -140,11 +140,9 @@ CNpcHazard::NPC_HAZARD_UNIT_TYPE CNpcHazard::mapEditConvertTable[NPC_HAZARD_TYPE
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard) CNpcHazard *CNpcHazard::Create(int Type)
{ {
CNpcHazard *hazard; CNpcHazard *hazard;
NPC_HAZARD_UNIT_TYPE Type = getTypeFromMapEdit( ThisHazard->Type );
hazard = (CNpcHazard*)CThingManager::GetThing(CThing::TYPE_HAZARD,Type); hazard = (CNpcHazard*)CThingManager::GetThing(CThing::TYPE_HAZARD,Type);
if (!hazard) if (!hazard)
@ -281,6 +279,17 @@ CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
hazard->setThingSubType(Type); hazard->setThingSubType(Type);
hazard->init(); hazard->init();
return( hazard );
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CNpcHazard *CNpcHazard::Create(sThingHazard *ThisHazard)
{
NPC_HAZARD_UNIT_TYPE Type = getTypeFromMapEdit( ThisHazard->Type );
CNpcHazard *hazard=Create(ThisHazard->Type);
hazard->setWaypoints( ThisHazard ); hazard->setWaypoints( ThisHazard );
hazard->setGraphic( ThisHazard ); hazard->setGraphic( ThisHazard );

1
source/hazard/hazard.h
View file

@ -74,6 +74,7 @@ public:
virtual void setRespawnRate( s16 newRespawnRate ) {m_respawnRate=newRespawnRate;} virtual void setRespawnRate( s16 newRespawnRate ) {m_respawnRate=newRespawnRate;}
static NPC_HAZARD_UNIT_TYPE getTypeFromMapEdit( u16 newType ); static NPC_HAZARD_UNIT_TYPE getTypeFromMapEdit( u16 newType );
static CNpcHazard *Create(int Type);
static CNpcHazard *Create(sThingHazard *ThisHazard); static CNpcHazard *Create(sThingHazard *ThisHazard);
void setPlatform(CThing *_newPlatform) {m_platform = _newPlatform;} void setPlatform(CThing *_newPlatform) {m_platform = _newPlatform;}