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-25 20:03:00 +00:00
parent a17ebb002a
commit f815a60cb9
2 changed files with 16 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

19
source/enemy/npc.cpp
View file

@ -208,12 +208,10 @@ CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::getTypeFromMapEdit( u16 newType )
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CNpcEnemy *CNpcEnemy::Create(sThingActor *ThisActor) CNpcEnemy *CNpcEnemy::Create(int enemyType)
{ {
CNpcEnemy *enemy; CNpcEnemy *enemy;
NPC_UNIT_TYPE enemyType = CNpcEnemy::getTypeFromMapEdit( ThisActor->Type );
enemy = (CNpcEnemy*)CThingManager::GetThing(TYPE_ENEMY,enemyType); enemy = (CNpcEnemy*)CThingManager::GetThing(TYPE_ENEMY,enemyType);
if (!enemy) if (!enemy)
switch( enemyType ) switch( enemyType )
@ -471,7 +469,7 @@ CNpcEnemy *CNpcEnemy::Create(sThingActor *ThisActor)
ASSERT(enemy); ASSERT(enemy);
enemy->setType( enemyType ); enemy->setType( (NPC_UNIT_TYPE)enemyType );
enemy->setThingSubType(enemyType); enemy->setThingSubType(enemyType);
enemy->init(); enemy->init();
@ -479,6 +477,19 @@ CNpcEnemy *CNpcEnemy::Create(sThingActor *ThisActor)
return(enemy); return(enemy);
} }
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
CNpcEnemy *CNpcEnemy::Create(sThingActor *ThisActor)
{
CNpcEnemy *enemy;
NPC_UNIT_TYPE enemyType = CNpcEnemy::getTypeFromMapEdit( ThisActor->Type );
enemy = (CNpcEnemy*)Create(enemyType);
ASSERT(enemy);
return(enemy);
}
//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
void CNpcEnemy::setupWaypoints( sThingActor *ThisActor ) void CNpcEnemy::setupWaypoints( sThingActor *ThisActor )

1
source/enemy/npc.h
View file

@ -115,6 +115,7 @@ public:
void setSpeed( s16 newSpeed ) {m_speed = newSpeed;} void setSpeed( s16 newSpeed ) {m_speed = newSpeed;}
virtual u32 getRGB() {return( m_RGB );} virtual u32 getRGB() {return( m_RGB );}
static CNpcEnemy *Create(int enemyType);
static CNpcEnemy *Create(sThingActor *ThisActor); static CNpcEnemy *Create(sThingActor *ThisActor);
virtual void setupWaypoints( sThingActor *ThisActor ); virtual void setupWaypoints( sThingActor *ThisActor );