actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Coin/joint premium cleanup.

Browse Source
This commit is contained in:
Chris Danford
2003-03-09 09:25:32 +00:00
parent 40836e90a1
commit 3e003fe304
4 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/Themes/default/Graphics/ScreenSelectStyle joint premium.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

stepmania/Themes/default/metrics.ini
+3 -3
View File
@@ -35,8 +35,8 @@ ZoomSelected=1.3
SecondsBetweenComments=12 SecondsBetweenComments=12
SecondsBeforeAttract=30 SecondsBeforeAttract=30
HelpTextHome=Use &UP; &DOWN; to select, then press START HelpTextHome=Use &UP; &DOWN; to select, then press START
HelpTextPay=Press START to join in. HelpTextPay=Press START to begin.
HelpTextFree=Press START to join in. HelpTextFree=Press START to begin.
NextScreen=ScreenCaution NextScreen=ScreenCaution
[ScreenCaution] [ScreenCaution]
@@ -67,7 +67,7 @@ NextScreen2=ScreenSelectDifficulty
NextScreen3=ScreenSelectDifficulty NextScreen3=ScreenSelectDifficulty
NextScreen4=ScreenSelectDifficulty NextScreen4=ScreenSelectDifficulty
NextScreen5=ScreenSelectDifficulty NextScreen5=ScreenSelectDifficulty
JointPremiumOnCommand=x,550;y,400;xoffset,400;bounceend,0.5;xoffset,-400 JointPremiumOnCommand=x,550;y,84;xoffset,400;bounceend,0.5;xoffset,-400;glowshift
JointPremiumOffCommand=bouncebegin,0.5;xoffset,400 JointPremiumOffCommand=bouncebegin,0.5;xoffset,400
Icon1OnCommand=x,60;y,84;xoffset,-800;sleep,0.20;decelerate,0.4;xoffset,800 Icon1OnCommand=x,60;y,84;xoffset,-800;sleep,0.20;decelerate,0.4;xoffset,800
Icon1OffCommand=bouncebegin,0.5;zoomy,0 Icon1OffCommand=bouncebegin,0.5;zoomy,0
stepmania/src/BGAnimationLayer.cpp
+17 -6
View File
@@ -81,12 +81,12 @@ void BGAnimationLayer::Init()
m_fOverrideSpeed = 0; m_fOverrideSpeed = 0;
m_iNumParticles = 10; m_iNumParticles = 10;
m_bParticlesBounce = false; m_bParticlesBounce = false;
m_iNumTilesWide = 10; m_iNumTilesWide = -1;
m_iNumTilesHigh = 8; m_iNumTilesHigh = -1;
m_fTilesStartX = 0; m_fTilesStartX = 0;
m_fTilesStartY = 0; m_fTilesStartY = 0;
m_fTilesSpacingX = 64; m_fTilesSpacingX = -1;
m_fTilesSpacingY = 64; m_fTilesSpacingY = -1;
m_fTileVelocityX = 0; m_fTileVelocityX = 0;
m_fTileVelocityY = 0; m_fTileVelocityY = 0;
@@ -482,8 +482,8 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer, CString sSo
ini.GetValueF( sLayer, "OverrideSpeed", m_fOverrideSpeed ); ini.GetValueF( sLayer, "OverrideSpeed", m_fOverrideSpeed );
ini.GetValueI( sLayer, "NumParticles", m_iNumParticles ); ini.GetValueI( sLayer, "NumParticles", m_iNumParticles );
ini.GetValueB( sLayer, "ParticlesBounce", m_bParticlesBounce ); ini.GetValueB( sLayer, "ParticlesBounce", m_bParticlesBounce );
ini.GetValueI( sLayer, "NumTilesWide", m_iNumTilesWide ); // ini.GetValueI( sLayer, "NumTilesWide", m_iNumTilesWide ); // infer from spacing (or else the Update logic breaks)
ini.GetValueI( sLayer, "NumTilesHigh", m_iNumTilesHigh ); // ini.GetValueI( sLayer, "NumTilesHigh", m_iNumTilesHigh ); // infer from spacing (or else the Update logic breaks)
ini.GetValueF( sLayer, "TilesStartX", m_fTilesStartX ); ini.GetValueF( sLayer, "TilesStartX", m_fTilesStartX );
ini.GetValueF( sLayer, "TilesStartY", m_fTilesStartY ); ini.GetValueF( sLayer, "TilesStartY", m_fTilesStartY );
ini.GetValueF( sLayer, "TilesSpacingX", m_fTilesSpacingX ); ini.GetValueF( sLayer, "TilesSpacingX", m_fTilesSpacingX );
@@ -531,6 +531,17 @@ void BGAnimationLayer::LoadFromIni( CString sAniDir, CString sLayer, CString sSo
break; break;
case TYPE_TILES: case TYPE_TILES:
{ {
m_Sprites[0].Load( sPath );
if( m_fTilesSpacingX == -1 )
{
m_fTilesSpacingX = m_Sprites[0].GetUnzoomedWidth();
m_fTilesSpacingX -= 1;
}
if( m_fTilesSpacingY == -1 )
{
m_fTilesSpacingY = m_Sprites[0].GetUnzoomedHeight();
m_fTilesSpacingY -= 1;
}
m_iNumTilesWide = 2+(int)(SCREEN_WIDTH /m_fTilesSpacingX); m_iNumTilesWide = 2+(int)(SCREEN_WIDTH /m_fTilesSpacingX);
m_iNumTilesHigh = 2+(int)(SCREEN_HEIGHT/m_fTilesSpacingY); m_iNumTilesHigh = 2+(int)(SCREEN_HEIGHT/m_fTilesSpacingY);
m_iNumSprites = m_iNumTilesWide * m_iNumTilesHigh; m_iNumSprites = m_iNumTilesWide * m_iNumTilesHigh;
stepmania/src/ScreenCaution.cpp
+1 -1
View File
@@ -92,7 +92,7 @@ void ScreenCaution::MenuStart( PlayerNumber pn )
void ScreenCaution::MenuBack( PlayerNumber pn ) void ScreenCaution::MenuBack( PlayerNumber pn )
{ {
if( m_In.IsTransitioning() || m_Out.IsTransitioning() ) if( m_In.IsTransitioning() || m_Out.IsTransitioning() || m_Back.IsTransitioning() )
return; return;
this->ClearMessageQueue(); this->ClearMessageQueue();
m_Back.StartTransitioning( SM_GoToPrevScreen ); m_Back.StartTransitioning( SM_GoToPrevScreen );