This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
DEMO CODE
-When a demo is playing back, all NET_SendMessages are skipped, and
-NET_GetMessages are read from the demo file.
+When a demo is playing back, all outgoing network messages are skipped, and
+incoming messages are read from the demo file.
Whenever cl.time gets past the last received message, another message is
read from the demo file.
==============================================================================
*/
+/*
+=====================
+CL_NextDemo
+
+Called to play the next demo in the demo loop
+=====================
+*/
+void CL_NextDemo (void)
+{
+ char str[1024];
+
+ if (cls.demonum == -1)
+ return; // don't play demos
+
+ if (!cls.demos[cls.demonum][0] || cls.demonum == MAX_DEMOS)
+ {
+ cls.demonum = 0;
+ if (!cls.demos[cls.demonum][0])
+ {
+ Con_Print("No demos listed with startdemos\n");
+ cls.demonum = -1;
+ return;
+ }
+ }
+
+ sprintf (str,"playdemo %s\n", cls.demos[cls.demonum]);
+ Cbuf_InsertText (str);
+ cls.demonum++;
+}
+
/*
==============
CL_StopPlayback
Called when a demo file runs out, or the user starts a game
==============
*/
+// LordHavoc: now called only by CL_Disconnect
void CL_StopPlayback (void)
{
if (!cls.demoplayback)
return;
- Qclose (cls.demofile);
+ FS_Close (cls.demofile);
cls.demoplayback = false;
cls.demofile = NULL;
- cls.state = ca_disconnected;
if (cls.timedemo)
CL_FinishTimeDemo ();
return;
len = LittleLong (net_message.cursize);
- Qwrite (cls.demofile, &len, 4);
+ FS_Write (cls.demofile, &len, 4);
for (i=0 ; i<3 ; i++)
{
f = LittleFloat (cl.viewangles[i]);
- Qwrite (cls.demofile, &f, 4);
+ FS_Write (cls.demofile, &f, 4);
}
- Qwrite (cls.demofile, net_message.data, net_message.cursize);
- Qflush (cls.demofile);
+ FS_Write (cls.demofile, net_message.data, net_message.cursize);
+ FS_Flush (cls.demofile);
}
/*
====================
-CL_GetMessage
+CL_ReadDemoMessage
-Handles recording and playback of demos, on top of NET_ code
+Handles playback of demos
====================
*/
-int CL_GetMessage (void)
+void CL_ReadDemoMessage(void)
{
- int r, i;
- float f;
-
- if (cls.demoplayback)
- {
- if (cls.demopaused) // LordHavoc: pausedemo
- return 0;
+ int r, i;
+ float f;
+
+ if (!cls.demoplayback)
+ return;
- // decide if it is time to grab the next message
- if (cls.signon == SIGNONS) // always grab until fully connected
+ // LordHavoc: pausedemo
+ if (cls.demopaused)
+ return;
+
+ while (1)
+ {
+ // decide if it is time to grab the next message
+ // always grab until fully connected
+ if (cls.signon == SIGNONS)
{
if (cls.timedemo)
{
if (host_framecount == cls.td_lastframe)
- return 0; // already read this frame's message
+ {
+ // already read this frame's message
+ return;
+ }
+ if (cls.td_lastframe == -1)
+ {
+ // we start counting on the second frame
+ // (after parsing connection stuff)
+ cls.td_startframe = host_framecount + 1;
+ }
cls.td_lastframe = host_framecount;
- // if this is the second frame, grab the real td_starttime
- // so the bogus time on the first frame doesn't count
- if (host_framecount == cls.td_startframe + 1)
+ // if this is the first official frame we can now grab the real
+ // td_starttime so the bogus time on the first frame doesn't
+ // count against the final report
+ if (host_framecount == cls.td_startframe)
cls.td_starttime = realtime;
+ if (host_framecount > cls.td_startframe + 2)
+ {
+ cls.td_minframetime = min(cls.td_minframetime, host_realframetime);
+ cls.td_maxframetime = max(cls.td_maxframetime, host_realframetime);
+ }
+ else
+ cls.td_minframetime = cls.td_maxframetime = host_realframetime;
}
- else if ( /* cl.time > 0 && */ cl.time <= cl.mtime[0])
+ else if (cl.time <= cl.mtime[0])
{
- return 0; // don't need another message yet
+ // don't need another message yet
+ return;
}
}
-
- // get the next message
- Qread (cls.demofile, &net_message.cursize, 4);
- VectorCopy (cl.mviewangles[0], cl.mviewangles[1]);
- for (i=0 ; i<3 ; i++)
+
+ // get the next message
+ FS_Read(cls.demofile, &net_message.cursize, 4);
+ net_message.cursize = LittleLong(net_message.cursize);
+ if (net_message.cursize > net_message.maxsize)
+ Host_Error("Demo message (%i) > net_message.maxsize (%i)", net_message.cursize, net_message.maxsize);
+ VectorCopy(cl.mviewangles[0], cl.mviewangles[1]);
+ for (i = 0;i < 3;i++)
{
- r = Qread (cls.demofile, &f, 4);
- cl.mviewangles[0][i] = LittleFloat (f);
+ r = FS_Read(cls.demofile, &f, 4);
+ cl.mviewangles[0][i] = LittleFloat(f);
}
-
- net_message.cursize = LittleLong (net_message.cursize);
- if (net_message.cursize > MAX_MSGLEN)
- Host_Error ("Demo message > MAX_MSGLEN");
- r = Qread (cls.demofile, net_message.data, net_message.cursize);
- if (r != net_message.cursize)
+
+ if (FS_Read(cls.demofile, net_message.data, net_message.cursize) == (size_t)net_message.cursize)
{
- CL_StopPlayback ();
- return 0;
+ MSG_BeginReading();
+ CL_ParseServerMessage();
}
-
- return 1;
- }
-
- while (1)
- {
- r = NET_GetMessage (cls.netcon);
-
- if (r != 1 && r != 2)
- return r;
-
- // discard nop keepalive message
- if (net_message.cursize == 1 && net_message.data[0] == svc_nop)
- Con_Printf ("<-- server to client keepalive\n");
else
- break;
+ {
+ CL_Disconnect();
+ return;
+ }
}
-
- if (cls.demorecording)
- CL_WriteDemoMessage ();
-
- return r;
}
if (!cls.demorecording)
{
- Con_Printf ("Not recording a demo.\n");
+ Con_Print("Not recording a demo.\n");
return;
}
CL_WriteDemoMessage ();
// finish up
- Qclose (cls.demofile);
+ FS_Close (cls.demofile);
cls.demofile = NULL;
cls.demorecording = false;
- Con_Printf ("Completed demo\n");
+ Con_Print("Completed demo\n");
}
/*
*/
void CL_Record_f (void)
{
- int c;
- char name[MAX_OSPATH];
- int track;
+ int c, track;
+ char name[MAX_OSPATH];
if (cmd_source != src_command)
return;
c = Cmd_Argc();
if (c != 2 && c != 3 && c != 4)
{
- Con_Printf ("record <demoname> [<map> [cd track]]\n");
+ Con_Print("record <demoname> [<map> [cd track]]\n");
return;
}
if (strstr(Cmd_Argv(1), ".."))
{
- Con_Printf ("Relative pathnames are not allowed.\n");
+ Con_Print("Relative pathnames are not allowed.\n");
return;
}
if (c == 2 && cls.state == ca_connected)
{
- Con_Printf("Can not record - already connected to server\nClient demo recording must be started before connecting\n");
+ Con_Print("Can not record - already connected to server\nClient demo recording must be started before connecting\n");
return;
}
-// write the forced cd track number, or -1
+ // write the forced cd track number, or -1
if (c == 4)
{
track = atoi(Cmd_Argv(3));
- Con_Printf ("Forcing CD track to %i\n", cls.forcetrack);
+ Con_Printf("Forcing CD track to %i\n", cls.forcetrack);
}
else
- track = -1;
+ track = -1;
- sprintf (name, "%s/%s", com_gamedir, Cmd_Argv(1));
-
-//
-// start the map up
-//
+ // get the demo name
+ strlcpy (name, Cmd_Argv(1), sizeof (name));
+ FS_DefaultExtension (name, ".dem", sizeof (name));
+
+ // start the map up
if (c > 2)
Cmd_ExecuteString ( va("map %s", Cmd_Argv(2)), src_command);
-
-//
-// open the demo file
-//
- COM_DefaultExtension (name, ".dem");
-
- Con_Printf ("recording to %s.\n", name);
- cls.demofile = Qopen (name, "wb");
+
+ // open the demo file
+ Con_Printf("recording to %s.\n", name);
+ cls.demofile = FS_Open (name, "wb", false);
if (!cls.demofile)
{
- Con_Printf ("ERROR: couldn't open.\n");
+ Con_Print("ERROR: couldn't open.\n");
return;
}
cls.forcetrack = track;
- Qprintf (cls.demofile, "%i\n", cls.forcetrack);
-
+ FS_Printf(cls.demofile, "%i\n", cls.forcetrack);
+
cls.demorecording = true;
}
if (Cmd_Argc() != 2)
{
- Con_Printf ("play <demoname> : plays a demo\n");
+ Con_Print("play <demoname> : plays a demo\n");
return;
}
-// SCR_BeginLoadingPlaque();
-
-//
-// disconnect from server
-//
+ // disconnect from server
CL_Disconnect ();
-
-//
-// open the demo file
-//
- strcpy (name, Cmd_Argv(1));
- COM_DefaultExtension (name, ".dem");
-
- Con_Printf ("Playing demo from %s.\n", name);
- COM_FOpenFile (name, &cls.demofile, false, true);
+ Host_ShutdownServer (false);
+
+ // update networking ports (this is mainly just needed at startup)
+ NetConn_ClientFrame();
+
+ // open the demo file
+ strlcpy (name, Cmd_Argv(1), sizeof (name));
+ FS_DefaultExtension (name, ".dem", sizeof (name));
+
+ Con_Printf("Playing demo from %s.\n", name);
+ cls.demofile = FS_Open (name, "rb", false);
if (!cls.demofile)
{
- Con_Printf ("ERROR: couldn't open.\n");
+ Con_Print("ERROR: couldn't open.\n");
cls.demonum = -1; // stop demo loop
return;
}
+ SCR_BeginLoadingPlaque ();
+
+ strlcpy(cls.demoname, name, sizeof(cls.demoname));
cls.demoplayback = true;
cls.state = ca_connected;
cls.forcetrack = 0;
- while ((c = Qgetc(cls.demofile)) != '\n')
+ while ((c = FS_Getc (cls.demofile)) != '\n')
if (c == '-')
neg = true;
else
if (neg)
cls.forcetrack = -cls.forcetrack;
-// ZOID, fscanf is evil
-// fscanf (cls.demofile, "%i\n", &cls.forcetrack);
}
/*
*/
void CL_FinishTimeDemo (void)
{
- int frames;
- double time; // LordHavoc: changed timedemo accuracy to double
-
+ int frames;
+ double time; // LordHavoc: changed timedemo accuracy to double
+ double fpsmin, fpsavg, fpsmax; // report min/avg/max fps
+
cls.timedemo = false;
-
+
// the first frame didn't count
frames = (host_framecount - cls.td_startframe) - 1;
time = realtime - cls.td_starttime;
- if (!time)
- time = 1;
- // LordHavoc: timedemo now prints out 7 digits of fraction
- Con_Printf ("%i frames %5.7f seconds %5.7f fps\n", frames, time, frames/time);
+ fpsmin = cls.td_maxframetime > 0 ? 1.0 / cls.td_maxframetime : 0;
+ fpsavg = time > 0 ? frames / time : 0;
+ fpsmax = cls.td_minframetime > 0 ? 1.0 / cls.td_minframetime : 0;
+ // LordHavoc: timedemo now prints out 7 digits of fraction, and min/avg/max
+ Con_Printf("%i frames %5.7f seconds %5.7f fps\nmin/avg/max: %5.7f/%5.7f/%5.7f\n", frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
+ Log_Printf("benchmark.log", "date %s | enginedate %s | demo %s | commandline %s | result %i frames %5.7f seconds %5.7f fps min/avg/max: %5.7f/%5.7f/%5.7f\n", Sys_TimeString("%Y-%m-%d %H:%M:%S"), buildstring, cls.demoname, cmdline.string, frames, time, fpsavg, fpsmin, fpsavg, fpsmax);
+ if (COM_CheckParm("-benchmark"))
+ Host_Quit_f();
}
/*
if (Cmd_Argc() != 2)
{
- Con_Printf ("timedemo <demoname> : gets demo speeds\n");
+ Con_Print("timedemo <demoname> : gets demo speeds\n");
return;
}
// instantly hide console and deactivate it
key_dest = key_game;
+ key_consoleactive = 0;
scr_conlines = 0;
scr_con_current = 0;
cls.timedemo = true;
- cls.td_startframe = host_framecount;
- cls.td_lastframe = -1; // get a new message this frame
+ // get first message this frame
+ cls.td_lastframe = -1;
}
projects / xonotic / darkplaces.git / blobdiff