Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions packages/frontend/src/game/weapons/functions/renderWeapon.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { Nova } from "../weapons/primary/Nova/Nova";
import { RPG } from "../weapons/secondary/RPG/RPG";
import { Saiga } from "../weapons/primary/Saiga/Saiga";
import { Scorpion } from "../weapons/primary/Scorpion/Scorpion";
import { assertNever } from "@fps/lib";

interface RenderWeaponProps {
playerStateRef: React.MutableRefObject<GamePlayerState>;
Expand Down Expand Up @@ -53,7 +54,10 @@ export const RenderWeapon: React.FC<RenderWeaponProps> = ({ playerStateRef }) =>
// Melee Weapons
case "Knife":
return <Knife playerStateRef={playerStateRef} />;

// TODO: Bring back assertNever https://app.clickup.com/t/86b5v1m7h
// No Weapon
case null:
return null;
default:
return assertNever(player.currentWeapon);
}
};
2 changes: 1 addition & 1 deletion packages/lib/src/engine/slices/game/gameSlice.types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ export interface GameTeamState {
}

export interface GameGameState {
currentTimeMs: number; // TODO: Add this later when games can actually start and end https://app.clickup.com/t/86b5v1m7h
currentTimeMs: number; // TODO: Add this later when games can actually start and end https://app.clickup.com/t/86b5v1mym
}

export interface GameSliceState {
Expand Down