diff --git a/ClassicalSharp/Entities/Components/ShadowComponent.cs b/ClassicalSharp/Entities/Components/ShadowComponent.cs index 31e2260cf..5f5d158d5 100644 --- a/ClassicalSharp/Entities/Components/ShadowComponent.cs +++ b/ClassicalSharp/Entities/Components/ShadowComponent.cs @@ -201,7 +201,7 @@ namespace ClassicalSharp.Entities { using( FastBitmap fastBmp = new FastBitmap( bmp, true, false ) ) { int inPix = new FastColour( 0, 0, 0, 200 ).ToArgb(); - int outPix = inPix & 0xFFFFFF; + int outPix = new FastColour( 0, 0, 0, 0 ).ToArgb(); for( int y = 0; y < fastBmp.Height; y++ ) { int* row = fastBmp.GetRowPtr( y ); for( int x = 0; x < fastBmp.Width; x++ ) { diff --git a/ClassicalSharp/Generator/NotchyGenerator.Utils.cs b/ClassicalSharp/Generator/NotchyGenerator.Utils.cs index ee87b8e23..f8c1c2869 100644 --- a/ClassicalSharp/Generator/NotchyGenerator.Utils.cs +++ b/ClassicalSharp/Generator/NotchyGenerator.Utils.cs @@ -8,7 +8,6 @@ using System.Collections.Generic; namespace ClassicalSharp.Generator { - // TODO: figure out how noise functions differ, probably based on rnd. public sealed partial class NotchyGenerator { void FillOblateSpheroid( int x, int y, int z, float radius, byte block ) { diff --git a/ClassicalSharp/Network/NetworkProcessor.CPE.cs b/ClassicalSharp/Network/NetworkProcessor.CPE.cs index 451e6df86..360eeea18 100644 --- a/ClassicalSharp/Network/NetworkProcessor.CPE.cs +++ b/ClassicalSharp/Network/NetworkProcessor.CPE.cs @@ -165,7 +165,7 @@ namespace ClassicalSharp.Net { void HandleCpeSetTextHotkey() { string label = reader.ReadAsciiString(); - string action = reader.ReadAsciiString(); + string action = reader.ReadCp437String(); int keyCode = reader.ReadInt32(); byte keyMods = reader.ReadUInt8(); @@ -173,7 +173,7 @@ namespace ClassicalSharp.Net { Key key = LwjglToKey.Map[keyCode]; if( key == Key.Unknown ) return; - Console.WriteLine( "CPE Hotkey added: " + key + "," + keyMods + " : " + action ); + Utils.LogDebug( "CPE Hotkey added: " + key + "," + keyMods + " : " + action ); if( action == "" ) { game.InputHandler.Hotkeys.RemoveHotkey( key, keyMods ); } else if( action[action.Length - 1] == '\n' ) { diff --git a/ClassicalSharp/Network/NetworkProcessor.CPECustom.cs b/ClassicalSharp/Network/NetworkProcessor.CPECustom.cs index f03a20834..653eaa035 100644 --- a/ClassicalSharp/Network/NetworkProcessor.CPECustom.cs +++ b/ClassicalSharp/Network/NetworkProcessor.CPECustom.cs @@ -66,7 +66,7 @@ namespace ClassicalSharp.Net { BlockInfo info = game.BlockInfo; info.ResetBlockInfo( block, false ); - info.Name[block] = reader.ReadAsciiString(); + info.Name[block] = reader.ReadCp437String(); info.Collide[block] = (CollideType)reader.ReadUInt8(); if( info.Collide[block] != CollideType.Solid ) { info.IsTransparent[block] = true; diff --git a/ClassicalSharp/Network/NetworkProcessor.Original.cs b/ClassicalSharp/Network/NetworkProcessor.Original.cs index d4879d97d..1ea55a902 100644 --- a/ClassicalSharp/Network/NetworkProcessor.Original.cs +++ b/ClassicalSharp/Network/NetworkProcessor.Original.cs @@ -263,7 +263,7 @@ namespace ClassicalSharp.Net { } void HandleKick() { - string reason = reader.ReadAsciiString(); + string reason = reader.ReadCp437String(); game.Disconnect( "&eLost connection to the server", reason ); Dispose(); } diff --git a/ClassicalSharp/Utils/Camera.cs b/ClassicalSharp/Utils/Camera.cs index 600af9caa..98785abf4 100644 --- a/ClassicalSharp/Utils/Camera.cs +++ b/ClassicalSharp/Utils/Camera.cs @@ -32,10 +32,10 @@ namespace ClassicalSharp { public virtual void GetPickedBlock( PickedPos pos ) { } protected float AdjustPitch( float value ) { - if( value >= 90.00f && value <= 90.25f ) return 90.25f * Utils.Deg2Rad; - if( value >= 89.75f && value <= 90.00f ) return 89.75f * Utils.Deg2Rad; - if( value >= 270.00f && value <= 270.25f ) return 270.25f * Utils.Deg2Rad; - if( value >= 269.75f && value <= 270.00f ) return 269.75f * Utils.Deg2Rad; + if( value >= 90.0f && value <= 90.1f ) return 90.1f * Utils.Deg2Rad; + if( value >= 89.9f && value <= 90.0f ) return 89.9f * Utils.Deg2Rad; + if( value >= 270.0f && value <= 270.1f ) return 270.1f * Utils.Deg2Rad; + if( value >= 269.9f && value <= 270.0f ) return 269.9f * Utils.Deg2Rad; return value * Utils.Deg2Rad; } }