quake2ts 0.0.174 → 0.0.175

package/packages/game/dist/cjs/index.cjs

@@ -12916,6 +12916,45 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
     entities.beginFrame(startTimeMs / 1e3);
     entities.runFrame();
   };
+  const runPlayerMove = (player, command) => {
+    const pcmd = {
+      forwardmove: command.forwardmove,
+      sidemove: command.sidemove,
+      upmove: command.upmove,
+      buttons: command.buttons,
+      msec: command.msec,
+      angles: command.angles
+    };
+    const playerState = {
+      origin: player.origin,
+      velocity: player.velocity,
+      onGround: false,
+      // This will be calculated by pmove
+      waterLevel: player.waterlevel,
+      // Pass waterlevel
+      mins: player.mins,
+      maxs: player.maxs,
+      damageAlpha: 0,
+      damageIndicators: [],
+      viewAngles: player.angles,
+      blend: [0, 0, 0, 0]
+    };
+    const traceAdapter = (start, end) => {
+      const result = trace(start, player.mins, player.maxs, end, player, 268435457);
+      return {
+        fraction: result.fraction,
+        endpos: result.endpos,
+        allsolid: result.allsolid,
+        startsolid: result.startsolid,
+        planeNormal: result.plane?.normal
+      };
+    };
+    const pointContentsAdapter = (point) => pointcontents(point);
+    const newState = applyPmove(playerState, pcmd, traceAdapter, pointContentsAdapter);
+    player.origin = newState.origin;
+    player.velocity = newState.velocity;
+    player.angles = newState.viewAngles;
+  };
   return {
     init(startTimeMs) {
       resetState(startTimeMs);
@@ -12955,45 +12994,14 @@ function createGame({ trace, pointcontents, multicast, unicast }, engine, option
       origin = { ...player.origin };
       return player;
     },
+    clientThink(ent, cmd) {
+      runPlayerMove(ent, cmd);
+    },
     frame(step, command) {
       const context = frameLoop.advance(step);
       const player = entities.find((e) => e.classname === "player");
       if (command && player) {
-        const pcmd = {
-          forwardmove: command.forwardmove,
-          sidemove: command.sidemove,
-          upmove: command.upmove,
-          buttons: command.buttons,
-          msec: command.msec,
-          angles: command.angles
-        };
-        const playerState = {
-          origin: player.origin,
-          velocity: player.velocity,
-          onGround: false,
-          waterLevel: 0,
-          mins: player.mins,
-          maxs: player.maxs,
-          damageAlpha: 0,
-          damageIndicators: [],
-          viewAngles: player.angles,
-          blend: [0, 0, 0, 0]
-        };
-        const traceAdapter = (start, end) => {
-          const result = trace(start, player.mins, player.maxs, end, player, 268435457);
-          return {
-            fraction: result.fraction,
-            endpos: result.endpos,
-            allsolid: result.allsolid,
-            startsolid: result.startsolid,
-            planeNormal: result.plane?.normal
-          };
-        };
-        const pointContentsAdapter = (point) => pointcontents(point);
-        const newState = applyPmove(playerState, pcmd, traceAdapter, pointContentsAdapter);
-        player.origin = newState.origin;
-        player.velocity = newState.velocity;
-        player.angles = newState.viewAngles;
+        runPlayerMove(player, command);
       }
       return snapshot(context.frame);
     },