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-02 18:40:41 +00:00
parent a6710337c0
commit cb772db46a
30 changed files with 197 additions and 108 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/enemy/nbblob.cpp
View file

@ -49,10 +49,10 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
if ( !m_animPlaying && m_frame != 0 )
{
m_animNo = ANIM_BALLBLOB_WOBBLE;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
}
else if ( m_animNo == ANIM_BALLBLOB_BOUNCE )
else if ( m_animNo == ANIM_BALLBLOB_IDLE )
{
moveX = 0;
moveY = 0;
@ -85,14 +85,14 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
{
m_velocity.vy = -m_velocity.vy;
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_BOUNCE;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
}
else
{
m_velocity.vy = -( 5 << 8 );
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_BOUNCE;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
}
@ -105,10 +105,10 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading ) )
{
if ( m_animNo != ANIM_BALLBLOB_BOUNCE )
if ( m_animNo != ANIM_BALLBLOB_IDLE)
{
m_animPlaying = true;
m_animNo = ANIM_BALLBLOB_WOBBLE;
m_animNo = ANIM_BALLBLOB_IDLE;
m_frame = 0;
}
}

4
source/enemy/npcdata.cpp
View file

@ -904,7 +904,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
{ // NPC_BALL_BLOB
ACTORS_BALLBLOB_SBK,
ANIM_BALLBLOB_WOBBLE,
ANIM_BALLBLOB_IDLE,
NPC_SENSOR_NONE,
NPC_MOVEMENT_STATIC,
NPC_CLOSE_NONE,
@ -915,7 +915,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
DETECT_ALL_COLLISION,
DAMAGE__BURN_ENEMY,
16,
ANIM_BALLBLOB_WOBBLE,
ANIM_BALLBLOB_IDLE,
NPC_SHOT_GENERIC,
0,
0,

4
source/gfx/actor.cpp
View file

@ -743,9 +743,9 @@ int ShiftY=(Pos.vy & 15);
{
P0=&ModelVtxList[TList->P0]; P1=&ModelVtxList[TList->P1]; P2=&ModelVtxList[TList->P2];
gte_ldv3(P0,P1,P2);
setPolyFT3(TPrimPtr);
setShadeTex(TPrimPtr,1);
setlen(TPrimPtr, GPU_PolyFT3Tag);
TPrimPtr->code=TList->PolyCode;
setRGB0(TPrimPtr,128,128,128);
gte_rtpt_b();
T0=*(u32*)&TList->uv0; // Get UV0 & TPage

4
source/level/layertile3d.cpp
View file

@ -135,9 +135,9 @@ VECTOR BlkPos;
P0=&VtxList[TList->P0]; P1=&VtxList[TList->P1]; P2=&VtxList[TList->P2];
CMX_SetTransMtxXY(&BlkPos);
gte_ldv3(P0,P1,P2);
setPolyFT3(TPrimPtr);
setShadeTex(TPrimPtr,1);
setlen(TPrimPtr, GPU_PolyFT3Tag);
TPrimPtr->code=TList->PolyCode;
setRGB0(TPrimPtr,128,128,128);
gte_rtpt_b();
T0=*(u32*)&TList->uv0; // Get UV0 & TPage