From 538eab95168a6bfd7d83d8fb186c7f7dcaa739bd Mon Sep 17 00:00:00 2001
From: Flamefire <alex@grundis.de>
Date: Wed, 24 Sep 2014 16:51:51 +0200
Subject: [PATCH] Add Assertions for color values and fix some wrong ones

---
 Vocaluxe/Screens/CScreenSing.cs          | 5 ++---
 VocaluxeLib/Menu/SingNotes/CSingNotes.cs | 8 +++++---
 VocaluxeLib/Structs.cs                   | 3 +++
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/Vocaluxe/Screens/CScreenSing.cs b/Vocaluxe/Screens/CScreenSing.cs
index 6d85cf91..7f6759df 100644
--- a/Vocaluxe/Screens/CScreenSing.cs
+++ b/Vocaluxe/Screens/CScreenSing.cs
@@ -18,7 +18,6 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
-using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
@@ -1200,8 +1199,8 @@ namespace Vocaluxe.Screens
                     }
                     else
                     {
-                        _Statics[_StaticSongText].Color.A = 10f - t / 3f;
-                        _Texts[_TextSongName].Color.A = 10f - t / 3f;
+                        _Statics[_StaticSongText].Color.A = (10f - t) / 3f;
+                        _Texts[_TextSongName].Color.A = (10f - t) / 3f;
                     }
                 }
                 else
diff --git a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
index a91a53dd..a619af79 100644
--- a/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
+++ b/VocaluxeLib/Menu/SingNotes/CSingNotes.cs
@@ -332,7 +332,7 @@ namespace VocaluxeLib.Menu.SingNotes
                         );
 
                     _DrawNoteBG(rect, color, 1f, _PlayerNotes[n].Timer);
-                    _DrawNote(rect, new SColorF(5f, 5f, 5f, 0.7f * _PlayerNotes[n].Alpha), 0.7f);
+                    _DrawNote(rect, new SColorF(1f, 1f, 1f, 0.7f * _PlayerNotes[n].Alpha), 0.7f);
 
                     if (note.Type == ENoteType.Golden)
                     {
@@ -541,10 +541,12 @@ namespace VocaluxeLib.Menu.SingNotes
 
         protected void _DrawNoteLines(SRectF rect, SColorF color)
         {
+            int x1 = (int)rect.X;
+            int x2 = (int)(rect.X + rect.W);
             for (int i = 0; i < CBase.Settings.GetNumNoteLines() - 1; i++)
             {
-                float y = rect.Y + rect.H / CBase.Settings.GetNumNoteLines() * (i + 1);
-                CBase.Drawing.DrawColor(color, new SRectF(rect.X, y, rect.W, 1, -1.0f));
+                int y = (int)(rect.Y + rect.H / CBase.Settings.GetNumNoteLines() * (i + 1));
+                CBase.Drawing.DrawLine(color, 1, x1, y, x2, y);
             }
         }
 
diff --git a/VocaluxeLib/Structs.cs b/VocaluxeLib/Structs.cs
index d0c73628..dcbb33ac 100644
--- a/VocaluxeLib/Structs.cs
+++ b/VocaluxeLib/Structs.cs
@@ -17,6 +17,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Drawing;
 using System.Windows.Forms;
 using VocaluxeLib.Songs;
@@ -34,6 +35,8 @@ namespace VocaluxeLib
 
         public SColorF(float r, float g, float b, float a)
         {
+            Debug.Assert(r.IsInRange(0, 1) && g.IsInRange(0, 1) && b.IsInRange(0, 1));
+            Debug.Assert(a.IsInRange(0, 1));
             R = r;
             G = g;
             B = b;