Changeset 66:2e9e43724119

Timestamp:

11/20/07 23:31:01 (3 years ago)

Author:

mdoison

Branch:

tjw-1.2

convert_revision:

svn:7c786126-522e-0410-a822-d6d8feae56ca/branches/tjw-1.2@87

Message:

• Ping improvment (from tjw 1.2)

Location:

src/game

Files:

• g_active.c (modified) (1 diff)
• g_local.h (modified) (2 diffs)
• g_main.c (modified) (1 diff)

src/game/g_active.c

@@ -1358 +1358 @@
   }
 
+  // ucmd->serverTime is a client predicted value, but it works for making a
+  // replacement for client->ps.ping when in SPECTATOR_FOLLOW 
+  client->pers.ping = level.time - ucmd->serverTime;
+
+  // account for the one frame of delay on client side
+  client->pers.ping -= level.time - level.previousTime;
+
+  // account for the time that's elapsed since the last ClientEndFrame()
+  client->pers.ping += trap_Milliseconds() - level.frameMsec;
+
+  if( client->pers.ping < 0 )
+    client->pers.ping = 0;
+
   msec = ucmd->serverTime - client->ps.commandTime;
   // following others may result in bad times, but we still want

src/game/g_local.h

@@ -349 +349 @@
   int                 savedScore;
   int                 savedCredit;
+  int                 ping;
 
   vec3_t              lastDeathLocation;
@@ -546 +547 @@
   int               time;                         // in msec
   int               previousTime;                 // so movers can back up when blocked
+  int               frameMsec;                    // trap_Milliseconds() at end frame
 
   int               startTime;                    // level.time the map was started

src/game/g_main.c

@@ -2502 +2502 @@
     trap_Cvar_Set( "g_listEntity", "0" );
   }
+
+  level.frameMsec = trap_Milliseconds();
 }