[Performous-commit] Lasse Karkkainen : Party changes.

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 12ac22f3d0955328116bcb5d35e14aed28f07637

Author: Lasse Karkkainen <tro...@tr...>
Date:   Sat Aug  8 19:38:49 2009 +0300

Party changes.

---

 game/ffmpeg.cc      |    2 +-
 game/guitargraph.cc |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/game/ffmpeg.cc b/game/ffmpeg.cc
index 98a7bc6..1c167f4 100644
--- a/game/ffmpeg.cc
+++ b/game/ffmpeg.cc
@@ -12,7 +12,7 @@ extern "C" {
 #include SWSCALE_INCLUDE
 }
 
-#define USE_FFMPEG_CRASH_RECOVERY
+// #define USE_FFMPEG_CRASH_RECOVERY
 #define AUDIO_CHANNELS 2
 
 /*static*/ boost::mutex FFmpeg::s_avcodec_mutex;
diff --git a/game/guitargraph.cc b/game/guitargraph.cc
index 215975d..ee525f7 100644
--- a/game/guitargraph.cc
+++ b/game/guitargraph.cc
@@ -278,11 +278,11 @@ bool GuitarGraph::difficulty(Difficulty level) {
 
 glutil::Color const& GuitarGraph::color(int fret) const {
 	static glutil::Color fretColors[5] = {
-		glutil::Color(0.0f, 1.0f, 0.0f),
-		glutil::Color(1.0f, 0.0f, 0.0f),
-		glutil::Color(1.0f, 1.0f, 0.0f),
+		glutil::Color(0.0f, 0.9f, 0.0f),
+		glutil::Color(0.9f, 0.0f, 0.0f),
+		glutil::Color(0.8f, 0.8f, 0.0f),
 		glutil::Color(0.0f, 0.0f, 1.0f),
-		glutil::Color(1.0f, 0.5f, 0.0f)
+		glutil::Color(0.8f, 0.4f, 0.0f)
 	};
 	if (fret < 0 || fret > 4) throw std::logic_error("Invalid fret number in GuitarGraph::getColor");
 	if (m_drums) {