Add trap_GetPings; remove ping from playerstate

Author: slipher

src/engine/qcommon/q_shared.h

@@ -1928,7 +1928,6 @@ union OpaquePlayerState {
 	struct {
 		// These fields must be identical to ones at the start of playerState_t
 		vec3_t origin;
-		int ping; // shouldn't even be here?
 		int persistant[16];
 		int    viewheight;
 		int clientNum;

src/engine/server/sg_msgdef.h

@@ -45,6 +45,7 @@ enum gameImport_t
   G_GEN_FINGERPRINT,
   G_GET_PLAYER_PUBKEY,
   G_GET_TIME_STRING,
+  G_GET_PINGS,
 
   BOT_ALLOCATE_CLIENT,
   BOT_FREE_CLIENT,
@@ -102,6 +103,10 @@ using GetTimeStringMsg = IPC::SyncMessage<
     IPC::Message<IPC::Id<VM::QVM, G_GET_TIME_STRING>, int, std::string, qtime_t>,
     IPC::Reply<std::string>
 >;
+using GetPingsMsg = IPC::SyncMessage<
+    IPC::Message<IPC::Id<VM::QVM, G_GET_PINGS>>,
+    IPC::Reply<std::vector<int>>
+>;
 
 using BotAllocateClientMsg = IPC::SyncMessage<
 	IPC::Message<IPC::Id<VM::QVM, BOT_ALLOCATE_CLIENT>>,

src/engine/server/sv_main.cpp

@@ -1210,10 +1210,6 @@ void SV_CalcPings()
 				cl->ping = 999;
 			}
 		}
-
-		// let the game module know about the ping
-		OpaquePlayerState* ps = SV_GameClientNum( i );
-		ps->ping = cl->ping;
 	}
 }
 

src/engine/server/sv_sgame.cpp

@@ -564,6 +564,16 @@ void GameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& chan
 		});
 		break;
 
+	case G_GET_PINGS:
+		IPC::HandleMsg<GetPingsMsg>(channel, std::move(reader), [this](std::vector<int>& pings) {
+			int count = sv_maxclients->integer;
+			pings.resize(count);
+			for (int i = 0; i < count; i++) {
+				pings[i] = svs.clients[i].ping;
+			}
+		});
+		break;
+
 	case BOT_ALLOCATE_CLIENT:
 		IPC::HandleMsg<BotAllocateClientMsg>(channel, std::move(reader), [this](int& output) {
 			output = SV_BotAllocateClient();

src/shared/server/sg_api.cpp

@@ -144,6 +144,15 @@ void trap_GetTimeString(char *buffer, int size, const char *format, const qtime_
     Q_strncpyz(buffer, text.c_str(), size);
 }
 
+// length of returned vector is sv_maxclients
+std::vector<int> trap_GetPings()
+{
+    std::vector<int> pings;
+    VM::SendMsg<GetPingsMsg>(pings);
+    return pings;
+}
+
+
 int trap_BotAllocateClient()
 {
     int res;

src/shared/server/sg_api.h

@@ -53,5 +53,6 @@ int              trap_RSA_GenerateMessage( const char *public_key, char *clearte
 void             trap_GenFingerprint( const char *pubkey, int size, char *buffer, int bufsize );
 void             trap_GetPlayerPubkey( int clientNum, char *pubkey, int size );
 void             trap_GetTimeString( char *buffer, int size, const char *format, const qtime_t *tm );
+std::vector<int> trap_GetPings();
 
 #endif