diff --git a/.gitignore b/.gitignore index 7909218..d62abe9 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ obj Debug Release +Builds *.ncb *.suo *.user diff --git a/CustomDevice/CustomDevice.csproj b/CustomDevice/CustomDevice.csproj index 29139a9..55c0ecc 100644 --- a/CustomDevice/CustomDevice.csproj +++ b/CustomDevice/CustomDevice.csproj @@ -104,6 +104,6 @@ --> - copy $(TargetPath) $(SolutionDir)\Builds\$(ConfigurationName)\ + xcopy $(TargetPath) $(SolutionDir)Builds\$(ConfigurationName)\ /Y \ No newline at end of file diff --git a/CustomDevice/Utils.cs b/CustomDevice/Utils.cs index 60b23be..43e5075 100644 --- a/CustomDevice/Utils.cs +++ b/CustomDevice/Utils.cs @@ -25,14 +25,14 @@ namespace CustomDevice { static class Utils { - private static bool isInterNet2, isInterNet2Set = false; + private static bool isDNA, isDNASet = false; public static bool IsInterNet2 { get { - if (!isInterNet2Set) { - isInterNet2 = Environment.OSVersion.VersionString.EndsWith("(InterNet2)"); - isInterNet2Set = true; + if (!isDNASet) { + isDNA = Environment.OSVersion.VersionString.EndsWith("(DNA)"); + isDNASet = true; } - return isInterNet2; + return isDNA; } } diff --git a/Snake/Program.cs b/Snake/Program.cs index ccad090..6144a8f 100644 --- a/Snake/Program.cs +++ b/Snake/Program.cs @@ -97,7 +97,7 @@ } r = rnd.Next(1000); if (r < 20) { - snakePit.AddObsticle(); + snakePit.AddObstacle(); } } snakePit.Msg(crashType.ToString()); diff --git a/Snake/Snake.csproj b/Snake/Snake.csproj index b87f9ba..e85fdd1 100644 --- a/Snake/Snake.csproj +++ b/Snake/Snake.csproj @@ -107,6 +107,6 @@ --> - copy $(TargetPath) $(SolutionDir)\Builds\$(ConfigurationName)\ + xcopy $(TargetPath) $(SolutionDir)Builds\$(ConfigurationName)\ /Y \ No newline at end of file diff --git a/Snake/SnakePit.cs b/Snake/SnakePit.cs index a6335f5..ff4b55f 100644 --- a/Snake/SnakePit.cs +++ b/Snake/SnakePit.cs @@ -248,7 +248,7 @@ return Math.Max(Math.Abs(dx), Math.Abs(dy)); } - public void AddObsticle() { + public void AddObstacle() { Point[] obs; for (; ; ) { int x = this.rnd.Next(this.numCellsX - 1); diff --git a/System.Core/System.Core.csproj b/System.Core/System.Core.csproj index 6459609..649c280 100644 --- a/System.Core/System.Core.csproj +++ b/System.Core/System.Core.csproj @@ -59,7 +59,7 @@ - copy $(TargetPath) $(SolutionDir)\Builds\$(ConfigurationName)\ + xcopy $(TargetPath) $(SolutionDir)Builds\$(ConfigurationName)\ /Y - copy $(TargetPath) $(SolutionDir)\Builds\$(ConfigurationName)\ + xcopy $(TargetPath) $(SolutionDir)Builds\$(ConfigurationName)\ /Y \ No newline at end of file diff --git a/System/System.csproj b/System/System.csproj index e4a7892..041c59f 100644 --- a/System/System.csproj +++ b/System/System.csproj @@ -121,6 +121,6 @@ --> - copy $(TargetPath) $(SolutionDir)\Builds\$(ConfigurationName)\ + xcopy $(TargetPath) $(SolutionDir)Builds\$(ConfigurationName)\ /Y \ No newline at end of file diff --git a/corlib/System/OperatingSystem.cs b/corlib/System/OperatingSystem.cs index 642603a..e446c94 100644 --- a/corlib/System/OperatingSystem.cs +++ b/corlib/System/OperatingSystem.cs @@ -82,7 +82,7 @@ break; } - return str + " " + this.version.ToString() + " (InterNet2)"; + return str + " " + this.version.ToString() + " (DNA)"; } #region ICloneable Members diff --git a/corlib/corlib.csproj b/corlib/corlib.csproj index 21a5a33..0f58710 100644 --- a/corlib/corlib.csproj +++ b/corlib/corlib.csproj @@ -283,6 +283,6 @@ --> - copy $(TargetPath) $(SolutionDir)\Builds\$(ConfigurationName)\ + xcopy $(TargetPath) $(SolutionDir)Builds\$(ConfigurationName)\ /Y \ No newline at end of file diff --git a/libIGraph/BitmapLoader.c b/libIGraph/BitmapLoader.c index 8df3712..61395ae 100644 --- a/libIGraph/BitmapLoader.c +++ b/libIGraph/BitmapLoader.c @@ -635,7 +635,6 @@ // It's a bmp file printf("BMP\n"); pBmp = LoadBMP(pFile, pWidth, pHeight, pPixelFormat); - printf("1\n"); } else if (pFile[0] == 'G' && pFile[1] == 'I' && pFile[2] == 'F') { @@ -647,10 +646,8 @@ // It's a JPEG file pBmp = LoadJPEG(pFile, fileSize, pWidth, pHeight, pPixelFormat); } - printf("2\n"); free(pFile); - printf("3\n"); return pBmp; }