From 3c08bfbf04d091f77dee47171fa0f240dd017e91 Mon Sep 17 00:00:00 2001
From: Collin Smith <collinsmith70@gmail.com>
Date: Tue, 9 Jun 2020 22:36:48 -0700
Subject: [PATCH] Added RTT field to Pinger

---
 core/src/com/riiablo/Client.java               | 14 ++++++++------
 core/src/com/riiablo/Riiablo.java              |  3 +++
 core/src/com/riiablo/engine/client/Pinger.java |  1 +
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/core/src/com/riiablo/Client.java b/core/src/com/riiablo/Client.java
index e9daff2d..6cc7a092 100644
--- a/core/src/com/riiablo/Client.java
+++ b/core/src/com/riiablo/Client.java
@@ -1,5 +1,10 @@
 package com.riiablo;
 
+import java.io.OutputStream;
+import java.text.DateFormat;
+import java.util.Calendar;
+import java.util.Collection;
+
 import com.badlogic.gdx.Application;
 import com.badlogic.gdx.Game;
 import com.badlogic.gdx.Gdx;
@@ -29,6 +34,7 @@ import com.badlogic.gdx.utils.SnapshotArray;
 import com.badlogic.gdx.utils.viewport.ExtendViewport;
 import com.badlogic.gdx.utils.viewport.ScalingViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+
 import com.riiablo.audio.Audio;
 import com.riiablo.audio.MusicController;
 import com.riiablo.audio.MusicVolumeController;
@@ -62,11 +68,6 @@ import com.riiablo.save.CharData;
 import com.riiablo.screen.AudioUnpackerScreen;
 import com.riiablo.screen.SplashScreen;
 
-import java.io.OutputStream;
-import java.text.DateFormat;
-import java.util.Calendar;
-import java.util.Collection;
-
 public class Client extends Game {
   private static final String TAG = "Client";
 
@@ -444,7 +445,8 @@ public class Client extends Game {
     StringBuilder builder = new StringBuilder(64);
     builder
         .append(Gdx.graphics.getFramesPerSecond())
-        .append('\n').append(Riiablo.ping).append(" ms")
+        .append('\n').append("Ping: ").append(Riiablo.ping).append(" ms")
+        .append('\n').append("RTT: ").append(Riiablo.rtt).append(" ms")
         ;
     fps.setText(font, builder.toString());
     int drawFpsMethod = this.drawFpsMethod;
diff --git a/core/src/com/riiablo/Riiablo.java b/core/src/com/riiablo/Riiablo.java
index 2a8be66f..35e77d55 100644
--- a/core/src/com/riiablo/Riiablo.java
+++ b/core/src/com/riiablo/Riiablo.java
@@ -1,6 +1,7 @@
 package com.riiablo;
 
 import com.artemis.World;
+
 import com.badlogic.gdx.assets.AssetManager;
 import com.badlogic.gdx.files.FileHandle;
 import com.badlogic.gdx.graphics.glutils.ShaderProgram;
@@ -9,6 +10,7 @@ import com.badlogic.gdx.utils.I18NBundle;
 import com.badlogic.gdx.utils.viewport.ExtendViewport;
 import com.badlogic.gdx.utils.viewport.ScalingViewport;
 import com.badlogic.gdx.utils.viewport.Viewport;
+
 import com.riiablo.audio.Audio;
 import com.riiablo.audio.MusicController;
 import com.riiablo.codec.D2;
@@ -68,4 +70,5 @@ public class Riiablo {
   public static GameScreen            game;
   public static D2                    anim;
   public static long                  ping;
+  public static long                  rtt;
 }
diff --git a/core/src/com/riiablo/engine/client/Pinger.java b/core/src/com/riiablo/engine/client/Pinger.java
index aaa02d51..c73d0e22 100644
--- a/core/src/com/riiablo/engine/client/Pinger.java
+++ b/core/src/com/riiablo/engine/client/Pinger.java
@@ -56,5 +56,6 @@ public class Pinger extends IntervalSystem {
 
   public void Ping(Ping packet) {
     Riiablo.ping = TimeUtils.millis() - packet.sendTime() - packet.processTime();
+    Riiablo.rtt = TimeUtils.millis() - packet.sendTime();
   }
 }