quake2ts 0.0.206 → 0.0.208

package/packages/client/dist/cjs/index.cjs

@@ -3533,59 +3533,12 @@ var __export3 = (target, all) => {
 };
 var ZERO_VEC3 = { x: 0, y: 0, z: 0 };
 var DEG_TO_RAD2 = Math.PI / 180;
-function dotVec3(a, b) {
-  return a.x * b.x + a.y * b.y + a.z * b.z;
-}
-var PITCH = 0;
-var YAW = 1;
-var ROLL = 2;
 var DEG2RAD_FACTOR2 = Math.PI / 180;
 var RAD2DEG_FACTOR2 = 180 / Math.PI;
-function axisComponent(vec, axis) {
-  switch (axis) {
-    case PITCH:
-      return vec.x;
-    case YAW:
-      return vec.y;
-    case ROLL:
-    default:
-      return vec.z;
-  }
-}
-function degToRad(degrees) {
-  return degrees * DEG2RAD_FACTOR2;
-}
 function angleMod(angle2) {
   const value = angle2 % 360;
   return value < 0 ? 360 + value : value;
 }
-function angleVectors(angles) {
-  const yaw = degToRad(axisComponent(angles, YAW));
-  const pitch = degToRad(axisComponent(angles, PITCH));
-  const roll = degToRad(axisComponent(angles, ROLL));
-  const sy = Math.sin(yaw);
-  const cy = Math.cos(yaw);
-  const sp = Math.sin(pitch);
-  const cp = Math.cos(pitch);
-  const sr = Math.sin(roll);
-  const cr = Math.cos(roll);
-  const forward = {
-    x: cp * cy,
-    y: cp * sy,
-    z: -sp
-  };
-  const right = {
-    x: -sr * sp * cy - cr * -sy,
-    y: -sr * sp * sy - cr * cy,
-    z: -sr * cp
-  };
-  const up = {
-    x: cr * sp * cy - sr * -sy,
-    y: cr * sp * sy - sr * cy,
-    z: cr * cp
-  };
-  return { forward, right, up };
-}
 var CONTENTS_SOLID2 = 1 << 0;
 var CONTENTS_WINDOW2 = 1 << 1;
 var CONTENTS_AUX2 = 1 << 2;
@@ -3785,6 +3738,56 @@ function mouseDeltaToViewDelta(delta, options) {
     z: 0
   };
 }
+var PlayerStat = /* @__PURE__ */ ((PlayerStat2) => {
+  PlayerStat2[PlayerStat2["STAT_HEALTH_ICON"] = 0] = "STAT_HEALTH_ICON";
+  PlayerStat2[PlayerStat2["STAT_HEALTH"] = 1] = "STAT_HEALTH";
+  PlayerStat2[PlayerStat2["STAT_AMMO_ICON"] = 2] = "STAT_AMMO_ICON";
+  PlayerStat2[PlayerStat2["STAT_AMMO"] = 3] = "STAT_AMMO";
+  PlayerStat2[PlayerStat2["STAT_ARMOR_ICON"] = 4] = "STAT_ARMOR_ICON";
+  PlayerStat2[PlayerStat2["STAT_ARMOR"] = 5] = "STAT_ARMOR";
+  PlayerStat2[PlayerStat2["STAT_SELECTED_ICON"] = 6] = "STAT_SELECTED_ICON";
+  PlayerStat2[PlayerStat2["STAT_PICKUP_ICON"] = 7] = "STAT_PICKUP_ICON";
+  PlayerStat2[PlayerStat2["STAT_PICKUP_STRING"] = 8] = "STAT_PICKUP_STRING";
+  PlayerStat2[PlayerStat2["STAT_TIMER_ICON"] = 9] = "STAT_TIMER_ICON";
+  PlayerStat2[PlayerStat2["STAT_TIMER"] = 10] = "STAT_TIMER";
+  PlayerStat2[PlayerStat2["STAT_HELPICON"] = 11] = "STAT_HELPICON";
+  PlayerStat2[PlayerStat2["STAT_SELECTED_ITEM"] = 12] = "STAT_SELECTED_ITEM";
+  PlayerStat2[PlayerStat2["STAT_LAYOUTS"] = 13] = "STAT_LAYOUTS";
+  PlayerStat2[PlayerStat2["STAT_FRAGS"] = 14] = "STAT_FRAGS";
+  PlayerStat2[PlayerStat2["STAT_FLASHES"] = 15] = "STAT_FLASHES";
+  PlayerStat2[PlayerStat2["STAT_CHASE"] = 16] = "STAT_CHASE";
+  PlayerStat2[PlayerStat2["STAT_SPECTATOR"] = 17] = "STAT_SPECTATOR";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM1_PIC"] = 18] = "STAT_CTF_TEAM1_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM1_CAPS"] = 19] = "STAT_CTF_TEAM1_CAPS";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM2_PIC"] = 20] = "STAT_CTF_TEAM2_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM2_CAPS"] = 21] = "STAT_CTF_TEAM2_CAPS";
+  PlayerStat2[PlayerStat2["STAT_CTF_FLAG_PIC"] = 22] = "STAT_CTF_FLAG_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_JOINED_TEAM1_PIC"] = 23] = "STAT_CTF_JOINED_TEAM1_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_JOINED_TEAM2_PIC"] = 24] = "STAT_CTF_JOINED_TEAM2_PIC";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM1_HEADER"] = 25] = "STAT_CTF_TEAM1_HEADER";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAM2_HEADER"] = 26] = "STAT_CTF_TEAM2_HEADER";
+  PlayerStat2[PlayerStat2["STAT_CTF_TECH"] = 27] = "STAT_CTF_TECH";
+  PlayerStat2[PlayerStat2["STAT_CTF_ID_VIEW"] = 28] = "STAT_CTF_ID_VIEW";
+  PlayerStat2[PlayerStat2["STAT_CTF_MATCH"] = 29] = "STAT_CTF_MATCH";
+  PlayerStat2[PlayerStat2["STAT_CTF_ID_VIEW_COLOR"] = 30] = "STAT_CTF_ID_VIEW_COLOR";
+  PlayerStat2[PlayerStat2["STAT_CTF_TEAMINFO"] = 31] = "STAT_CTF_TEAMINFO";
+  PlayerStat2[PlayerStat2["STAT_WEAPONS_OWNED_1"] = 32] = "STAT_WEAPONS_OWNED_1";
+  PlayerStat2[PlayerStat2["STAT_WEAPONS_OWNED_2"] = 33] = "STAT_WEAPONS_OWNED_2";
+  PlayerStat2[PlayerStat2["STAT_AMMO_INFO_START"] = 34] = "STAT_AMMO_INFO_START";
+  PlayerStat2[PlayerStat2["STAT_POWERUP_INFO_START"] = 41] = "STAT_POWERUP_INFO_START";
+  PlayerStat2[PlayerStat2["STAT_KEY_A"] = 44] = "STAT_KEY_A";
+  PlayerStat2[PlayerStat2["STAT_KEY_B"] = 45] = "STAT_KEY_B";
+  PlayerStat2[PlayerStat2["STAT_KEY_C"] = 46] = "STAT_KEY_C";
+  PlayerStat2[PlayerStat2["STAT_ACTIVE_WHEEL_WEAPON"] = 47] = "STAT_ACTIVE_WHEEL_WEAPON";
+  PlayerStat2[PlayerStat2["STAT_COOP_RESPAWN"] = 48] = "STAT_COOP_RESPAWN";
+  PlayerStat2[PlayerStat2["STAT_LIVES"] = 49] = "STAT_LIVES";
+  PlayerStat2[PlayerStat2["STAT_HIT_MARKER"] = 50] = "STAT_HIT_MARKER";
+  PlayerStat2[PlayerStat2["STAT_SELECTED_ITEM_NAME"] = 51] = "STAT_SELECTED_ITEM_NAME";
+  PlayerStat2[PlayerStat2["STAT_HEALTH_BARS"] = 52] = "STAT_HEALTH_BARS";
+  PlayerStat2[PlayerStat2["STAT_ACTIVE_WEAPON"] = 53] = "STAT_ACTIVE_WEAPON";
+  PlayerStat2[PlayerStat2["STAT_LAST"] = 54] = "STAT_LAST";
+  return PlayerStat2;
+})(PlayerStat || {});
 var AMMO_MAX2 = 12;
 var NUM_BITS_FOR_AMMO2 = 9;
 var NUM_AMMO_STATS2 = Math.ceil(AMMO_MAX2 * NUM_BITS_FOR_AMMO2 / 16);
@@ -4021,7 +4024,6 @@ function createCGameImport(imports, state) {
 // src/hud/crosshair.ts
 var crosshairPic = null;
 var crosshairIndex = 0;
-var crosshairColor = [1, 1, 1, 1];
 var crosshairEnabled = true;
 var CROSSHAIR_NAMES = ["ch1", "ch2", "ch3"];
 var crosshairPics = [null, null, null];
@@ -4075,59 +4077,9 @@ var Cycle_Crosshair = () => {
   }
   return crosshairEnabled ? crosshairIndex : -1;
 };
-var Draw_Crosshair = (renderer, width, height) => {
-  if (crosshairEnabled && crosshairPic) {
-    const x = (width - crosshairPic.width) / 2;
-    const y = (height - crosshairPic.height) / 2;
-    renderer.drawPic(x, y, crosshairPic, crosshairColor);
-  }
-};
 
 // src/hud/icons.ts
 var import_game = require("@quake2ts/game");
-
-// src/hud/layout.ts
-var REFERENCE_WIDTH = 640;
-var REFERENCE_HEIGHT = 480;
-var getHudLayout = (width, height) => {
-  const scaleX = width / REFERENCE_WIDTH;
-  const scaleY = height / REFERENCE_HEIGHT;
-  const scale3 = Math.min(scaleX, scaleY);
-  return {
-    // Status bar numbers - Anchored Bottom-Left / Center / Right
-    HEALTH_X: 100 * scale3,
-    HEALTH_Y: height - (REFERENCE_HEIGHT - 450) * scale3,
-    ARMOR_X: 200 * scale3,
-    ARMOR_Y: height - (REFERENCE_HEIGHT - 450) * scale3,
-    AMMO_X: width - (REFERENCE_WIDTH - 540) * scale3,
-    // Anchor right? 540 is near right (640)
-    AMMO_Y: height - (REFERENCE_HEIGHT - 450) * scale3,
-    // Center print messages - Center
-    CENTER_PRINT_X: width / 2,
-    CENTER_PRINT_Y: 100 * scale3,
-    // Top anchor
-    // Weapon and powerup icons
-    WEAPON_ICON_X: 10 * scale3,
-    WEAPON_ICON_Y: height - (REFERENCE_HEIGHT - 450) * scale3,
-    POWERUP_X: width - (REFERENCE_WIDTH - 610) * scale3,
-    POWERUP_Y: height - (REFERENCE_HEIGHT - 450) * scale3,
-    scale: scale3
-  };
-};
-
-// src/hud/numbers.ts
-var Draw_Number = (renderer, x, y, value, pics, width, color) => {
-  const s = Math.abs(value).toString();
-  for (let i = 0; i < s.length; i++) {
-    const digit = parseInt(s[i]);
-    const pic = pics[digit];
-    if (pic) {
-      renderer.drawPic(x + i * width, y, pic, color);
-    }
-  }
-};
-
-// src/hud/icons.ts
 var iconPics = /* @__PURE__ */ new Map();
 var ICON_NAMES = [
   // Weapons
@@ -4203,163 +4155,6 @@ var Init_Damage = async (renderer, assets) => {
     }
   }
 };
-var Draw_Damage = (renderer, ps) => {
-  if (!ps.damageIndicators) {
-    return;
-  }
-  const screenWidth = renderer.width;
-  const screenHeight = renderer.height;
-  const { forward, right, up } = angleVectors(ps.viewAngles);
-  for (const indicator of ps.damageIndicators) {
-    const { direction, strength } = indicator;
-    const normalizedDirection = { ...direction };
-    const len2 = Math.sqrt(normalizedDirection.x * normalizedDirection.x + normalizedDirection.y * normalizedDirection.y + normalizedDirection.z * normalizedDirection.z);
-    if (len2 > 0) {
-      normalizedDirection.x /= len2;
-      normalizedDirection.y /= len2;
-      normalizedDirection.z /= len2;
-    }
-    const rightDot = dotVec3(normalizedDirection, right);
-    const forwardDot = dotVec3(normalizedDirection, forward);
-    const angle2 = Math.atan2(forwardDot, rightDot) * 180 / Math.PI;
-    let pic;
-    let x = 0;
-    let y = 0;
-    if (angle2 > -45 && angle2 <= 45) {
-      pic = damagePics.get("d_right");
-      x = screenWidth - (pic?.width || 0);
-      y = (screenHeight - (pic?.height || 0)) / 2;
-    } else if (angle2 > 45 && angle2 <= 135) {
-      pic = damagePics.get("d_up");
-      x = (screenWidth - (pic?.width || 0)) / 2;
-      y = 0;
-    } else if (angle2 > 135 || angle2 <= -135) {
-      pic = damagePics.get("d_left");
-      x = 0;
-      y = (screenHeight - (pic?.height || 0)) / 2;
-    } else {
-      pic = damagePics.get("d_down");
-      x = (screenWidth - (pic?.width || 0)) / 2;
-      y = screenHeight - (pic?.height || 0);
-    }
-    if (pic) {
-      renderer.drawPic(x, y, pic);
-    }
-  }
-};
-
-// src/hud/diagnostics.ts
-var Draw_Diagnostics = (renderer, stats) => {
-  const lines = [
-    `FPS: ${stats.fps}`,
-    `Draw Calls: ${stats.drawCalls}`,
-    `Batches: ${stats.batches}`,
-    `Faces Drawn: ${stats.facesDrawn}`,
-    `Vertices: ${stats.vertexCount}`
-  ];
-  let y = 10;
-  for (const line of lines) {
-    renderer.drawString(10, y, line);
-    y += 10;
-  }
-};
-
-// src/hud/blends.ts
-var Draw_Blends = (renderer, ps) => {
-  if (!ps.blend) return;
-  const [r, g, b, a] = ps.blend;
-  if (a > 0) {
-    renderer.drawfillRect(0, 0, renderer.width, renderer.height, [r, g, b, a]);
-  }
-};
-
-// src/hud/pickup.ts
-var Draw_Pickup = (renderer, ps) => {
-  if (!ps.pickupIcon) return;
-  const icon = iconPics.get(ps.pickupIcon);
-  if (icon) {
-    const x = renderer.width - icon.width - 10;
-    const y = renderer.height - icon.height - 10;
-    renderer.drawPic(x, y, icon);
-  }
-};
-
-// src/hud/statusbar.ts
-var import_game2 = require("@quake2ts/game");
-var colorblindMode = false;
-var Draw_StatusBar = (renderer, client, health, armor, ammo, hudNumberPics2, numberWidth2, timeMs, layout) => {
-  let healthColor = void 0;
-  if (health <= 25) {
-    if (colorblindMode) {
-      healthColor = [0.2, 0.6, 1, 1];
-    } else {
-      healthColor = [1, 0, 0, 1];
-    }
-  }
-  if (hudNumberPics2.length > 0) {
-    Draw_Number(renderer, layout.HEALTH_X, layout.HEALTH_Y, health, hudNumberPics2, numberWidth2, healthColor);
-    Draw_Number(renderer, layout.ARMOR_X, layout.ARMOR_Y, armor, hudNumberPics2, numberWidth2);
-    Draw_Number(renderer, layout.AMMO_X, layout.AMMO_Y, ammo, hudNumberPics2, numberWidth2);
-  }
-  const armorItem = client.inventory.armor;
-  if (armorItem && armorItem.armorCount > 0) {
-    const iconName = `i_${armorItem.armorType}armor`;
-    const icon = iconPics.get(iconName);
-    if (icon) {
-      renderer.drawPic(layout.ARMOR_X - 24, layout.ARMOR_Y - 2, icon);
-    }
-  }
-  const currentWeapon = client.inventory.currentWeapon;
-  if (currentWeapon) {
-    const weaponDef = Object.values(import_game2.WEAPON_ITEMS).find((w) => w.weaponId === currentWeapon);
-    if (weaponDef) {
-      const iconName = `w_${weaponDef.id.substring(7)}`;
-      const icon = iconPics.get(iconName);
-      if (icon) {
-        renderer.drawPic(layout.WEAPON_ICON_X, layout.WEAPON_ICON_Y, icon);
-      }
-    }
-  }
-  const keys = Array.from(client.inventory.keys).sort();
-  let keyY = layout.WEAPON_ICON_Y - 150 * layout.scale;
-  for (const key of keys) {
-    let iconName = "";
-    switch (key) {
-      case "blue":
-        iconName = "k_bluekey";
-        break;
-      case "red":
-        iconName = "k_redkey";
-        break;
-      case "green":
-        iconName = "k_security";
-        break;
-      case "yellow":
-        iconName = "k_pyramid";
-        break;
-    }
-    if (iconName) {
-      const icon = iconPics.get(iconName);
-      if (icon) {
-        renderer.drawPic(layout.WEAPON_ICON_X, keyY, icon);
-        keyY += icon.height + 2;
-      }
-    }
-  }
-  let powerupX = layout.POWERUP_X;
-  for (const [powerup, expiresAt] of client.inventory.powerups.entries()) {
-    if (expiresAt && expiresAt > timeMs) {
-      const iconName = `p_${powerup}`;
-      const icon = iconPics.get(iconName);
-      if (icon) {
-        renderer.drawPic(powerupX, layout.POWERUP_Y, icon);
-        const remainingSeconds = Math.ceil((expiresAt - timeMs) / 1e3);
-        Draw_Number(renderer, powerupX + icon.width + 2, layout.POWERUP_Y, remainingSeconds, hudNumberPics2, numberWidth2);
-        powerupX -= icon.width + numberWidth2 * remainingSeconds.toString().length + 8;
-      }
-    }
-  }
-};
 
 // src/hud.ts
 var hudNumberPics = [];
@@ -4381,77 +4176,6 @@ var Init_Hud = async (renderer, assets) => {
   await Init_Icons(renderer, assets);
   await Init_Damage(renderer, assets);
 };
-var Draw_Hud = (renderer, ps, client, health, armor, ammo, stats, messageSystem, subtitleSystem, timeMs) => {
-  renderer.begin2D();
-  Draw_Blends(renderer, ps);
-  if (ps.damageAlpha > 0) {
-    renderer.drawfillRect(0, 0, renderer.width, renderer.height, [1, 0, 0, ps.damageAlpha]);
-  }
-  const layout = getHudLayout(renderer.width, renderer.height);
-  Draw_StatusBar(renderer, client, health, armor, ammo, hudNumberPics, numberWidth, timeMs, layout);
-  Draw_Pickup(renderer, ps);
-  Draw_Damage(renderer, ps);
-  Draw_Diagnostics(renderer, stats);
-  messageSystem.drawCenterPrint(renderer, timeMs, layout);
-  messageSystem.drawNotifications(renderer, timeMs);
-  subtitleSystem.drawSubtitles(renderer, timeMs);
-  if (ps.centerPrint) {
-    renderer.drawCenterString(renderer.height / 2 - 20, ps.centerPrint);
-  }
-  if (ps.notify) {
-    renderer.drawString(8, 8, ps.notify);
-  }
-  Draw_Crosshair(renderer, renderer.width, renderer.height);
-  renderer.end2D();
-};
-
-// src/hud/messages.ts
-var CENTER_PRINT_DURATION = 3e3;
-var NOTIFY_DURATION = 5e3;
-var MAX_NOTIFY_MESSAGES = 4;
-var MessageSystem = class {
-  constructor() {
-    this.centerPrintMsg = null;
-    this.notifyMessages = [];
-  }
-  addCenterPrint(text, now) {
-    this.centerPrintMsg = {
-      text,
-      startTime: now,
-      duration: CENTER_PRINT_DURATION
-    };
-  }
-  addNotify(text, now) {
-    this.notifyMessages.push({
-      text,
-      startTime: now,
-      duration: NOTIFY_DURATION
-    });
-    if (this.notifyMessages.length > MAX_NOTIFY_MESSAGES) {
-      this.notifyMessages.shift();
-    }
-  }
-  drawCenterPrint(renderer, now, layout) {
-    if (!this.centerPrintMsg) return;
-    if (now > this.centerPrintMsg.startTime + this.centerPrintMsg.duration) {
-      this.centerPrintMsg = null;
-      return;
-    }
-    const width = this.centerPrintMsg.text.length * 8;
-    const y = layout.CENTER_PRINT_Y;
-    renderer.drawCenterString(y, this.centerPrintMsg.text);
-  }
-  drawNotifications(renderer, now) {
-    while (this.notifyMessages.length > 0 && now > this.notifyMessages[0].startTime + this.notifyMessages[0].duration) {
-      this.notifyMessages.shift();
-    }
-    let y = 10;
-    for (const msg of this.notifyMessages) {
-      renderer.drawString(10, y, msg.text);
-      y += 10;
-    }
-  }
-};
 
 // src/hud/subtitles.ts
 var SUBTITLE_DURATION = 3e3;
@@ -4483,20 +4207,20 @@ var SubtitleSystem = class {
 var import_cgame = require("@quake2ts/cgame");
 
 // src/demo/itemMapping.ts
+var import_game2 = require("@quake2ts/game");
 var import_game3 = require("@quake2ts/game");
 var import_game4 = require("@quake2ts/game");
-var import_game5 = require("@quake2ts/game");
 var DEMO_ITEM_MAPPING = [
   { type: "null" },
   // IT_NULL = 0
   // Armor
-  { type: "armor", id: import_game5.ArmorType.BODY },
+  { type: "armor", id: import_game4.ArmorType.BODY },
   // IT_ARMOR_BODY
-  { type: "armor", id: import_game5.ArmorType.COMBAT },
+  { type: "armor", id: import_game4.ArmorType.COMBAT },
   // IT_ARMOR_COMBAT
-  { type: "armor", id: import_game5.ArmorType.JACKET },
+  { type: "armor", id: import_game4.ArmorType.JACKET },
   // IT_ARMOR_JACKET
-  { type: "armor", id: import_game5.ArmorType.JACKET },
+  { type: "armor", id: import_game4.ArmorType.JACKET },
   // IT_ARMOR_SHARD (Handled as jacket in base game logic usually, or separate counter)
   // Power Armor
   { type: "item", id: "item_power_screen" },
@@ -4504,85 +4228,85 @@ var DEMO_ITEM_MAPPING = [
   { type: "item", id: "item_power_shield" },
   // IT_ITEM_POWER_SHIELD
   // Weapons
-  { type: "weapon", id: import_game3.WeaponId.Grapple },
+  { type: "weapon", id: import_game2.WeaponId.Grapple },
   // IT_WEAPON_GRAPPLE
-  { type: "weapon", id: import_game3.WeaponId.Blaster },
+  { type: "weapon", id: import_game2.WeaponId.Blaster },
   // IT_WEAPON_BLASTER
-  { type: "weapon", id: import_game3.WeaponId.ChainFist },
+  { type: "weapon", id: import_game2.WeaponId.ChainFist },
   // IT_WEAPON_CHAINFIST
-  { type: "weapon", id: import_game3.WeaponId.Shotgun },
+  { type: "weapon", id: import_game2.WeaponId.Shotgun },
   // IT_WEAPON_SHOTGUN
-  { type: "weapon", id: import_game3.WeaponId.SuperShotgun },
+  { type: "weapon", id: import_game2.WeaponId.SuperShotgun },
   // IT_WEAPON_SSHOTGUN
-  { type: "weapon", id: import_game3.WeaponId.Machinegun },
+  { type: "weapon", id: import_game2.WeaponId.Machinegun },
   // IT_WEAPON_MACHINEGUN
-  { type: "weapon", id: import_game3.WeaponId.EtfRifle },
+  { type: "weapon", id: import_game2.WeaponId.EtfRifle },
   // IT_WEAPON_ETF_RIFLE
-  { type: "weapon", id: import_game3.WeaponId.Chaingun },
+  { type: "weapon", id: import_game2.WeaponId.Chaingun },
   // IT_WEAPON_CHAINGUN
   // Ammo
-  { type: "ammo", id: import_game4.AmmoType.Grenades },
+  { type: "ammo", id: import_game3.AmmoType.Grenades },
   // IT_AMMO_GRENADES
-  { type: "ammo", id: import_game4.AmmoType.Trap },
+  { type: "ammo", id: import_game3.AmmoType.Trap },
   // IT_AMMO_TRAP
-  { type: "ammo", id: import_game4.AmmoType.Tesla },
+  { type: "ammo", id: import_game3.AmmoType.Tesla },
   // IT_AMMO_TESLA
   // Weapons cont.
-  { type: "weapon", id: import_game3.WeaponId.GrenadeLauncher },
+  { type: "weapon", id: import_game2.WeaponId.GrenadeLauncher },
   // IT_WEAPON_GLAUNCHER
-  { type: "weapon", id: import_game3.WeaponId.ProxLauncher },
+  { type: "weapon", id: import_game2.WeaponId.ProxLauncher },
   // IT_WEAPON_PROXLAUNCHER
-  { type: "weapon", id: import_game3.WeaponId.RocketLauncher },
+  { type: "weapon", id: import_game2.WeaponId.RocketLauncher },
   // IT_WEAPON_RLAUNCHER
-  { type: "weapon", id: import_game3.WeaponId.HyperBlaster },
+  { type: "weapon", id: import_game2.WeaponId.HyperBlaster },
   // IT_WEAPON_HYPERBLASTER
-  { type: "weapon", id: import_game3.WeaponId.IonRipper },
+  { type: "weapon", id: import_game2.WeaponId.IonRipper },
   // IT_WEAPON_IONRIPPER
-  { type: "weapon", id: import_game3.WeaponId.PlasmaBeam },
+  { type: "weapon", id: import_game2.WeaponId.PlasmaBeam },
   // IT_WEAPON_PLASMABEAM
-  { type: "weapon", id: import_game3.WeaponId.Railgun },
+  { type: "weapon", id: import_game2.WeaponId.Railgun },
   // IT_WEAPON_RAILGUN
-  { type: "weapon", id: import_game3.WeaponId.Phalanx },
+  { type: "weapon", id: import_game2.WeaponId.Phalanx },
   // IT_WEAPON_PHALANX
-  { type: "weapon", id: import_game3.WeaponId.BFG10K },
+  { type: "weapon", id: import_game2.WeaponId.BFG10K },
   // IT_WEAPON_BFG
-  { type: "weapon", id: import_game3.WeaponId.Disruptor },
+  { type: "weapon", id: import_game2.WeaponId.Disruptor },
   // IT_WEAPON_DISRUPTOR
   // Ammo
-  { type: "ammo", id: import_game4.AmmoType.Shells },
+  { type: "ammo", id: import_game3.AmmoType.Shells },
   // IT_AMMO_SHELLS
-  { type: "ammo", id: import_game4.AmmoType.Bullets },
+  { type: "ammo", id: import_game3.AmmoType.Bullets },
   // IT_AMMO_BULLETS
-  { type: "ammo", id: import_game4.AmmoType.Cells },
+  { type: "ammo", id: import_game3.AmmoType.Cells },
   // IT_AMMO_CELLS
-  { type: "ammo", id: import_game4.AmmoType.Rockets },
+  { type: "ammo", id: import_game3.AmmoType.Rockets },
   // IT_AMMO_ROCKETS
-  { type: "ammo", id: import_game4.AmmoType.Slugs },
+  { type: "ammo", id: import_game3.AmmoType.Slugs },
   // IT_AMMO_SLUGS
-  { type: "ammo", id: import_game4.AmmoType.MagSlugs },
+  { type: "ammo", id: import_game3.AmmoType.MagSlugs },
   // IT_AMMO_MAGSLUG
-  { type: "ammo", id: import_game4.AmmoType.Flechettes },
+  { type: "ammo", id: import_game3.AmmoType.Flechettes },
   // IT_AMMO_FLECHETTES
-  { type: "ammo", id: import_game4.AmmoType.Prox },
+  { type: "ammo", id: import_game3.AmmoType.Prox },
   // IT_AMMO_PROX
-  { type: "ammo", id: import_game4.AmmoType.Nuke },
+  { type: "ammo", id: import_game3.AmmoType.Nuke },
   // IT_AMMO_NUKE
-  { type: "ammo", id: import_game4.AmmoType.Rounds },
+  { type: "ammo", id: import_game3.AmmoType.Rounds },
   // IT_AMMO_ROUNDS
   // Items / Powerups
-  { type: "powerup", id: import_game3.PowerupId.QuadDamage },
+  { type: "powerup", id: import_game2.PowerupId.QuadDamage },
   // IT_ITEM_QUAD
-  { type: "powerup", id: import_game3.PowerupId.QuadFire },
+  { type: "powerup", id: import_game2.PowerupId.QuadFire },
   // IT_ITEM_QUADFIRE
-  { type: "powerup", id: import_game3.PowerupId.Invulnerability },
+  { type: "powerup", id: import_game2.PowerupId.Invulnerability },
   // IT_ITEM_INVULNERABILITY
-  { type: "powerup", id: import_game3.PowerupId.Invisibility },
+  { type: "powerup", id: import_game2.PowerupId.Invisibility },
   // IT_ITEM_INVISIBILITY
-  { type: "powerup", id: import_game3.PowerupId.Silencer },
+  { type: "powerup", id: import_game2.PowerupId.Silencer },
   // IT_ITEM_SILENCER
-  { type: "powerup", id: import_game3.PowerupId.Rebreather },
+  { type: "powerup", id: import_game2.PowerupId.Rebreather },
   // IT_ITEM_REBREATHER
-  { type: "powerup", id: import_game3.PowerupId.EnviroSuit },
+  { type: "powerup", id: import_game2.PowerupId.EnviroSuit },
   // IT_ITEM_ENVIROSUIT
   { type: "health", id: "ancient_head" },
   // IT_ITEM_ANCIENT_HEAD
@@ -4590,54 +4314,54 @@ var DEMO_ITEM_MAPPING = [
   // IT_ITEM_LEGACY_HEAD
   { type: "health", id: "adrenaline" },
   // IT_ITEM_ADRENALINE
-  { type: "powerup", id: import_game3.PowerupId.Bandolier },
+  { type: "powerup", id: import_game2.PowerupId.Bandolier },
   // IT_ITEM_BANDOLIER
-  { type: "powerup", id: import_game3.PowerupId.AmmoPack },
+  { type: "powerup", id: import_game2.PowerupId.AmmoPack },
   // IT_ITEM_PACK
-  { type: "powerup", id: import_game3.PowerupId.IRGoggles },
+  { type: "powerup", id: import_game2.PowerupId.IRGoggles },
   // IT_ITEM_IR_GOGGLES
-  { type: "powerup", id: import_game3.PowerupId.DoubleDamage },
+  { type: "powerup", id: import_game2.PowerupId.DoubleDamage },
   // IT_ITEM_DOUBLE
-  { type: "powerup", id: import_game3.PowerupId.SphereVengeance },
+  { type: "powerup", id: import_game2.PowerupId.SphereVengeance },
   // IT_ITEM_SPHERE_VENGEANCE
-  { type: "powerup", id: import_game3.PowerupId.SphereHunter },
+  { type: "powerup", id: import_game2.PowerupId.SphereHunter },
   // IT_ITEM_SPHERE_HUNTER
-  { type: "powerup", id: import_game3.PowerupId.SphereDefender },
+  { type: "powerup", id: import_game2.PowerupId.SphereDefender },
   // IT_ITEM_SPHERE_DEFENDER
-  { type: "powerup", id: import_game3.PowerupId.Doppelganger },
+  { type: "powerup", id: import_game2.PowerupId.Doppelganger },
   // IT_ITEM_DOPPELGANGER
-  { type: "powerup", id: import_game3.PowerupId.TagToken },
+  { type: "powerup", id: import_game2.PowerupId.TagToken },
   // IT_ITEM_TAG_TOKEN
   // Keys
-  { type: "key", id: import_game3.KeyId.DataCD },
+  { type: "key", id: import_game2.KeyId.DataCD },
   // IT_KEY_DATA_CD
-  { type: "key", id: import_game3.KeyId.PowerCube },
+  { type: "key", id: import_game2.KeyId.PowerCube },
   // IT_KEY_POWER_CUBE
-  { type: "key", id: import_game3.KeyId.ExplosiveCharges },
+  { type: "key", id: import_game2.KeyId.ExplosiveCharges },
   // IT_KEY_EXPLOSIVE_CHARGES
-  { type: "key", id: import_game3.KeyId.Yellow },
+  { type: "key", id: import_game2.KeyId.Yellow },
   // IT_KEY_YELLOW
-  { type: "key", id: import_game3.KeyId.PowerCore },
+  { type: "key", id: import_game2.KeyId.PowerCore },
   // IT_KEY_POWER_CORE
-  { type: "key", id: import_game3.KeyId.Pyramid },
+  { type: "key", id: import_game2.KeyId.Pyramid },
   // IT_KEY_PYRAMID
-  { type: "key", id: import_game3.KeyId.DataSpinner },
+  { type: "key", id: import_game2.KeyId.DataSpinner },
   // IT_KEY_DATA_SPINNER
-  { type: "key", id: import_game3.KeyId.Pass },
+  { type: "key", id: import_game2.KeyId.Pass },
   // IT_KEY_PASS
-  { type: "key", id: import_game3.KeyId.Blue },
+  { type: "key", id: import_game2.KeyId.Blue },
   // IT_KEY_BLUE_KEY
-  { type: "key", id: import_game3.KeyId.Red },
+  { type: "key", id: import_game2.KeyId.Red },
   // IT_KEY_RED_KEY
-  { type: "key", id: import_game3.KeyId.Green },
+  { type: "key", id: import_game2.KeyId.Green },
   // IT_KEY_GREEN_KEY
-  { type: "key", id: import_game3.KeyId.CommanderHead },
+  { type: "key", id: import_game2.KeyId.CommanderHead },
   // IT_KEY_COMMANDER_HEAD
-  { type: "key", id: import_game3.KeyId.Airstrike },
+  { type: "key", id: import_game2.KeyId.Airstrike },
   // IT_KEY_AIRSTRIKE
-  { type: "key", id: import_game3.KeyId.NukeContainer },
+  { type: "key", id: import_game2.KeyId.NukeContainer },
   // IT_KEY_NUKE_CONTAINER
-  { type: "key", id: import_game3.KeyId.Nuke },
+  { type: "key", id: import_game2.KeyId.Nuke },
   // IT_KEY_NUKE
   // Health
   { type: "health", id: "health_small" },
@@ -4649,22 +4373,22 @@ var DEMO_ITEM_MAPPING = [
   { type: "health", id: "health_mega" },
   // IT_HEALTH_MEGA
   // CTF
-  { type: "key", id: import_game3.KeyId.RedFlag },
+  { type: "key", id: import_game2.KeyId.RedFlag },
   // IT_FLAG1
-  { type: "key", id: import_game3.KeyId.BlueFlag },
+  { type: "key", id: import_game2.KeyId.BlueFlag },
   // IT_FLAG2
   // Tech
-  { type: "powerup", id: import_game3.PowerupId.TechResistance },
+  { type: "powerup", id: import_game2.PowerupId.TechResistance },
   // IT_TECH_RESISTANCE
-  { type: "powerup", id: import_game3.PowerupId.TechStrength },
+  { type: "powerup", id: import_game2.PowerupId.TechStrength },
   // IT_TECH_STRENGTH
-  { type: "powerup", id: import_game3.PowerupId.TechHaste },
+  { type: "powerup", id: import_game2.PowerupId.TechHaste },
   // IT_TECH_HASTE
-  { type: "powerup", id: import_game3.PowerupId.TechRegeneration },
+  { type: "powerup", id: import_game2.PowerupId.TechRegeneration },
   // IT_TECH_REGENERATION
-  { type: "powerup", id: import_game3.PowerupId.Flashlight },
+  { type: "powerup", id: import_game2.PowerupId.Flashlight },
   // IT_ITEM_FLASHLIGHT
-  { type: "powerup", id: import_game3.PowerupId.Compass }
+  { type: "powerup", id: import_game2.PowerupId.Compass }
   // IT_ITEM_COMPASS
 ];
 
@@ -6316,7 +6040,6 @@ function buildRenderableEntities(latestEntities, previousEntities, alpha, config
 function createClient(imports) {
   const prediction = new import_cgame2.ClientPrediction(imports.engine.trace);
   const view = new import_cgame3.ViewEffects();
-  const messageSystem = new MessageSystem();
   const subtitleSystem = new SubtitleSystem();
   const demoPlayback = new DemoPlaybackController();
   const demoHandler = new ClientNetworkHandler(imports);
@@ -6328,19 +6051,7 @@ function createClient(imports) {
   let pauseMenuFactory;
   let optionsFactory;
   const configStrings = new ClientConfigStrings();
-  demoHandler.setCallbacks({
-    onCenterPrint: (msg) => messageSystem.addCenterPrint(msg, demoHandler.latestFrame?.serverFrame ?? 0),
-    onPrint: (level, msg) => messageSystem.addNotify(msg, demoHandler.latestFrame?.serverFrame ?? 0),
-    onConfigString: (index, str3) => {
-      configStrings.set(index, str3);
-      cg.ParseConfigString(index, str3);
-    }
-  });
-  demoPlayback.setHandler(demoHandler);
   let latestFrame;
-  let lastRendered;
-  let lastView;
-  let camera;
   let clientInAutoDemo = false;
   const stateProvider = {
     get tickRate() {
@@ -6353,7 +6064,6 @@ function createClient(imports) {
     get serverFrame() {
       return demoHandler.latestServerFrame;
     },
-    // Corrected access
     get serverProtocol() {
       return 34;
     },
@@ -6368,6 +6078,18 @@ function createClient(imports) {
   };
   const cgameImport = createCGameImport(imports, stateProvider);
   const cg = (0, import_cgame2.GetCGameAPI)(cgameImport);
+  demoHandler.setCallbacks({
+    onCenterPrint: (msg) => cg.ParseCenterPrint(msg, 0, false),
+    onPrint: (level, msg) => cg.NotifyMessage(0, msg, false),
+    onConfigString: (index, str3) => {
+      configStrings.set(index, str3);
+      cg.ParseConfigString(index, str3);
+    }
+  });
+  demoPlayback.setHandler(demoHandler);
+  let lastRendered;
+  let lastView;
+  let camera;
   let fovValue = 90;
   let isZooming = false;
   if (imports.host) {
@@ -6623,6 +6345,9 @@ function createClient(imports) {
     },
     DrawHUD(stats, timeMs) {
       if (!imports.engine.renderer) return;
+      const renderer = imports.engine.renderer;
+      const width = renderer.width;
+      const height = renderer.height;
       if (lastRendered && lastRendered.client) {
         const playerState = {
           origin: lastRendered.origin,
@@ -6636,30 +6361,38 @@ function createClient(imports) {
           damageIndicators: lastRendered.damageIndicators ?? [],
           blend: lastRendered.blend ?? [0, 0, 0, 0],
           pickupIcon: lastRendered.pickupIcon,
-          centerPrint: messageSystem["centerPrintMsg"]?.text,
-          // Hack to get text for legacy state? No, Draw_Hud uses messageSystem directly now.
+          centerPrint: void 0,
+          // Handled by CGame MessageSystem now
           notify: void 0,
           // Stubs for new fields
-          stats: [],
+          // Ensure stats are safely initialized
+          stats: lastRendered.stats ? [...lastRendered.stats] : new Array(32).fill(0),
           kick_angles: ZERO_VEC32,
           gunoffset: ZERO_VEC32,
           gunangles: ZERO_VEC32,
           gunindex: 0
         };
-        const playbackState = demoPlayback.getState();
-        const hudTimeMs = playbackState === PlaybackState.Playing || playbackState === PlaybackState.Paused ? (demoHandler.latestFrame?.serverFrame || 0) * 100 : timeMs;
-        Draw_Hud(
-          imports.engine.renderer,
-          playerState,
-          lastRendered.client,
-          lastRendered.health ?? 0,
-          lastRendered.armor ?? 0,
-          lastRendered.ammo ?? 0,
-          stats,
-          messageSystem,
-          subtitleSystem,
-          hudTimeMs
+        playerState.stats[PlayerStat.STAT_HEALTH] = lastRendered.health ?? 0;
+        playerState.stats[PlayerStat.STAT_AMMO] = lastRendered.ammo ?? 0;
+        playerState.stats[PlayerStat.STAT_ARMOR] = lastRendered.armor ?? 0;
+        renderer.begin2D();
+        cg.DrawHUD(
+          0,
+          // isplit
+          null,
+          // data
+          { x: 0, y: 0, width, height },
+          // hud_vrect
+          { x: 0, y: 0, width, height },
+          // hud_safe
+          1,
+          // scale
+          0,
+          // playernum
+          playerState
         );
+        subtitleSystem.drawSubtitles(renderer, timeMs);
+        renderer.end2D();
       }
       if (menuSystem.isActive()) {
         Draw_Menu(imports.engine.renderer, menuSystem.getState(), imports.engine.renderer.width, imports.engine.renderer.height);
@@ -6703,12 +6436,10 @@ function createClient(imports) {
     },
     demoPlayback,
     ParseCenterPrint(msg) {
-      const timeMs = latestFrame?.timeMs ?? 0;
-      messageSystem.addCenterPrint(msg, timeMs);
+      cg.ParseCenterPrint(msg, 0, false);
     },
     ParseNotify(msg) {
-      const timeMs = latestFrame?.timeMs ?? 0;
-      messageSystem.addNotify(msg, timeMs);
+      cg.NotifyMessage(0, msg, false);
     },
     showSubtitle(text, soundName) {
       const timeMs = latestFrame?.timeMs ?? 0;