feat: support new packet types

entity serial and frametime packets also output error when unknown packet Fixes #7 Fixes #4
p2sr · May 2, 2024 · 919a265 · 919a265
1 parent c230b73
commit 919a265
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 1 deletion.
diff --git a/src/demo.c b/src/demo.c
@@ -247,6 +247,27 @@ static int _parse_sar_data(struct sar_data *out, FILE *f, size_t len) {
 
 		break;
 
+	case SAR_DATA_ENTITY_SERIAL:
+		if (len != 8) {
+			out->type = SAR_DATA_INVALID;
+			break;
+		}
+
+		out->entity_serial.slot = _read_f32(data);
+		out->entity_serial.serial = _read_f32(data);
+
+		break;
+
+	case SAR_DATA_FRAMETIME:
+		if (len != 5) {
+			out->type = SAR_DATA_INVALID;
+			break;
+		}
+
+		out->frametime = _read_f32(data);
+
+		break;
+
 	case SAR_DATA_SPEEDRUN_TIME:
 		if (len < 5) {
 			out->type = SAR_DATA_INVALID;
@@ -307,6 +328,7 @@ static int _parse_sar_data(struct sar_data *out, FILE *f, size_t len) {
 		break;
 
 	default:
+		fprintf(g_errfile, "[SAR] Unhandled message type %02X\n", out->type);
 		out->type = SAR_DATA_INVALID;
 		break;
 	}

diff --git a/src/demo.h b/src/demo.h
@@ -29,17 +29,20 @@ struct sar_data {
 		SAR_DATA_TIMESTAMP = 0x0B,
 		SAR_DATA_FILE_CHECKSUM = 0x0C,
 		SAR_DATA_HWAIT_RUN = 0x0D,
+		SAR_DATA_ENTITY_SERIAL = 0x0E,
+		SAR_DATA_FRAMETIME = 0x0F,
 		SAR_DATA_CHECKSUM = 0xFF,
 		SAR_DATA_CHECKSUM_V2 = 0xFE,
 
-		SAR_DATA_INVALID,
+		SAR_DATA_INVALID = 0x00,
 	} type;
 
 	int slot;
 
 	union {
 		float timescale;
 		uint32_t pause_ticks;
+		float frametime;
 
 		struct {
 			char *cvar;
@@ -78,6 +81,11 @@ struct sar_data {
 			char *cmd;
 		} hwait_run;
 
+		struct {
+			int slot;
+			int serial;
+		} entity_serial;
+
 		struct {
 			size_t nsplits;
 			struct {

diff --git a/src/main.c b/src/main.c
@@ -110,6 +110,12 @@ static void _output_sar_data(uint32_t tick, struct sar_data data) {
 	case SAR_DATA_HWAIT_RUN:
 		if (g_config.show_wait) fprintf(g_outfile, "\t\t[%5u] [SAR] hwait %d ticks for '%s'\n", tick, data.hwait_run.ticks, data.hwait_run.cmd);
 		break;
+	case SAR_DATA_ENTITY_SERIAL:
+		fprintf(g_outfile, "\t\t[%5u] [SAR] Entity slot %d serial changed to %d\n", tick, data.entity_serial.slot, data.entity_serial.serial);
+		break;
+	case SAR_DATA_FRAMETIME:
+		fprintf(g_outfile, "\t\t[%5u] [SAR] Frame took %fms\n", tick, data.frametime * 1000.0f);
+		break;
 	case SAR_DATA_SPEEDRUN_TIME:
 		fprintf(g_outfile, "\t\t[%5u] [SAR] Speedrun finished with %zu splits!\n", tick, data.speedrun_time.nsplits);
 		{

diff --git a/src/util.c b/src/util.c
@@ -6,6 +6,7 @@
 #include "util.h"
 
 void util_strip_whitespace(char *str) {
+	if (strlen(str) == 0) return;
 	size_t i = 0;
 	while (isspace(str[i])) ++i;