* Make scrolling depend on dt
This commit is contained in:
jean.chalard
2008-11-21 16:04:44 +00:00
parent e4f531639b
commit 2f32cc8642
+3 -4
View File
@@ -265,7 +265,6 @@ class GameStateDeckViewer: public GameState, public JGuiListener
virtual void Update(float dt) virtual void Update(float dt)
{ {
hudAlpha = 255-(last_user_activity * 500); hudAlpha = 255-(last_user_activity * 500);
if (hudAlpha < 0) hudAlpha = 0; if (hudAlpha < 0) hudAlpha = 0;
if (sellMenu){ if (sellMenu){
@@ -356,11 +355,11 @@ class GameStateDeckViewer: public GameState, public JGuiListener
}else if (mStage == STAGE_TRANSITION_RIGHT || mStage == STAGE_TRANSITION_LEFT) { }else if (mStage == STAGE_TRANSITION_RIGHT || mStage == STAGE_TRANSITION_LEFT) {
//mAlpha = 128; //mAlpha = 128;
if (mStage == STAGE_TRANSITION_RIGHT){ if (mStage == STAGE_TRANSITION_RIGHT){
mRotation -= 0.05f; mRotation -= dt * 10;
}else if(mStage == STAGE_TRANSITION_LEFT){ }else if(mStage == STAGE_TRANSITION_LEFT){
mRotation += 0.05f; mRotation += dt * 10;
} }
if (fabs(mRotation) > 1.0f){ while (fabs(mRotation) > 1.0f){
rotateCards(mStage); rotateCards(mStage);
mRotation = 0; mRotation = 0;
mStage = STAGE_WAITING; mStage = STAGE_WAITING;