From 5efa7e10bd1ff4394c5425713732208cd33a402b Mon Sep 17 00:00:00 2001 From: Tobias Loose Date: Sat, 7 Dec 2013 13:01:14 +0100 Subject: [PATCH] Remove test debug output. Fix HUD fading. --- projects/mtg/src/CarouselDeckView.cpp | 1 - projects/mtg/src/GameStateDeckViewer.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/projects/mtg/src/CarouselDeckView.cpp b/projects/mtg/src/CarouselDeckView.cpp index 0bd0bf969..bf2ec4ea0 100644 --- a/projects/mtg/src/CarouselDeckView.cpp +++ b/projects/mtg/src/CarouselDeckView.cpp @@ -132,7 +132,6 @@ MTGCard * CarouselDeckView::Click(int x, int y) } else { - DebugTrace(">>>>> " << n); changePosition(n - 2); } } diff --git a/projects/mtg/src/GameStateDeckViewer.cpp b/projects/mtg/src/GameStateDeckViewer.cpp index 17c1041ae..ec19d9b7e 100644 --- a/projects/mtg/src/GameStateDeckViewer.cpp +++ b/projects/mtg/src/GameStateDeckViewer.cpp @@ -386,7 +386,7 @@ void GameStateDeckViewer::Update(float dt) //Prevent screen from updating. return; } - hudAlpha = 255 - ((int) last_user_activity * 500); + hudAlpha = 255 - (int)(MAX(last_user_activity-2.0f, 0) * 500); if (hudAlpha < 0) hudAlpha = 0; if (subMenu) {