christoph/cpp-masssprings
1
Fork 0
Code Releases Activity

implement immovable blocks (walls) and add two presets

Browse Source
This commit is contained in:
Christoph Urlacher
2026-02-25 17:21:54 +01:00
parent 81620d8709
commit 4a37e93b98
7 changed files with 89 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/puzzle.cpp
View File

@ -14,7 +14,7 @@ auto Block::Hash() const -> int {
}
auto Block::Invalid() -> Block {
Block block = Block(0, 0, 1, 1, false);
Block block = Block(0, 0, 1, 1, false, false);
block.width = 0;
block.height = 0;
return block;
@ -27,12 +27,20 @@ auto Block::ToString() const -> std::string {
return std::format("{}{}",
static_cast<char>(width + static_cast<int>('a') - 1),
static_cast<char>(height + static_cast<int>('a') - 1));
} else if (immovable) {
return std::format("{}{}",
static_cast<char>(width + static_cast<int>('A') - 1),
static_cast<char>(height + static_cast<int>('A') - 1));
} else {
return std::format("{}{}", width, height);
}
}
auto Block::GetPrincipalDirs() const -> int {
if (immovable) {
return 0;
}
if (width > height) {
return Direction::EAS | Direction::WES;
} else if (height > width) {
@ -194,7 +202,7 @@ auto State::RemoveBlock(int x, int y) -> bool {
auto State::ToggleTarget(int x, int y) -> bool {
Block block = GetBlock(x, y);
if (!block.IsValid()) {
if (!block.IsValid() || block.immovable) {
return false;
}
@ -217,6 +225,20 @@ auto State::ToggleTarget(int x, int y) -> bool {
return true;
}
auto State::ToggleWall(int x, int y) -> bool {
Block block = GetBlock(x, y);
if (!block.IsValid() || block.target) {
return false;
}
// Add the new target
block.immovable = !block.immovable;
int index = GetIndex(block.x, block.y);
state.replace(index, 2, block.ToString());
return true;
}
auto State::ToggleRestricted() -> void {
restricted = !restricted;
state.replace(0, 1, restricted ? "R" : "F");
@ -224,7 +246,7 @@ auto State::ToggleRestricted() -> void {
auto State::MoveBlockAt(int x, int y, Direction dir) -> bool {
Block block = GetBlock(x, y);
if (!block.IsValid()) {
if (!block.IsValid() || block.immovable) {
return false;
}
@ -285,6 +307,10 @@ auto State::GetNextStates() const -> std::vector<State> {
: Direction::NOR | Direction::EAS | Direction::SOU |
Direction::WES;
if (b.immovable) {
continue;
}
if (dirs & Direction::NOR) {
State north = *this;
if (north.MoveBlockAt(b.x, b.y, Direction::NOR)) {