quake2ts 0.0.206 → 0.0.208

package/packages/cgame/dist/index.js

@@ -169,23 +169,22 @@ var MessageSystem = class {
   clearCenterPrint() {
     this.centerPrintMsg = null;
   }
-  drawCenterPrint(renderer, now, layout) {
+  drawCenterPrint(cgi3, now, layout) {
     if (!this.centerPrintMsg) return;
     if (now > this.centerPrintMsg.startTime + this.centerPrintMsg.duration) {
       this.centerPrintMsg = null;
       return;
     }
-    this.centerPrintMsg.text.length * 8;
     const y = layout.CENTER_PRINT_Y;
-    renderer.drawCenterString(y, this.centerPrintMsg.text);
+    cgi3.SCR_DrawCenterString(y, this.centerPrintMsg.text);
   }
-  drawNotifications(renderer, now) {
+  drawNotifications(cgi3, 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);
+      cgi3.SCR_DrawFontString(10, y, msg.text);
       y += 10;
     }
   }
@@ -228,8 +227,7 @@ var Draw_StatusBar = (cgi3, ps, hudNumberPics2, numberWidth2, timeMs, layout) =>
   const health = ps.stats[PlayerStat.STAT_HEALTH] || 0;
   const armor = ps.stats[PlayerStat.STAT_ARMOR] || 0;
   const ammo = ps.stats[PlayerStat.STAT_AMMO] || 0;
-  ps.stats[PlayerStat.STAT_ARMOR_ICON] || 0;
-  ps.stats[PlayerStat.STAT_AMMO_ICON] || 0;
+  const armorIconIdx = ps.stats[PlayerStat.STAT_ARMOR_ICON] || 0;
   let healthColor = void 0;
   if (health <= 25) {
     {
@@ -241,11 +239,31 @@ var Draw_StatusBar = (cgi3, ps, hudNumberPics2, numberWidth2, timeMs, layout) =>
     Draw_Number(cgi3, layout.ARMOR_X, layout.ARMOR_Y, armor, hudNumberPics2, numberWidth2);
     Draw_Number(cgi3, layout.AMMO_X, layout.AMMO_Y, ammo, hudNumberPics2, numberWidth2);
   }
+  if (armorIconIdx > 0) {
+    const iconName = cgi3.get_configstring(ConfigStringIndex.Images + armorIconIdx);
+    if (iconName) {
+      const icon = cgi3.Draw_RegisterPic(iconName);
+      if (icon) {
+        cgi3.SCR_DrawPic(layout.ARMOR_X - 24, layout.ARMOR_Y - 2, icon);
+      }
+    }
+  }
   if (ps.pickupIcon) {
     const icon = cgi3.Draw_RegisterPic(ps.pickupIcon);
     if (icon) {
       cgi3.SCR_DrawPic(layout.WEAPON_ICON_X, layout.WEAPON_ICON_Y, icon);
     }
+  } else {
+    const selectedIconIdx = ps.stats[PlayerStat.STAT_SELECTED_ICON] || 0;
+    if (selectedIconIdx > 0) {
+      const iconName = cgi3.get_configstring(ConfigStringIndex.Images + selectedIconIdx);
+      if (iconName) {
+        const icon = cgi3.Draw_RegisterPic(iconName);
+        if (icon) {
+          cgi3.SCR_DrawPic(layout.WEAPON_ICON_X, layout.WEAPON_ICON_Y, icon);
+        }
+      }
+    }
   }
 };
 
@@ -325,6 +343,8 @@ function CG_DrawHUD(isplit, data, hud_vrect, hud_safe, scale2, playernum, ps) {
       y += 16;
     }
   }
+  messageSystem.drawCenterPrint(cgi, timeMs, layout);
+  messageSystem.drawNotifications(cgi, timeMs);
   Draw_Crosshair(cgi, hud_vrect.width, hud_vrect.height);
 }
 function CG_GetMessageSystem() {