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 18:43:47 +00:00
parent 5b785068c2
commit fa5105d783
96 changed files with 550 additions and 406 deletions
Download patch file Download diff file Expand all files Collapse all files

13
source/friend/friend.cpp
View file

@ -67,9 +67,11 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
{
CNpcFriend *friendNpc;
NPC_FRIEND_UNIT_TYPE friendType = CNpcFriend::getTypeFromMapEdit( ThisActor->Type );
NPC_FRIEND_UNIT_TYPE Type = CNpcFriend::getTypeFromMapEdit( ThisActor->Type );
switch( friendType )
friendNpc = (CNpcFriend*)CThingManager::GetThing(CThing::TYPE_NPC,Type);
if (!friendNpc)
switch( Type )
{
case CNpcFriend::NPC_FRIEND_BARNACLE_BOY:
{
@ -121,7 +123,7 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
default:
{
printf("UNKNOWN %i\n",friendType);
SYSTEM_DBGMSG("UNKNOWN %i\n",Type);
friendNpc = NULL;
ASSERT(0);
break;
@ -130,7 +132,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
ASSERT( friendNpc );
friendNpc->setType( friendType );
friendNpc->setType( Type );
friendNpc->setThingSubType(Type);
u16 *PntList=(u16*)MakePtr(ThisActor,sizeof(sThingActor));
@ -191,8 +194,6 @@ void CNpcFriend::postInit()
void CNpcFriend::shutdown()
{
//m_spriteBank->dump(); delete m_spriteBank;
delete m_actorGfx;
CNpcThing::shutdown();
}