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-07-02 15:40:28 +00:00
parent 488ecef680
commit b8aee4f01d
6 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
source/friend/fdata.cpp
View file

@ -34,7 +34,7 @@
#ifndef __ANIM_PATRICK_HEADER__
#include <ACTOR_PATRICK_Anim.h>
#endif
/*
#ifndef __ANIM_BARNACLEBOY_HEADER__
#include <ACTOR_BARNACLEBOY_Anim.h>
#endif
@ -42,7 +42,7 @@
#ifndef __ANIM_MERMAIDMAN_HEADER__
#include <ACTOR_MERMAIDMAN_Anim.h>
#endif
*/
#ifndef __ANIM_GARY_HEADER__
#include <ACTOR_GARY_Anim.h>
#endif
@ -56,7 +56,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
128,
false,
DAMAGE__HIT_ENEMY,
ANIM_BARNACLEBOY_IDLE,
0,//ANIM_BARNACLEBOY_IDLE,
},
{ // NPC_FRIEND_GARY
@ -83,7 +83,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
128,
false,
DAMAGE__HIT_ENEMY,
ANIM_MERMAIDMAN_IDLE,
0,//ANIM_MERMAIDMAN_IDLE,
},
{ // NPC_FRIEND_PATRICK

17
source/friend/friend.cpp
View file

@ -26,11 +26,11 @@
#ifndef __UTILS_HEADER__
#include "utils\utils.h"
#endif
/*
#ifndef __FRIEND_FBBOY_H__
#include "friend\fbboy.h"
#endif
*/
#ifndef __FRIEND_FGARY_H__
#include "friend\fgary.h"
#endif
@ -38,11 +38,11 @@
#ifndef __FRIEND_FKRUSTY_H__
#include "friend\fkrusty.h"
#endif
/*
#ifndef __FRIEND_FMMAN_H__
#include "friend\fmman.h"
#endif
*/
#ifndef __FRIEND_FPATRICK_H__
#include "friend\fpatrick.h"
#endif
@ -96,7 +96,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
{
case CNpcFriend::NPC_FRIEND_BARNACLE_BOY:
{
friendNpc = new ("barnacle boy") CNpcBarnacleBoyFriend;
ASSERT(!"Friend removed");
// friendNpc = new ("barnacle boy") CNpcBarnacleBoyFriend;
break;
}
@ -114,7 +115,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
case CNpcFriend::NPC_FRIEND_MERMAID_MAN:
{
friendNpc = new ("mermaid man") CNpcMermaidManFriend;
ASSERT(!"Friend removed");
// friendNpc = new ("mermaid man") CNpcMermaidManFriend;
break;
}
@ -138,7 +140,8 @@ CNpcFriend *CNpcFriend::Create(sThingActor *ThisActor)
case CNpcFriend::NPC_FRIEND_PLANKTON:
{
friendNpc = new ("plankton") CNpcPlanktonFriend;
ASSERT(!"Friend removed");
// friendNpc = new ("plankton") CNpcPlanktonFriend;
break;
}