From 160d1874a6896d6550033a7613b2ad9640e42e87 Mon Sep 17 00:00:00 2001 From: UnknownShadow200 Date: Fri, 25 Aug 2017 12:44:44 +1000 Subject: [PATCH] Don't show 'chunks/s' in top left when 0. --- ClassicalSharp/2D/Screens/StatusScreen.cs | 10 ++++++---- ClassicalSharp/Entities/Model/HumanoidModel.cs | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ClassicalSharp/2D/Screens/StatusScreen.cs b/ClassicalSharp/2D/Screens/StatusScreen.cs index de1fe179f..2430d6bfb 100644 --- a/ClassicalSharp/2D/Screens/StatusScreen.cs +++ b/ClassicalSharp/2D/Screens/StatusScreen.cs @@ -58,8 +58,10 @@ namespace ClassicalSharp.Gui.Screens { if (game.ClassicMode) { statusBuffer.AppendNum(ref index, game.ChunkUpdates).Append(ref index, " chunk updates"); } else { - statusBuffer.AppendNum(ref index, game.ChunkUpdates).Append(ref index, " chunks/s, ") - .AppendNum(ref index, game.Vertices).Append(ref index, " vertices"); + if (game.ChunkUpdates > 0) { + statusBuffer.AppendNum(ref index, game.ChunkUpdates).Append(ref index, " chunks/s, "); + } + statusBuffer.AppendNum(ref index, game.Vertices).Append(ref index, " vertices"); int ping = PingList.AveragePingMilliseconds(); if (ping != 0) { @@ -125,7 +127,7 @@ namespace ClassicalSharp.Gui.Screens { int index = 0; Texture tex = posAtlas.tex; tex.X1 = 2; tex.Width = (short)posAtlas.offset; - IGraphicsApi.Make2DQuad(ref tex, FastColour.WhitePacked, + IGraphicsApi.Make2DQuad(ref tex, FastColour.WhitePacked, game.ModelCache.vertices, ref index); Vector3I pos = Vector3I.Floor(game.LocalPlayer.Position); @@ -149,7 +151,7 @@ namespace ClassicalSharp.Gui.Screens { void UpdateHackState(bool force) { HacksComponent hacks = game.LocalPlayer.Hacks; if (force || hacks.Speeding != speeding || hacks.HalfSpeeding != halfSpeeding || hacks.Noclip != noclip || - hacks.Flying != fly || game.Fov != lastFov) { + hacks.Flying != fly || game.Fov != lastFov) { speeding = hacks.Speeding; halfSpeeding = hacks.HalfSpeeding; noclip = hacks.Noclip; fly = hacks.Flying; lastFov = game.Fov; int index = 0; diff --git a/ClassicalSharp/Entities/Model/HumanoidModel.cs b/ClassicalSharp/Entities/Model/HumanoidModel.cs index ba5dc0fd8..d09ac5f3e 100644 --- a/ClassicalSharp/Entities/Model/HumanoidModel.cs +++ b/ClassicalSharp/Entities/Model/HumanoidModel.cs @@ -101,7 +101,7 @@ namespace ClassicalSharp.Model { (skinType == SkinType.Type64x64 ? Set64 : Set); DrawRotate(-p.HeadXRadians, 0, 0, model.Head, true); - DrawPart(model.Torso); DateTime.UtcNow.mi + DrawPart(model.Torso); DrawRotate(p.anim.leftLegX, 0, p.anim.leftLegZ, model.LeftLeg, false); DrawRotate(p.anim.rightLegX, 0, p.anim.rightLegZ, model.RightLeg, false);