Fix build warnings
This commit is contained in:
1 parent
37895da9b2
commit
18dbb110cc
3 files changed
+16
-12
No files matched your search
@@ -104,7 +104,6 @@
|
||||
<IntDir>obj\$(Configuration).$(Platform)\</IntDir>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWin|x64'">
|
||||
<LinkIncremental>true</LinkIncremental>
|
||||
<OutDir>bin\$(Configuration).$(Platform)\</OutDir>
|
||||
<IncludePath>$(MSBuildProjectDirectory)\x64\lib\glib-2.0\include;$(MSBuildProjectDirectory)\x64\include\gstreamer-1.0;$(MSBuildProjectDirectory)\x64\include\glib-2.0;$(MSBuildProjectDirectory)\x64\include;$(IncludePath)</IncludePath>
|
||||
<LibraryPath>$(MSBuildProjectDirectory)\x64\lib;$(LibraryPath)</LibraryPath>
|
||||
|
||||
+10
-4
@@ -15,6 +15,9 @@
|
||||
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
|
||||
#endregion
|
||||
|
||||
//Uncomment to make the engine hit every note
|
||||
//#define DEBUG_HIT
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using Vocaluxe.SongQueue;
|
||||
@@ -208,8 +211,6 @@ namespace Vocaluxe.Base
|
||||
|
||||
public static void UpdatePoints(float time)
|
||||
{
|
||||
const bool DEBUG_HIT = false;
|
||||
|
||||
CSong song = _SongQueue.GetSong();
|
||||
|
||||
if (song == null)
|
||||
@@ -270,7 +271,11 @@ namespace Vocaluxe.Base
|
||||
if (line == lines.Length - 1 && beat == lines[line].LastNoteBeat)
|
||||
Players[p].SongFinished = true;
|
||||
|
||||
if (notes[note].PointsForBeat > 0 && (CSound.RecordToneValid(p) || DEBUG_HIT))
|
||||
if (notes[note].PointsForBeat > 0 && (CSound.RecordToneValid(p)
|
||||
#if DEBUG_HIT
|
||||
|| true
|
||||
#endif
|
||||
))
|
||||
{
|
||||
int tone = notes[note].Tone;
|
||||
int tonePlayer = CSound.RecordGetTone(p);
|
||||
@@ -281,8 +286,9 @@ namespace Vocaluxe.Base
|
||||
while (tonePlayer - tone < -6)
|
||||
tonePlayer += 12;
|
||||
|
||||
if (DEBUG_HIT)
|
||||
#if DEBUG_HIT
|
||||
tonePlayer = tone;
|
||||
#endif
|
||||
|
||||
Players[p].NoteDiff = Math.Abs(tone - tonePlayer);
|
||||
bool hit = Players[p].NoteDiff <= (2 - (int)CProfiles.GetDifficulty(Players[p].ProfileID));
|
||||
|
||||
@@ -15,6 +15,9 @@
|
||||
// along with Vocaluxe. If not, see <http://www.gnu.org/licenses/>.
|
||||
#endregion
|
||||
|
||||
//Uncomment to make the font write the glyphs to file
|
||||
//#define FONT_DEBUG_OUTPUT
|
||||
|
||||
using System;
|
||||
using System.Drawing;
|
||||
using System.Drawing.Drawing2D;
|
||||
@@ -119,19 +122,15 @@ namespace Vocaluxe.Base.Fonts
|
||||
_DrawBounding.Y *= _Texture.Width / _DrawBounding.Width;
|
||||
_DrawBounding.Width = _Texture.Width;
|
||||
_DrawBounding.Height = _Texture.Height;*/
|
||||
#pragma warning disable 162
|
||||
// ReSharper disable HeuristicUnreachableCode
|
||||
// ReSharper disable ConditionIsAlwaysTrueOrFalse
|
||||
if (false && Char.IsLetterOrDigit(chr))
|
||||
#if FONT_DEBUG_OUTPUT
|
||||
if (Char.IsLetterOrDigit(chr))
|
||||
{
|
||||
if (outline > 0)
|
||||
bmpCropped.Save("font_" + chr + "o" + CFonts.Style + "2.png", ImageFormat.Png);
|
||||
else
|
||||
bmpCropped.Save("font_" + chr + CFonts.Style + "2.png", ImageFormat.Png);
|
||||
}
|
||||
// ReSharper restore ConditionIsAlwaysTrueOrFalse
|
||||
// ReSharper restore HeuristicUnreachableCode
|
||||
#pragma warning restore 162
|
||||
#endif
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user