Skip to content

Change block interaction override to crouch keybind instead of shift #2531

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hazelmeowing wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Change block interaction override to crouch keybind instead of shift #2531

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/game.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,14 +529,14 @@ pub const Player = struct { // MARK: Player
}
}

pub fn placeBlock(mods: main.Window.Key.Modifiers) void {
pub fn placeBlock() void {
if (main.renderer.MeshSelection.selectedBlockPos) |blockPos| {
if (!mods.shift) {
if (!KeyBoard.key("crouch").pressed) {
if (main.renderer.mesh_storage.triggerOnInteractBlockFromRenderThread(blockPos[0], blockPos[1], blockPos[2]) == .handled) return;
}
const block = main.renderer.mesh_storage.getBlockFromRenderThread(blockPos[0], blockPos[1], blockPos[2]) orelse main.blocks.Block{.typ = 0, .data = 0};
const onInteract = block.onInteract();
if (!mods.shift) {
if (!KeyBoard.key("crouch").pressed) {
if (onInteract.run(.{.blockPos = blockPos, .block = block}) == .handled) return;
}
}
Expand Down Expand Up @@ -767,10 +767,10 @@ pub var fog = Fog{.skyColor = .{0.8, 0.8, 1}, .fogColor = .{0.8, 0.8, 1}, .densi
var nextBlockPlaceTime: ?std.Io.Timestamp = null;
var nextBlockBreakTime: ?std.Io.Timestamp = null;

pub fn pressPlace(mods: main.Window.Key.Modifiers) void {
pub fn pressPlace(_: main.Window.Key.Modifiers) void {
const time = main.timestamp();
nextBlockPlaceTime = time.addDuration(main.settings.updateRepeatDelay);
Player.placeBlock(mods);
Player.placeBlock();
}

pub fn releasePlace(_: main.Window.Key.Modifiers) void {
Expand Down Expand Up @@ -972,7 +972,7 @@ pub fn update(deltaTime: f64) void { // MARK: update()
if (nextBlockPlaceTime) |*placeTime| {
if (placeTime.durationTo(time).nanoseconds >= 0) {
placeTime.* = placeTime.addDuration(main.settings.updateRepeatSpeed);
Player.placeBlock(main.KeyBoard.key("placeBlock").modsOnPress);
Player.placeBlock();
}
}
if (nextBlockBreakTime) |*breakTime| {
Expand Down