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-04-01 20:22:49 +00:00
parent 1966aa6f60
commit 2b171295b5
44 changed files with 588 additions and 603 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/enemy/nclam.cpp
View file

@ -50,7 +50,7 @@ void CNpcEnemy::processCloseClamJumpAttack( int _frames )
if ( !m_animPlaying )
{
m_animPlaying = true;
m_animNo = ANIM_CLAM_CLAMSNAPUP;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
}
}
@ -96,7 +96,7 @@ void CNpcEnemy::processCloseClamSnapAttack( int _frames )
if ( !m_animPlaying )
{
m_animPlaying = true;
m_animNo = ANIM_CLAM_CLAMSIDESNAP;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
}

42
source/enemy/npc.cpp
View file

@ -45,7 +45,8 @@
#include "game\convo.h"
#endif
#include "Gfx\Skel.h"
#include "Gfx\actor.h"
#ifndef __VID_HEADER_
#include "system\vid.h"
@ -63,11 +64,6 @@ void CNpcFriend::init()
{
CNpcThing::init();
// sActorHdr *Hdr=m_skel.Load(ACTORS_SPONGEBOB_A3D);
// m_skel.Init(Hdr);
m_skel.Init(ACTORS_SPONGEBOB_A3D);
m_actorTPage = TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX);
Pos.vx = 100;
Pos.vy = 100;
@ -96,10 +92,6 @@ void CNpcFriend::shutdown()
{
//m_spriteBank->dump(); delete m_spriteBank;
// temporary
//TPFree( m_actorTPage );
//CAnimDB::Dump( m_data[m_type].animData );
CNpcThing::shutdown();
}
@ -135,11 +127,7 @@ void CNpcFriend::render()
renderPos.vx = ( Pos.vx + m_drawOffset.vx - offset.vx - ( VidGetScrW() >> 1 ) ) * 20;
renderPos.vy = ( Pos.vy + m_drawOffset.vy - offset.vy - ( VidGetScrH() >> 1 ) ) * 20;
m_skel.setPos( renderPos );
m_skel.setFrame(m_frame);
m_skel.setAnimNo(m_animNo);
m_skel.Animate(this);
m_skel.Render(this);
m_actorGfx->Render(renderPos,m_frame,m_animNo,false);
/*s32 x,y;
s32 scrnWidth = VidGetScrW();
@ -216,12 +204,7 @@ void CNpcEnemy::init()
{
CEnemyThing::init();
// sActorHdr *Hdr = m_skel.Load( m_data[m_type].skelType );
// m_skel.Init( Hdr );
m_skel.Init(m_data[m_type].skelType);
m_actorTPage = TPLoadTex( ACTORS_ACTOR_ENEMY_TEX );
m_skel.setAng(1024);
m_actorGfx=CActorPool::GetActor(m_data[m_type].skelType);
m_animPlaying = true;
m_animNo = m_data[m_type].initAnim;
@ -545,7 +528,6 @@ void CNpcEnemy::shutdown()
m_positionHistory = NULL;
// temporary
TPFree( m_actorTPage );
CEnemyThing::shutdown();
}
@ -561,7 +543,7 @@ void CNpcEnemy::think(int _frames)
if ( m_animPlaying )
{
int frameCount = m_skel.getFrameCount();
int frameCount = m_actorGfx->getFrameCount(m_animNo);
if ( frameCount - m_frame > _frames )
{
@ -576,12 +558,12 @@ void CNpcEnemy::think(int _frames)
if ( m_heading > 1024 && m_heading < 3072 )
{
m_skel.setAng( 3072 );
//!! m_actorGfx.setAng( 3072 );
m_reversed = true;
}
else
{
m_skel.setAng( 1024 );
//!! m_actorGfx.setAng( 1024 );
m_reversed = false;
}
@ -1284,18 +1266,14 @@ void CNpcEnemy::render()
if ( m_reversed )
{
m_skel.setZAng( ( m_heading + 2048 ) & 4095 );
//!! m_actorGfx.setZAng( ( m_heading + 2048 ) & 4095 );
}
else
{
m_skel.setZAng( m_heading );
//!! m_actorGfx.setZAng( m_heading );
}
m_skel.setPos( renderPos );
m_skel.setFrame(m_frame);
m_skel.setAnimNo(m_animNo);
m_skel.Animate(this);
m_skel.Render(this);
m_actorGfx->Render(renderPos,m_frame,m_animNo,m_reversed);
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

9
source/enemy/npc.h
View file

@ -20,7 +20,8 @@
#include "thing/thing.h"
#endif
#include "Gfx/Skel.h"
//#include "Gfx/Skel.h"
#ifndef __ENEMY_NPCPATH_H__
#include "enemy\npcpath.h"
@ -101,8 +102,7 @@ protected:
int m_frame;
int m_animNo;
CSkel m_skel;
TPAGE_DESC m_actorTPage;
CActorGfx *m_actorGfx;
DVECTOR m_drawOffset;
};
@ -500,8 +500,7 @@ protected:
int m_frame;
int m_animNo;
CSkel m_skel;
TPAGE_DESC m_actorTPage;
CActorGfx *m_actorGfx;
DVECTOR m_drawOffset;
virtual void collidedWith(CThing *_thisThing);

178
source/enemy/npcdata.cpp
View file

@ -27,9 +27,9 @@
#include <ACTOR_CLAM_ANIM.h>
#endif
#ifndef __ANIM_SHARKSUB_HEADER__
#include <ACTOR_SHARKSUB_ANIM.h>
#endif
//#ifndef __ANIM_SHARKSUB_HEADER__
//#include <ACTOR_SHARKSUB_ANIM.h>
//#endif
CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
@ -66,8 +66,8 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
{
{ // NPC_LINEAR_PLATFORM
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_PLATFORM_MOVEMENT_FIXED_PATH,
3,
//512,
@ -79,8 +79,8 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
},
{ // NPC_CIRCULAR_PLATFORM
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_PLATFORM_MOVEMENT_FIXED_CIRCULAR,
3,
128,
@ -91,8 +91,8 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
},
{ // NPC_BUBBLE_PLATFORM
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_PLATFORM_MOVEMENT_BUBBLE,
3,
128,
@ -106,8 +106,8 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
{
{ // NPC_FALLING_ITEM
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_FALLING_ITEM_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -123,8 +123,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_FISH_HOOK
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_FISH_HOOK,
NPC_SENSOR_FISH_HOOK_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -140,8 +140,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_DUST_DEVIL
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_RETURNING_HAZARD,
NPC_SENSOR_NONE,
NPC_MOVEMENT_RETURNING_HAZARD,
@ -157,8 +157,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_PENDULUM
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_PENDULUM,
NPC_SENSOR_NONE,
NPC_MOVEMENT_PENDULUM,
@ -174,8 +174,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_FIREBALL
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_FIREBALL,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIREBALL,
@ -191,8 +191,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SAW_BLADE
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_RETURNING_HAZARD,
NPC_SENSOR_NONE,
NPC_MOVEMENT_RETURNING_HAZARD,
@ -208,8 +208,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SMALL_JELLYFISH_1
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_JELLYFISH_USER_CLOSE,
NPC_MOVEMENT_FIXED_PATH,
@ -225,8 +225,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SMALL_JELLYFISH_2
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_JELLYFISH_USER_CLOSE,
NPC_MOVEMENT_FIXED_PATH,
@ -242,8 +242,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_ANEMONE_1
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_ANEMONE_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -259,8 +259,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_ANEMONE_2
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_ANEMONE_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -276,8 +276,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_ANEMONE_3
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_ANEMONE_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -293,8 +293,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SKELETAL_FISH
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_GENERIC_USER_VISIBLE,
NPC_MOVEMENT_FIXED_PATH,
@ -310,8 +310,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_CLAM_JUMP
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSNAPUP,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_CLAM_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -327,8 +327,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_CLAM_STATIC
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSIDESNAP,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_CLAM_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -344,8 +344,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SQUID_DART
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -361,8 +361,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_FISH_FOLK
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_FISH_FOLK,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -378,8 +378,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_PRICKLY_BUG
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -395,8 +395,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SEA_SNAKE
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -412,8 +412,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_PUFFA_FISH
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -429,8 +429,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_ANGLER_FISH
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -446,8 +446,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_HERMIT_CRAB
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -463,8 +463,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_MINE
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_STATIC,
@ -480,8 +480,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_BOOGER_MONSTER
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -497,8 +497,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SPIDER_CRAB
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_SPIDER_CRAB_USER_CLOSE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -514,8 +514,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_EYEBALL
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_EYEBALL_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -531,8 +531,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_BABY_OCTOPUS
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -548,8 +548,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_ZOMBIE_FISH_FOLK
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_FISH_FOLK,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -565,8 +565,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_NINJA_STARFISH
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NINJA_STARFISH_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -582,8 +582,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_GHOST
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -599,8 +599,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_GHOST_PIRATE
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_GHOST_PIRATE,
NPC_SENSOR_GHOST_PIRATE_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -616,8 +616,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_FLAMING_SKULL
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_FLAMING_SKULL,
NPC_SENSOR_FLAMING_SKULL_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -633,8 +633,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SHARK_MAN
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_GENERIC_USER_VISIBLE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -650,8 +650,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_OIL_BLOB
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_OIL_BLOB_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -667,8 +667,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SKULL_STOMPER
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_SKULL_STOMPER,
NPC_SENSOR_SKULL_STOMPER_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -684,8 +684,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_MOTHER_JELLYFISH
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_MOTHER_JELLYFISH,
NPC_SENSOR_NONE,
NPC_MOVEMENT_MOTHER_JELLYFISH,
@ -701,8 +701,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_SUB_SHARK
ACTORS_SHARKSUB_A3D,
ANIM_SHARKSUB_SHARKSUBSWIM,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_SUB_SHARK,
NPC_SENSOR_NONE,
NPC_MOVEMENT_SUB_SHARK,
@ -718,8 +718,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_PARASITIC_WORM
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_PARASITIC_WORM,
NPC_SENSOR_NONE,
NPC_MOVEMENT_PARASITIC_WORM,
@ -735,8 +735,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_FLYING_DUTCHMAN
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_FLYING_DUTCHMAN,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FLYING_DUTCHMAN,
@ -752,8 +752,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_IRON_DOGFISH
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_IRON_DOGFISH,
NPC_SENSOR_IRON_DOGFISH_USER_CLOSE,
NPC_MOVEMENT_IRON_DOGFISH,
@ -769,8 +769,8 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
},
{ // NPC_PARASITIC_WORM_SEGMENT
ACTORS_CLAM_A3D,
ANIM_CLAM_CLAMSHUT,
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_PARASITIC_WORM_SEGMENT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_STATIC,

12
source/enemy/nsshark.cpp
View file

@ -28,7 +28,7 @@
#endif
#ifndef __ANIM_SHARKSUB_HEADER__
#include <ACTOR_SHARKSUB_ANIM.h>
#include <ACTOR_CLAM_ANIM.h>
#endif
@ -39,13 +39,13 @@ void CNpcEnemy::processSubSharkMovement( int _frames )
if ( playerXDistSqr + playerYDistSqr < 100 && !m_salvoCount )
{
m_animPlaying = true;
m_animNo = ANIM_SHARKSUB_SHARKSUBSWIPE;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
}
else
{
m_animPlaying = true;
m_animNo = ANIM_SHARKSUB_SHARKSUBSWIM;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
}
}
@ -156,7 +156,7 @@ void CNpcEnemy::processCloseSubSharkAttack( int _frames )
if ( !m_animPlaying )
{
m_animPlaying = true;
m_animNo = ANIM_SHARKSUB_SHARKSUBSPRINTOPEN;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
}
@ -165,7 +165,7 @@ void CNpcEnemy::processCloseSubSharkAttack( int _frames )
if ( playerXDistSqr < 10000 )
{
m_animPlaying = true;
m_animNo = ANIM_SHARKSUB_SHARKSUBCHOMP;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
m_state = SUB_SHARK_SWALLOW;
@ -211,7 +211,7 @@ void CNpcEnemy::processCloseSubSharkAttack( int _frames )
if ( !m_animPlaying )
{
m_animPlaying = true;
m_animNo = ANIM_SHARKSUB_SHARKSUBSWIM;
m_animNo = ANIM_CLAM_SIDESNAP;
m_frame = 0;
m_controlFunc = NPC_CONTROL_MOVEMENT;
m_movementTimer = GameState::getOneSecondInFrames() * 8;

2
source/game/game.cpp
View file

@ -68,6 +68,7 @@
#include "sound\sound.h"
#endif
#include "gfx\actor.h"
//int GX=512/2;
@ -95,7 +96,6 @@ int CGameScene::s_levelFinished;
CGameScene GameScene;
#include "gfx\actorpool.h"
/*****************************************************************************/
void CGameScene::init()
{

94
source/gfx/actor.cpp
View file

@ -5,9 +5,10 @@
#include "system\global.h"
#include "mem\memory.h"
#include "fileio\fileio.h"
#include "utils\quat.h"
#include "gfx\actor.h"
#include "utils\utils.h"
#include "utils\pak.h"
#include "gfx\prim.h"
#include <dstructs.h>
@ -16,34 +17,101 @@ CActorGfx *CActorPool::ActorList[CActorPool::MAX_ACTORS];
/*****************************************************************************/
/*****************************************************************************/
/*****************************************************************************/
void CActorGfx::Init(FileEquate _Filename)
{
CActorPool::GetActor(Filename);
}
/*****************************************************************************/
CActorGfx::CActorGfx(FileEquate _Filename)
{
int i;
Filename=_Filename;
/* ActorData=(sActorHdr*)CFileIO::loadFile(Filename);
SpriteBank=(sSpriteAnimBank*)CFileIO::loadFile(Filename);
for (int i=0; i<ActorData->AnimCount; i++)
SpriteBank->AnimList=(sSpriteAnim*) MakePtr(SpriteBank,(int)SpriteBank->AnimList);
SpriteBank->FrameList=(sSpriteFrame*) MakePtr(SpriteBank,(int)SpriteBank->FrameList);
SpriteBank->Palette=(u8*) MakePtr(SpriteBank,(int)SpriteBank->Palette);
// FixUp AnimList
for (i=0; i<SpriteBank->AnimCount; i++)
{
ActorData->AnimList[i].Move=(s32*) MakePtr(ActorData,(int)ActorData->AnimList[i].Move);
ActorData->AnimList[i].Anim=(AnimIdx*) MakePtr(ActorData,(int)ActorData->AnimList[i].Anim);
sSpriteAnim *ThisAnim=&SpriteBank->AnimList[i];
ThisAnim->Anim=(u16*) MakePtr(SpriteBank,(int)ThisAnim->Anim);
}
// FixUp FrameList
for (i=0; i<SpriteBank->FrameCount; i++)
{
sSpriteFrame *ThisFrame=&SpriteBank->FrameList[i];
ThisFrame->PAKSpr=(u8*) MakePtr(SpriteBank,(int)ThisFrame->PAKSpr);
}
DAVE_DBGMSG("Nodes %i\n",ActorData->BoneCount);
DAVE_DBGMSG("Tris %i\n",ActorData->TriCount);
DAVE_DBGMSG("Vtx %i\n",ActorData->VtxCount);
DAVE_DBGMSG("Anims %i\n",ActorData->AnimCount);
*/
DAVE_DBGMSG("Anims %i\n",SpriteBank->AnimCount);
}
/*****************************************************************************/
CActorGfx::~CActorGfx()
{
MemFree(ActorData);
MemFree(SpriteBank);
}
/*****************************************************************************/
int TPP=0;
int TPA=0;
int TPX=512;
int TPY=256;
int RR=128;
int GG=128;
int BB=128;
int XX=32;
int YY=32;
//int PW=16;
void CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool FlipX)
{
sSpriteAnim &ThisAnim=SpriteBank->AnimList[Anim];
u16 FrameNo=ThisAnim.Anim[Frame];
sSpriteFrame &ThisFrame=SpriteBank->FrameList[FrameNo];
POLY_FT4 *Ft4;
u8 Buffer[256*256];
PAK_doUnpak(Buffer,ThisFrame.PAKSpr);
// clut
RECT Rect;
Rect.x=512;
Rect.y=511;
Rect.w=SpriteBank->ColorCount;
Rect.h=1;
LoadImage( &Rect, (u32*)SpriteBank->Palette);
// Gfx
Rect.x=512;
Rect.y=256;
Rect.w=ThisFrame.W/4;
Rect.h=ThisFrame.H;
LoadImage( &Rect, (u32*)Buffer);
Ft4=GetPrimFT4();
setXYWH(Ft4,Pos.vx-ThisFrame.XOfs,Pos.vy-ThisFrame.YOfs,ThisFrame.W,ThisFrame.H);
setUVWH(Ft4,0,0,ThisFrame.W,ThisFrame.H);
setRGB0(Ft4,RR,GG,BB);
setTPage(Ft4,0,0,TPX,TPY);
setClut(Ft4, TPX, 511);
AddPrimToList(Ft4,0);
Ft4=GetPrimFT4();
setXYWH(Ft4,Pos.vx-ThisFrame.XOfs,Pos.vy-ThisFrame.YOfs,ThisFrame.W,ThisFrame.H);
Ft4->x0-=XX;
Ft4->x1-=XX;
Ft4->y0+=YY;
Ft4->y1+=YY;
setUVWH(Ft4,0,0,ThisFrame.W,ThisFrame.H);
setRGB0(Ft4,0,0,0);
setSemiTrans(Ft4,1);
setTPage(Ft4,0,0,TPX,TPY);
setClut(Ft4, TPX, 511);
AddPrimToList(Ft4,0);
}
@ -98,7 +166,7 @@ int Idx;
Idx=FindFreeIdx();
ASSERT(Idx!=-1);
NewActor=new ("ActorPool") CActorPool(Filename);
NewActor=new ("ActorPool") CActorGfx(Filename);
ActorList[Idx]=NewActor;
return(NewActor);
@ -109,7 +177,7 @@ int Idx;
/*****************************************************************************/
void CActorPool::DumpActor(FileEquate Filename)
{
CActorPool *ThisActor;
CActorGfx *ThisActor;
int Idx;
// Is Loaded?

26
source/gfx/actor.h
View file

@ -1,6 +1,6 @@
/******************/
/*** Actor Bank ***/
/******************/
/*******************/
/*** Actor Stuff ***/
/*******************/
#ifndef __ACTOR_HEADER__
#define __ACTOR_HEADER__
@ -16,30 +16,30 @@
class CActorGfx
{
public:
CActorGfx(){};
CActorGfx(FileEquate Filename);
~CActorGfx();
// CActorGfx(){};
CActorGfx(FileEquate Filename);
virtual ~CActorGfx();
void Render(DVECTOR &Pos,int Anim,int Frame,bool FlipX);
void Dump();
void Init(FileEquate _Filename);
void Render(DVECTOR &Pos,int Anim,int Frame,bool FlipX);
void Dump();
int getFrameCount() {return(0);}
int getFrameCount(int Anim) {return(SpriteBank->AnimList[Anim].FrameCount);}
FileEquate GetFilename() {return(Filename);}
FileEquate GetFilename() {return(Filename);}
private:
FileEquate Filename;
sSpriteAnimBank *ActorData;
sSpriteAnimBank *SpriteBank;
};
/*****************************************************************************/
class CActorBank
class CActorPool
{
public:
enum
{
MAX_ACTORS=8,
};
// virtual ~ActorBank(){};
static void Init();

7
source/gfx/animtex.cpp
View file

@ -151,11 +151,10 @@ int Time = GameState::getFramesSinceLast();
/*****************************************************************************/
/*****************************************************************************/
/*****************************************************************************/
/*
void CMoveTex::Add(sTexInfo &SrcFrame,sTexInfo &DstFrame)
{
int Idx;
// ASSERT(SrcFrame.w==DstFrame.w);
// ASSERT(SrcFrame.h==DstFrame.h);
for (Idx=0; Idx<MOVETEX_MAX && MoveTexList[Idx].Src; Idx++);
@ -166,10 +165,11 @@ CMoveTex &ThisTex=MoveTexList[Idx];
ThisTex.Src=&SrcFrame;
ThisTex.Dst=&DstFrame;
}
*/
/*****************************************************************************/
void CMoveTex::MoveTex()
{
/*
CMoveTex *ThisTex=MoveTexList,*NextTex;
for (int Idx=0; Idx<MOVETEX_MAX; Idx++)
@ -180,6 +180,7 @@ CMoveTex *ThisTex=MoveTexList,*NextTex;
MoveImage((RECT*)ThisTex.Src,ThisTex.Dst->x,ThisTex.Dst->y);
ThisTex.Src=0;
}
*/
}
/*****************************************************************************/

6
source/gfx/animtex.h
View file

@ -42,14 +42,14 @@ public:
CMoveTex()
{
Src=0;
// Src=0;
}
static void Add(sTexInfo &SrcFrame,sTexInfo &DstFrame);
//static void Add(sTexInfo &SrcFrame,sTexInfo &DstFrame);
static void MoveTex();
private:
sTexInfo *Src,*Dst;
// sTexInfo *Src,*Dst;
static CMoveTex MoveTexList[];
};

49
source/player/player.cpp
View file

@ -234,8 +234,7 @@ void CPlayer::init()
// m_onPlatform = false;
// m_prevOnPlatform = false;
m_skel.Init(ACTORS_SPONGEBOB_A3D);
TPLoadTex(ACTORS_ACTOR_SPONGEBOB_TEX);
m_actorGfx=CActorPool::GetActor(ACTORS_SPONGEBOB_SBK);
for(int i=0;i<NUM_PLAYERMODES;i++)
{
@ -259,8 +258,8 @@ m_animFrame=0;
s_screenPos=128;
m_skel.setAng(512);
//m_skel.setAngInc(678);
//!! m_actorGfx.setAng(512);
//m_actorGfx.setAngInc(678);
setCollisionSize(25,50);
setCollisionCentreOffset(0,-25);
@ -348,11 +347,6 @@ else if(Pos.vy>m_mapEdge.vy-64)Pos.vy=m_mapEdge.vy-64;
// Look around
int pad=getPadInputHeld();
if(PadGetDown(0)&PAD_CIRCLE)
{
m_skel.blink();
}
// Camera scroll..
if(m_cameraScrollDir==-1)
@ -454,33 +448,24 @@ m_fontBank->print(40,40,posBuf);
// Render
if(m_invincibleFrameCount==0||m_invincibleFrameCount&2)
{
#ifdef __USER_paul__
if(mouth!=-1)
{
m_skel.setMouthTex(mouth);
mouth=-1;
}
if(eyes!=-1)
{
m_skel.setEyeTex(eyes);
eyes=-1;
}
#endif
//int xval=(255-(MAP2D_BLOCKSTEPSIZE*(-m_cameraScrollPos.vx>>8)));
//DrawLine(xval-7,0,xval-7,255,0,128,255,0);
//DrawLine(xval+7,0,xval+7,255,0,128,255,0);
SetGeomOffset(SCREEN_GEOM_CENTRE_X+m_playerScreenGeomPos.vx,SCREEN_GEOM_CENTRE_Y+m_playerScreenGeomPos.vy);
if(panim!=-1)
m_skel.setAnimNo(panim);
else
m_skel.setAnimNo(m_animNo);
m_skel.setFrame(m_animFrame);
m_skel.Animate(this);
m_skel.Render(this);
//!! SetGeomOffset(SCREEN_GEOM_CENTRE_X+m_playerScreenGeomPos.vx,SCREEN_GEOM_CENTRE_Y+m_playerScreenGeomPos.vy);
// if(panim!=-1)
// m_actorGfx.setAnimNo(panim);
// else
// m_actorGfx.setAnimNo(m_animNo);
//!! m_actorGfx.setFrame(m_animFrame);
//!! m_actorGfx.Animate(this);
//!! m_actorGfx.Render(this);
//!! m_currentPlayerModeClass->render();
//!! SetGeomOffset(SCREEN_GEOM_CENTRE_X,SCREEN_GEOM_CENTRE_Y);
DVECTOR Pos={256,128};
m_actorGfx->Render(Pos,m_animNo,m_animFrame,0);
m_currentPlayerModeClass->render();
SetGeomOffset(SCREEN_GEOM_CENTRE_X,SCREEN_GEOM_CENTRE_Y);
}
@ -634,7 +619,7 @@ void CPlayer::setFacing(int _facing)
if(m_facing!=_facing)
{
m_facing=_facing;
m_skel.setDir(_facing);
//!! m_actorGfx.setDir(_facing);
}
}
@ -687,7 +672,7 @@ void CPlayer::setAnimFrame(int _animFrame)
}
int CPlayer::getAnimFrameCount()
{
return m_skel.getFrameCount(m_animNo);
return m_actorGfx->getFrameCount(m_animNo);
}
int CPlayer::getAnimNo()
{

7
source/player/player.h
View file

@ -22,9 +22,8 @@
#include "thing/thing.h"
#endif
#ifndef __GFX_SKELSPNG_H__
#include "gfx/skelspng.h"
#endif
#include "gfx/actor.h"
#ifndef __DATA_STRUCTS_HEADER__
#include <dstructs.h>
@ -189,7 +188,7 @@ private:
static const AnimSfx s_animSfx[];
int m_animFrame;
int m_animNo;
CSkelSpongeBob m_skel;
CActorGfx *m_actorGfx;
DVECTOR m_playerScreenGeomPos;
DVECTOR m_cameraPos;

3
source/player/pmbubble.cpp
View file

@ -123,7 +123,8 @@ void CPlayerModeBubbleMixture::think()
// Blowing?
if(m_blowing)
{
m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
//!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE);
m_player->setAnimFrame(m_blowFrame);
m_blowFrame++;
if(m_blowFrame>=m_player->getAnimFrameCount())

3
source/player/pmchop.cpp
View file

@ -84,7 +84,8 @@ void CPlayerModeChop::think()
// Chopping?
if(m_chopping)
{
m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
//!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE);
m_player->setAnimFrame(m_chopFrame);
m_chopFrame++;
if(m_chopFrame>=m_player->getAnimFrameCount())

3
source/player/pmnet.cpp
View file

@ -103,7 +103,8 @@ void CPlayerModeNet::think()
// Netting?
if(m_netting)
{
m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
//!!! m_player->setAnimNo(ANIM_SPONGEBOB_KARATE);
m_player->setAnimNo(ANIM_SPONGEBOB_FIRE);
m_player->setAnimFrame(m_netFrame);
m_netFrame++;
if(m_netFrame>=m_player->getAnimFrameCount())

3
source/player/psfall.cpp
View file

@ -62,7 +62,8 @@
---------------------------------------------------------------------- */
void CPlayerStateFall::enter(CPlayerModeBase *_playerMode)
{
_playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
// _playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
}

21
source/player/psidle.cpp
View file

@ -257,12 +257,14 @@ void CPlayerStateIdle::setNextIdleAnim(CPlayerModeBase *_playerMode)
static IdleAnims s_unarmedIdleAnims[]=
{
// start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
{ ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEHOOLA, ANIM_SPONGEBOB_FACEBACK, 5 },
{ ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEWIGGLEARM, ANIM_SPONGEBOB_FACEBACK, 5 },
{ -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
{ -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 },
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
//!! { ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEHOOLA, ANIM_SPONGEBOB_FACEBACK, 5 },
//!! { ANIM_SPONGEBOB_FACEFRONT, ANIM_SPONGEBOB_IDLEWIGGLEARM, ANIM_SPONGEBOB_FACEBACK, 5 },
//!! { -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
//!! { -1, ANIM_SPONGEBOB_IDLEWIND, -1, 1 },
{ -1, ANIM_SPONGEBOB_IDLEHOOLA, -1, 4 }, // default
};
static int s_numUnarmedIdleAnims=sizeof(s_unarmedIdleAnims)/sizeof(IdleAnims);
IdleAnims *CPlayerStateUnarmedIdle::getIdleAnimsDb(int _animNo)
@ -285,9 +287,10 @@ int CPlayerStateUnarmedIdle::getNumIdleAnims()
static IdleAnims s_coralBlowerIdleAnims[]=
{
// start frame loop frame end frame loop count
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
{ -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
{ -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 4 }, // default
//!! { -1, ANIM_SPONGEBOB_IDLEBREATHE, -1, 10 },
//!! { -1, ANIM_SPONGEBOB_IDLELOOK, -1, 1 },
{ -1, ANIM_SPONGEBOB_IDLEHOOLA, -1, 1 },
};
static int s_numCoralBlowerIdleAnims=sizeof(s_coralBlowerIdleAnims)/sizeof(IdleAnims);
IdleAnims *CPlayerStateCoralBlowerIdle::getIdleAnimsDb(int _animNo)

3
source/player/psjump.cpp
View file

@ -67,7 +67,8 @@
---------------------------------------------------------------------- */
void CPlayerStateJump::enter(CPlayerModeBase *_playerMode)
{
_playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
//!! _playerMode->setAnimNo(ANIM_SPONGEBOB_HOVER);
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
m_jumpFrames=0;
_playerMode->jump();

6
source/player/psrun.cpp
View file

@ -71,7 +71,8 @@ void CPlayerStateRun::enter(CPlayerModeBase *_playerMode)
}
else
{
_playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTART);
//!! _playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTART);
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
}
if(controlHeld&PI_LEFT)
@ -126,7 +127,8 @@ void CPlayerStateRun::think(CPlayerModeBase *_playerMode)
_playerMode->setState(STATE_IDLE);
if(m_numberOfTimeAnimHasLooped>=4)
{
_playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTOP);
//!! _playerMode->setAnimNo(ANIM_SPONGEBOB_RUNSTOP);
_playerMode->setAnimNo(ANIM_SPONGEBOB_FIRE);
}
return;
}

2
source/projectl/projectl.h
View file

@ -18,8 +18,6 @@
#include "thing/thing.h"
#endif
#include "Gfx/Skel.h"
/*****************************************************************************/
class CProjectile : public CEnemyProjectileThing

6
source/system/main.cpp
View file

@ -11,7 +11,7 @@
#include "gfx\prim.h"
#include "gfx\tpage.h"
#include "utils\utils.h"
#include "gfx\actorpool.h"
#include "gfx\actor.h"
#include "system\gp.h"
@ -117,9 +117,7 @@ void InitSystem() // reordered to reduce black screen (hope all is well
CBubicleFactory::init();
CActorPool::AddActor(ACTORS_SPONGEBOB_A3D);
// CAnimDB::Init();
// CAnimDB::Load(ACTORS_SPONGEBOB_ABK);
CActorPool::AddActor(ACTORS_SPONGEBOB_SBK);
#if defined(__DEBUG_MEM__)
DebugMemFontInit();

40
source/utils/pak.cpp
View file

@ -1,33 +1,7 @@
/*=========================================================================
PAK.CPP
Author: Gary Liddon @ Climax (from work by Nick Pelling && Carl Muller)
Created:
Project: Diablo PSX
Purpose: PAK decompress \ compress code
Copyright (c) 1997 Climax Development Ltd
===========================================================================*/
/*----------------------------------------------------------------------
Includes
-------- */
/* Std Lib
------- */
/* Glib
---- */
/* Local
----- */
#include "system\global.h"
#include <string.h>
#include "pak.h"
#include "utils\pak.h"
/* Graphics
-------- */
/*----------------------------------------------------------------------
Tyepdefs && Defines
@ -44,7 +18,7 @@
struct Block
{
int data[128];
BOOL blockrep;
bool blockrep;
int blocksize;
int blockoffset;
@ -115,7 +89,7 @@ void Block::writeBlock(void)
}
// Get ready for next block
blockrep = FALSE;
blockrep = false;
blockoffset = 0;
blocksize = -1;
}
@ -158,7 +132,7 @@ int lowLevelPak(u8 * Dest,u8 const * buffer,int insize,Block & theblock)
theblock.Dest=Dest;
theblock.outsize=0;
theblock.blockrep=FALSE;
theblock.blockrep=false;
BACKDIST = -128;
FORWARDDIST = 255;
@ -244,7 +218,7 @@ int lowLevelPak(u8 * Dest,u8 const * buffer,int insize,Block & theblock)
{
/* We have found a match */
theblock.writeBlock();
theblock.blockrep = TRUE;
theblock.blockrep = true;
theblock.blocksize = bestlength;
theblock.blockoffset = bestoffset;
inpos += bestlength;
@ -257,7 +231,7 @@ int lowLevelPak(u8 * Dest,u8 const * buffer,int insize,Block & theblock)
/* Terminate file */
theblock.blockrep = TRUE;
theblock.blockrep = true;
theblock.blocksize = 0;
theblock.blockoffset = 0;
theblock.writeBlock();

51
source/utils/pak.h
View file

@ -1,61 +1,12 @@
/*=========================================================================
PAK.H
Author: Carl Muller (algorithm Nick Pelling && Carl Muller)
Created:
Project:
Purpose:
Copyright (c) 1997 Climax Development Ltd
===========================================================================*/
#ifndef __PAK_PAK_H__
#define __PAK_PAK_H__
/*----------------------------------------------------------------------
Includes
-------- */
/* Std Lib
------- */
/* Glib
---- */
#include <gtypes.h>
/* Local
----- */
/*----------------------------------------------------------------------
Tyepdefs && Defines
------------------- */
/*----------------------------------------------------------------------
Structure defintions
-------------------- */
/*----------------------------------------------------------------------
Globals
------- */
/* Vars
---- */
/* Data
---- */
/* Functions
--------- */
int PAK_doPak(u8 * Dest,u8 const * source,int insize);
int PAK_doUnpak(u8 * Dest,u8 const * Source);
int PAK_findPakSize(u8 const * souce,int insize);
int PAK_getLastAmountOfDataRead(void);
/*---------------------------------------------------------------------- */
#endif /* __PAK_PAK_H__ */
/*===========================================================================
end */
#endif

6
source/utils/utils.h
View file

@ -580,6 +580,7 @@ s32 Dpx, Dpy, Dpz;
return (Dpx + Dpy + Dpz);
}
/*****************************************************************************/
/*
inline void QuatSlerp(sQuat *s, sQuat *d, int t, sQuat *o)
{
s32 xx, yy, zz, ww;
@ -627,8 +628,9 @@ sQuat to;
gte_LoadAverageShort12(s, &to, c0, c1, o);
o->vw = ((c0 * s->vw) + (c1 * to.vw)) >> 12;
}
*/
/*****************************************************************************/
/*
static const s32 DeltaErr = 1000;
inline void NormalizeQuaternion(sQuat *o)
{
@ -646,5 +648,5 @@ s32 t = (u32)((s32)o->vx*o->vx+(s32)o->vy*o->vy+(s32)o->vz*o->vz+(s32)o->vw*o->v
}
}
}
*/
#endif