From 3c3ba4b5fd3080489bd7005653b5c7af8343d62f Mon Sep 17 00:00:00 2001 From: James Dansereau <106631954+jkdansereau@users.noreply.github.com> Date: Tue, 6 Oct 2026 21:27:20 -0400 Subject: [PATCH] F10: rename to "Crosshair always on" (D436), off by default; tip and docs --- .github/release-notes.md | 4 ++-- README.md | 2 +- docs/dev/findings.md | 5 ++++- port/src/optionsoverlay.c | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/release-notes.md b/.github/release-notes.md index a842b69c..15e84c08 100644 --- a/.github/release-notes.md +++ b/.github/release-notes.md @@ -34,7 +34,7 @@ staged as v0.4.1, which was never published on its own. - **Fixes you can see:** the Dam ending camera swivels onto Bond as on the N64, and rockets no longer pass through the ground. -- **New settings:** an optional crosshair when not aiming, a custom +- **New settings:** an optional always-on crosshair, a custom crosshair colour (0-255 RGB, like the Perfect Dark port), fullscreen mode, center window, crosshair opacity and crosshair colour by health, a scalable HUD overlay, and an optional update check (off by default). @@ -189,7 +189,7 @@ Menu and settings work: - Crosshair mouse pointer and scrollbar (D555, D556); long tips no longer cut off inside a level (D558). New defaults: Crouch Toggle, Look ahead off (D556, D557); same for untouched empty save folders (D559). -- Crosshair when not aiming, opt-in (D436, #123 by dolent). Crosshair colour is +- Crosshair always on, opt-in, off by default (D436, #123 by dolent). Crosshair colour is Original or Custom RGB with 0-255 sliders, as in the Perfect Dark port; a saved named preset carries over as Custom (D569). Long dropdowns stay on screen (D568). diff --git a/README.md b/README.md index 7dcfd13f..5727f6e6 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ Backspace. button names. - **Rebindable controls** for keyboard, mouse and each controller. - **HUD and crosshair options:** HUD scale (also scales the in-game options - menu), an optional crosshair when not aiming, a custom RGB crosshair color + menu), an optional always-on crosshair, a custom RGB crosshair color with adjustable opacity and a health-based color, and a no-hit-flash option. - **Full audio:** in-level music and sound effects, with music, FX and master volume and a choice of output device. diff --git a/docs/dev/findings.md b/docs/dev/findings.md index c0f2afa4..4237ff55 100644 --- a/docs/dev/findings.md +++ b/docs/dev/findings.md @@ -18356,4 +18356,7 @@ stays N64; the row got a tip; the `gunDrawSight` condition is presentation only maintainer with this request (Rule 2). Placement: Game page, right after "Show crosshair". **Owed (maintainer, by eye):** hipfire on/off, sniper zoom, and split-screen 2P with the option on. - +**Relabel (2026-10-06, maintainer):** the row reads "Crosshair always on" (was +"Crosshair when not aiming"); off by default (code default, reset table and both +display-mode presets all 0); new tip. The ini key `Video.CrosshairPersistent` is +unchanged. diff --git a/port/src/optionsoverlay.c b/port/src/optionsoverlay.c index 5112e5b3..31e220c7 100644 --- a/port/src/optionsoverlay.c +++ b/port/src/optionsoverlay.c @@ -412,7 +412,7 @@ static struct Row rows[] = { { .key="Game.NoHitFlash", .label="No hit flash", .kind=ROW_TOGGLE, .step=1, .names=kOnOff }, SEP(G2), { .key="Video.CrosshairHide", .label="Show crosshair", .kind=ROW_TOGGLE, .step=1, .names=kOnOffRev }, - { .key="Video.CrosshairPersistent", .label="Crosshair when not aiming", .kind=ROW_TOGGLE, .step=1, .names=kOnOff }, /* D436 */ + { .key="Video.CrosshairPersistent", .label="Crosshair always on", .kind=ROW_TOGGLE, .step=1, .names=kOnOff }, /* D436 */ { .key="Video.CrosshairColor", .label="Crosshair color", .kind=ROW_ENUM, .step=1, .names=kCrosshairColor }, { .key="Video.CrosshairRed", .label="Red", .kind=ROW_SLIDER, .step=5, .shownWhen="Video.CrosshairColor", .shownValue=8 }, { .key="Video.CrosshairGreen", .label="Green", .kind=ROW_SLIDER, .step=5, .shownWhen="Video.CrosshairColor", .shownValue=8 }, @@ -3755,7 +3755,7 @@ static const struct { const char *key, *help; } kRowHelp[] = { { "__DisplayMode", "Modern, original or custom graphics presets." }, { "Video.AspectMode", "Fill window fits the picture to the whole window." }, /* D560: shown only while Fill window is selected (optionsRowHelp) */ { "Video.CrosshairHide", "When off, the crosshair stays hidden, even with Sight on screen." }, - { "Video.CrosshairPersistent", "Also shows the crosshair when not aiming. The N64 shows it only in aim mode." }, + { "Video.CrosshairPersistent", "Shows the crosshair all the time. The N64 shows it only while aiming. Off by default." }, { "Video.CrosshairColor", "Original keeps the game's red sight. Custom: set Red, Green and Blue (0-255)." }, { "Video.CrosshairHealthColor", "The crosshair shifts from green to red as your health drops." }, { "Video.WidescreenAuto", "This only applies when Native widescreen is off." },