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

fixing broken Ez2 code - part I ( reaches game screen now )

Browse Source
This commit is contained in:
Bruno Figueiredo
2002-07-30 01:45:18 +00:00
parent 9ade2f771e
commit 378d27a3ed
3 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/Actor.cpp
+5 -1
View File
@@ -90,7 +90,11 @@ void Actor::Draw() // set the world matrix and calculate actor properties, the
* 2.0f * D3DX_PI ); * 2.0f * D3DX_PI );
break; break;
case spinning: case spinning:
ASSERT( false ); // ugh. What was here before! //ASSERT( false );
// ugh. What was here before!
// BBF update: This was here before (till revision 1.16):
// nothing special needed
break; break;
case vibrating: case vibrating:
m_temp_pos.x += m_fVibrationDistance * randomf(-1.0f, 1.0f) * GetZoom(); m_temp_pos.x += m_fVibrationDistance * randomf(-1.0f, 1.0f) * GetZoom();
stepmania/src/ScreenEz2SelectPlayer.cpp
+2 -2
View File
@@ -61,7 +61,7 @@ ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()
LOG->WriteLine( "ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()" ); LOG->WriteLine( "ScreenEz2SelectPlayer::ScreenEz2SelectPlayer()" );
ez2_lasttimercheck[0] = TIMER->GetTimeSinceStart(); ez2_lasttimercheck[0] = TIMER->GetTimeSinceStart();
ez2_lasttimercheck[1] = 0.0f; ez2_lasttimercheck[1] = 0.0f;
m_iSelectedStyle=0; m_iSelectedStyle=3; // by bbf: frieza, was this supposed to be 3 ?
GAMESTATE->m_CurStyle = STYLE_NONE; GAMESTATE->m_CurStyle = STYLE_NONE;
GAMESTATE->m_MasterPlayerNumber = PLAYER_INVALID; GAMESTATE->m_MasterPlayerNumber = PLAYER_INVALID;
@@ -284,7 +284,7 @@ presses the button bound to start
void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p ) void ScreenEz2SelectPlayer::MenuStart( PlayerNumber p )
{ {
//disallow multiple presses of the menu start. //disallow multiple presses of the menu start.
if (m_iSelectedStyle == 0 && p == PLAYER_1 || m_iSelectedStyle == 1 && p == PLAYER_2) if ( (m_iSelectedStyle == 0 && p == PLAYER_1) || (m_iSelectedStyle == 1 && p == PLAYER_2))
{ {
return; return;
} }
stepmania/src/ScreenGameplay.cpp
+22 -16
View File
@@ -170,11 +170,13 @@ ScreenGameplay::ScreenGameplay()
if( GAMESTATE->m_CurGame == GAME_EZ2 ) if( GAMESTATE->m_CurGame == GAME_EZ2 )
{ {
m_pScoreDisplay[p] = new ScoreDisplayNormal;
m_pScoreDisplay[p]->SetXY( SCORE_LOCALEZ2_X[p], SCORE_LOCALEZ2_Y[p] ); m_pScoreDisplay[p]->SetXY( SCORE_LOCALEZ2_X[p], SCORE_LOCALEZ2_Y[p] );
m_pScoreDisplay[p]->SetZoom( 0.5f ); m_pScoreDisplay[p]->SetZoom( 0.5f );
m_pScoreDisplay[p]->SetDiffuseColor( PlayerToColor(p) ); m_pScoreDisplay[p]->SetDiffuseColor( PlayerToColor(p) );
m_frameTop.AddSubActor( m_pScoreDisplay[p] ); m_frameTop.AddSubActor( m_pScoreDisplay[p] );
} }
} }
// TopFrame goes above LifeMeter // TopFrame goes above LifeMeter
@@ -224,29 +226,33 @@ ScreenGameplay::ScreenGameplay()
for( p=0; p<NUM_PLAYERS; p++ ) for( p=0; p<NUM_PLAYERS; p++ )
{ {
switch( GAMESTATE->m_PlayMode ) if( GAMESTATE->m_CurGame != GAME_EZ2 )
{ {
case PLAY_MODE_ARCADE: switch( GAMESTATE->m_PlayMode )
m_pScoreDisplay[p] = new ScoreDisplayNormal; {
break; case PLAY_MODE_ARCADE:
case PLAY_MODE_ONI: m_pScoreDisplay[p] = new ScoreDisplayNormal;
case PLAY_MODE_ENDLESS: break;
m_pScoreDisplay[p] = new ScoreDisplayOni; case PLAY_MODE_ONI:
break; case PLAY_MODE_ENDLESS:
default: m_pScoreDisplay[p] = new ScoreDisplayOni;
ASSERT(0); break;
} default:
ASSERT(0);
}
m_pScoreDisplay[p]->Init( (PlayerNumber)p ); m_pScoreDisplay[p]->Init( (PlayerNumber)p );
m_pScoreDisplay[p]->SetXY( SCORE_LOCAL_X[p], SCORE_LOCAL_Y[p] ); m_pScoreDisplay[p]->SetXY( SCORE_LOCAL_X[p], SCORE_LOCAL_Y[p] );
m_pScoreDisplay[p]->SetZoom( 0.8f ); m_pScoreDisplay[p]->SetZoom( 0.8f );
m_pScoreDisplay[p]->SetDiffuseColor( PlayerToColor(p) ); m_pScoreDisplay[p]->SetDiffuseColor( PlayerToColor(p) );
m_frameBottom.AddSubActor( m_pScoreDisplay[p] ); m_frameBottom.AddSubActor( m_pScoreDisplay[p] );
}
m_textPlayerOptions[p].Load( THEME->GetPathTo(FONT_NORMAL) ); m_textPlayerOptions[p].Load( THEME->GetPathTo(FONT_NORMAL) );
if( !GAMESTATE->IsPlayerEnabled(PlayerNumber(p)) ) if( !GAMESTATE->IsPlayerEnabled(PlayerNumber(p)) )
continue; continue;
if( GAMESTATE->m_CurGame != GAME_EZ2 ) if( GAMESTATE->m_CurGame != GAME_EZ2 )
{ {
m_pScoreDisplay[p]->SetXY( SCORE_LOCAL_X[p], SCORE_LOCAL_Y[p] ); m_pScoreDisplay[p]->SetXY( SCORE_LOCAL_X[p], SCORE_LOCAL_Y[p] );