zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-05-10 16:47:35 +00:00
parent ef05298c70
commit fbace83cd3
17 changed files with 168 additions and 93 deletions
Download patch file Download diff file Expand all files Collapse all files

1
source/platform/pbranch.cpp
View file

@ -258,6 +258,7 @@ void CNpcBranchPlatform::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;

1
source/platform/pcart.cpp
View file

@ -167,6 +167,7 @@ void CNpcCartPlatform::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;

1
source/platform/pdual.cpp
View file

@ -216,6 +216,7 @@ void CNpcDualPlatform::render()
m_modelGfx->Render(renderPos);
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;

2
source/platform/pfgen.cpp
View file

@ -49,7 +49,7 @@ void CNpcFallingPlatformGenerator::think( int _frames )
if ( m_timer < 0 )
{
m_timer = GameState::getOneSecondInFrames() + ( getRnd() % ( ( m_data[m_type].initTimer - 1 ) * GameState::getOneSecondInFrames() ) );
m_timer = ( 3 * GameState::getOneSecondInFrames() ) + ( getRnd() % ( ( m_data[m_type].initTimer - 1 ) * GameState::getOneSecondInFrames() ) );
// generate new falling platform

1
source/platform/pfishhk.cpp
View file

@ -87,6 +87,7 @@ void CNpcFishHookPlatform::render()
m_modelGfx->Render(renderPos);
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;

2
source/platform/platdata.cpp
View file

@ -143,7 +143,7 @@ CNpcPlatform::NPC_PLATFORM_DATA CNpcPlatform::m_data[NPC_PLATFORM_TYPE_MAX] =
},
{ // NPC_FISH_HOOK_2_PLATFORM
3,
8,
128,
true,
DAMAGE__NONE,

3
source/platform/platform.cpp
View file

@ -894,9 +894,9 @@ void CNpcPlatform::render()
DVECTOR &renderPos=getRenderPos();
m_modelGfx->Render(renderPos);
}
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;
@ -920,6 +920,7 @@ void CNpcPlatform::render()
DrawLine(x1,y1,x2,y2,0,255,0,0);
#endif
}
}
}

89
source/platform/ppendulm.cpp
View file

@ -100,7 +100,7 @@ void CNpcPendulumPlatform::processMovement( int _frames )
}
else
{
m_extension += _frames << 3;
m_extension += m_speed * _frames;
}
}
else
@ -111,7 +111,7 @@ void CNpcPendulumPlatform::processMovement( int _frames )
}
else
{
m_extension -= _frames << 3;
m_extension -= m_speed * _frames;
}
}
@ -126,6 +126,8 @@ void CNpcPendulumPlatform::render()
int x1,y1,x2,y2;
int x1Boundary,y1Boundary,x2Boundary,y2Boundary;
DVECTOR offset = CLevel::getCameraPos();
if ( m_isActive )
{
CPlatformThing::render();
@ -159,53 +161,52 @@ void CNpcPendulumPlatform::render()
DrawLine(x1,y1,x2,y2,0,255,0,0);
#endif
/*
x1 = x1Boundary = Pos.vx - offset.vx;
x2 = x2Boundary = m_lineBase.vx - offset.vx;
}
y1 = y1Boundary = Pos.vy - offset.vy;
y2 = y2Boundary = m_lineBase.vy - offset.vy;
x1 = x1Boundary = Pos.vx - offset.vx;
x2 = x2Boundary = m_lineBase.vx - offset.vx;
int angle = ratan2( x1 - x2, y1 - y2 );
y1 = y1Boundary = Pos.vy - offset.vy;
y2 = y2Boundary = m_lineBase.vy - offset.vy;
if ( y2 < 0 )
int angle = ratan2( x1 - x2, y1 - y2 );
if ( y2 < 0 )
{
int yDiff = -y2;
y2 = y2Boundary = 0;
int hyp = ( yDiff << 12 ) / rcos( angle );
x2 += ( hyp * rsin( angle ) ) >> 12;
}
if ( y1 > VidGetScrH() )
{
int yDiff = y1 - VidGetScrH();
y1 = y1Boundary = VidGetScrH();
int hyp = ( yDiff << 12 ) / rcos( angle );
x1 -= ( hyp * rsin( angle ) ) >> 12;
}
if ( x1Boundary > x2Boundary )
{
int tempX = x1Boundary;
x1Boundary = x2Boundary;
x2Boundary = tempX;
}
if ( y1Boundary > y2Boundary )
{
int tempY = y1Boundary;
y1Boundary = y2Boundary;
y2Boundary = tempY;
}
if ( x2Boundary >= 0 && x1Boundary <= VidGetScrW() )
{
if ( y2Boundary >= 0 && y1Boundary <= VidGetScrH() )
{
int yDiff = -y2;
y2 = y2Boundary = 0;
int hyp = ( yDiff << 12 ) / rcos( angle );
x2 += ( hyp * rsin( angle ) ) >> 12;
DrawLine( x1, y1, x2, y2, 0, 0, 0, 0 );
}
if ( y1 > VidGetScrH() )
{
int yDiff = y1 - VidGetScrH();
y1 = y1Boundary = VidGetScrH();
int hyp = ( yDiff << 12 ) / rcos( angle );
x1 -= ( hyp * rsin( angle ) ) >> 12;
}
if ( x1Boundary > x2Boundary )
{
int tempX = x1Boundary;
x1Boundary = x2Boundary;
x2Boundary = tempX;
}
if ( y1Boundary > y2Boundary )
{
int tempY = y1Boundary;
y1Boundary = y2Boundary;
y2Boundary = tempY;
}
if ( x2Boundary >= 0 && x1Boundary <= VidGetScrW() )
{
if ( y2Boundary >= 0 && y1Boundary <= VidGetScrH() )
{
DrawLine( x1, y1, x2, y2, 0, 0, 0, 0 );
}
}
*/
}
}
}

1
source/platform/pretract.cpp
View file

@ -126,6 +126,7 @@ void CNpcRetractingPlatform::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;

1
source/platform/pseesaw.cpp
View file

@ -134,6 +134,7 @@ void CNpcSeesawPlatform::render()
m_modelGfx->Render(renderPos,&rotation,&scale);
#if defined (__USER_paul__) || defined (__USER_charles__)
DVECTOR offset = CLevel::getCameraPos();
DVECTOR size;
DVECTOR centre;
int halfLength;