quake2ts 0.0.262 → 0.0.266

package/packages/client/dist/esm/index.js

@@ -7136,24 +7136,29 @@ var NetworkMessageParser = class _NetworkMessageParser {
     this.stream = stream;
     this.handler = handler;
   }
+  setProtocolVersion(version) {
+    this.protocolVersion = version;
+  }
+  getProtocolVersion() {
+    return this.protocolVersion;
+  }
   translateCommand(cmd) {
     if (this.protocolVersion === 0) {
       if (cmd === 7) return ServerCommand.serverdata;
       if (cmd === 12) return ServerCommand.serverdata;
     }
-    if (this.protocolVersion === 25) {
-      if (cmd >= 7 && cmd <= 15) return cmd + 5;
-      if (cmd === 1) return ServerCommand.print;
-      if (cmd === 2) return ServerCommand.stufftext;
-      if (cmd === 3) return ServerCommand.sound;
-      if (cmd === 4) return ServerCommand.nop;
-      if (cmd === 5) return ServerCommand.disconnect;
-      if (cmd === 6) return ServerCommand.reconnect;
-      if (cmd === 16) return ServerCommand.temp_entity;
-    }
     if (this.protocolVersion === PROTOCOL_VERSION_RERELEASE) {
       return cmd;
     }
+    if (this.protocolVersion === 34 || this.protocolVersion === 25) {
+      if (cmd <= ServerCommand.frame) {
+        return cmd;
+      }
+      return ServerCommand.bad;
+    }
+    if (this.protocolVersion === 0) {
+      return cmd;
+    }
     return cmd;
   }
   parseMessage() {
@@ -7166,6 +7171,8 @@ var NetworkMessageParser = class _NetworkMessageParser {
       cmd = this.translateCommand(cmd);
       try {
         switch (cmd) {
+          case ServerCommand.bad:
+            return;
           case ServerCommand.nop:
             break;
           case ServerCommand.disconnect:
@@ -7737,9 +7744,10 @@ var NetworkMessageParser = class _NetworkMessageParser {
     const surpressCount = this.stream.readByte();
     const areaBytes = this.stream.readByte();
     const areaBits = this.stream.readData(areaBytes);
-    const piCmd = this.stream.readByte();
+    let piCmd = this.stream.readByte();
+    piCmd = this.translateCommand(piCmd);
     if (piCmd !== ServerCommand.playerinfo) {
-      throw new Error(`Expected svc_playerinfo after svc_frame, got ${piCmd}`);
+      throw new Error(`Expected svc_playerinfo after svc_frame, got ${piCmd} (translated)`);
     }
     const playerState = this.parsePlayerState();
     if (this.isDemo === RECORD_RELAY) {
@@ -7977,6 +7985,7 @@ var DemoPlaybackController = class {
     this.reader = null;
     this.state = 0;
     this.playbackSpeed = 1;
+    this.currentProtocolVersion = 0;
     this.accumulatedTime = 0;
     this.frameDuration = 100;
   }
@@ -7987,6 +7996,7 @@ var DemoPlaybackController = class {
     this.reader = new DemoReader(buffer);
     this.state = 0;
     this.accumulatedTime = 0;
+    this.currentProtocolVersion = 0;
   }
   play() {
     if (this.reader) {
@@ -8004,6 +8014,7 @@ var DemoPlaybackController = class {
       this.reader.reset();
     }
     this.accumulatedTime = 0;
+    this.currentProtocolVersion = 0;
   }
   setFrameDuration(ms) {
     this.frameDuration = ms;
@@ -8024,7 +8035,9 @@ var DemoPlaybackController = class {
         return;
       }
       const parser = new NetworkMessageParser(block.data, this.handler);
+      parser.setProtocolVersion(this.currentProtocolVersion);
       parser.parseMessage();
+      this.currentProtocolVersion = parser.getProtocolVersion();
       this.accumulatedTime -= this.frameDuration;
     }
   }