quake2ts 0.0.478 → 0.0.480

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

@@ -25644,23 +25644,31 @@ function PlayerNoise(who, where, type, context) {
   noise.origin = { ...where };
   context.linkentity(noise);
   const awareness = context.targetAwareness;
-  if (!awareness) return;
-  if (type === PNOISE_WEAPON) {
-    if (awareness.soundEntity === noise) {
-      awareness.soundEntityFrame = awareness.frameNumber;
-    } else {
-      awareness.sound2Entity = awareness.soundEntity;
-      awareness.sound2EntityFrame = awareness.soundEntityFrame;
-      awareness.soundEntity = noise;
-      awareness.soundEntityFrame = awareness.frameNumber;
-    }
-  } else if (type === PNOISE_SELF) {
-    if (awareness.sightEntity === noise) {
-      awareness.sightEntityFrame = awareness.frameNumber;
-    } else {
-      awareness.sightClient = noise;
+  if (awareness) {
+    if (type === PNOISE_WEAPON) {
+      if (awareness.soundEntity === noise) {
+        awareness.soundEntityFrame = awareness.frameNumber;
+      } else {
+        awareness.sound2Entity = awareness.soundEntity;
+        awareness.sound2EntityFrame = awareness.soundEntityFrame;
+        awareness.soundEntity = noise;
+        awareness.soundEntityFrame = awareness.frameNumber;
+      }
+    } else if (type === PNOISE_SELF) {
+      if (awareness.sightEntity === noise) {
+        awareness.sightEntityFrame = awareness.frameNumber;
+      } else {
+        awareness.sightClient = noise;
+      }
     }
   }
+  if (type === PNOISE_SELF || type === PNOISE_WEAPON) {
+    who.client.sound_entity = noise;
+    who.client.sound_entity_time = context.timeSeconds;
+  } else {
+    who.client.sound2_entity = noise;
+    who.client.sound2_entity_time = context.timeSeconds;
+  }
 }
 
 // src/entities/player.ts
@@ -25837,16 +25845,16 @@ function dropFlag(flag, origin, game, context) {
   flag.owner = null;
   flag.solid = 1 /* Trigger */;
   flag.model = flag.flagTeam === "red" ? "players/male/flag1.md2" : "players/male/flag2.md2";
-  const time = context.timeSeconds ?? game.time;
+  const time = context.timeSeconds;
   flag.nextthink = time + 30;
-  game.centerprintf?.(flag, `The ${flag.flagTeam} flag was dropped!`);
-  flag.think = (selfEntity, ctx) => flagThink(selfEntity, ctx, game);
+  context.engine.centerprintf?.(flag, `The ${flag.flagTeam} flag was dropped!`);
+  flag.think = (selfEntity, ctx) => flagThink(selfEntity, ctx);
 }
-function flagThink(self, context, game) {
+function flagThink(self, context) {
   const flag = self;
   if (flag.flagState === 2 /* DROPPED */) {
-    game.sound?.(flag, 0, "ctf/flagret.wav", 1, 1, 0);
-    game.centerprintf?.(flag, `The ${flag.flagTeam} flag returned to base!`);
+    context.sound(flag, 0, "ctf/flagret.wav", 1, 1, 0);
+    context.engine.centerprintf?.(flag, `The ${flag.flagTeam} flag returned to base!`);
     setFlagState(flag, 0 /* AT_BASE */, context);
     flag.origin = { ...flag.baseOrigin };
     flag.solid = 1 /* Trigger */;
@@ -25860,17 +25868,18 @@ function checkPlayerFlagDrop(player, sys) {
   const hasRedFlag = hasKey(player.client.inventory, "key_red_flag" /* RedFlag */);
   const hasBlueFlag = hasKey(player.client.inventory, "key_blue_flag" /* BlueFlag */);
   if (!hasRedFlag && !hasBlueFlag) return;
+  let foundFlag = null;
   sys.forEachEntity((ent) => {
     const flag = ent;
     if ((flag.classname === "item_flag_team1" || flag.classname === "item_flag_team2") && flag.owner === player) {
-      const game = sys._game;
-      if (game) {
-        dropFlag(flag, player.origin, game, sys);
-        player.client.inventory.keys.delete("key_red_flag" /* RedFlag */);
-        player.client.inventory.keys.delete("key_blue_flag" /* BlueFlag */);
-      }
+      foundFlag = flag;
     }
   });
+  if (foundFlag) {
+    dropFlag(foundFlag, player.origin, null, sys);
+    player.client.inventory.keys.delete("key_red_flag" /* RedFlag */);
+    player.client.inventory.keys.delete("key_blue_flag" /* BlueFlag */);
+  }
 }
 
 // src/entities/player.ts