dendy
/
usg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix silly t-twist mistake

This commit is contained in:
Dusk 2022-07-16 14:59:59 +02:00
parent 825bf1a499
commit 7da3ce5592
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Game.zig
View File

@ -112,20 +112,17 @@ pub fn tick(self: *Self) State {
if (self.action_list[@enumToInt(Action.Offset.right)].holding) { if (self.action_list[@enumToInt(Action.Offset.right)].holding) {
if (!self.timer_right_das.started) { if (!self.timer_right_das.started) {
self.timer_right_das.start(); self.timer_right_das.start();
std.debug.print("Starting DAS\n", .{});
} }
} else { } else {
// Stop both // Stop both
self.timer_right_das.stop(); self.timer_right_das.stop();
self.timer_right_arr.stop(); self.timer_right_arr.stop();
std.debug.print("Stopping\n", .{});
} }
// ARR // ARR
if (self.timer_right_das.finished()) { if (self.timer_right_das.finished()) {
if (!self.timer_right_arr.started) { if (!self.timer_right_arr.started) {
self.timer_right_arr.start(); self.timer_right_arr.start();
std.debug.print("Starting ARR\n", .{});
} else if (self.timer_right_arr.finished()) { } else if (self.timer_right_arr.finished()) {
self.timer_right_arr.stop(); self.timer_right_arr.stop();
self.action_list[@enumToInt(Action.Offset.right)].holding = false; self.action_list[@enumToInt(Action.Offset.right)].holding = false;
@ -138,20 +135,17 @@ pub fn tick(self: *Self) State {
if (self.action_list[@enumToInt(Action.Offset.left)].holding) { if (self.action_list[@enumToInt(Action.Offset.left)].holding) {
if (!self.timer_left_das.started) { if (!self.timer_left_das.started) {
self.timer_left_das.start(); self.timer_left_das.start();
std.debug.print("Starting DAS\n", .{});
} }
} else { } else {
// Stop both // Stop both
self.timer_left_das.stop(); self.timer_left_das.stop();
self.timer_left_arr.stop(); self.timer_left_arr.stop();
std.debug.print("Stopping\n", .{});
} }
// ARR // ARR
if (self.timer_left_das.finished()) { if (self.timer_left_das.finished()) {
if (!self.timer_left_arr.started) { if (!self.timer_left_arr.started) {
self.timer_left_arr.start(); self.timer_left_arr.start();
std.debug.print("Starting ARR\n", .{});
} else if (self.timer_left_arr.finished()) { } else if (self.timer_left_arr.finished()) {
self.timer_left_arr.stop(); self.timer_left_arr.stop();
self.action_list[@enumToInt(Action.Offset.left)].holding = false; self.action_list[@enumToInt(Action.Offset.left)].holding = false;

4
src/movement.zig
View File

@ -124,7 +124,7 @@ pub fn kick(grid: Grid, piece: Piece, prev_piece: Piece) Piece {
// Test 1 // Test 1
if (!checkCollision(grid, new_piece)) { if (!checkCollision(grid, new_piece)) {
// T TWIST DETECTION // T TWIST DETECTION
_ = checkTTwist(grid, piece); _ = checkTTwist(grid, new_piece);
return new_piece; return new_piece;
} }
@ -183,7 +183,7 @@ pub fn kick(grid: Grid, piece: Piece, prev_piece: Piece) Piece {
new_piece.row += offset[1]; new_piece.row += offset[1];
if (!checkCollision(grid, new_piece)) { if (!checkCollision(grid, new_piece)) {
// T TWIST DETECTION // T TWIST DETECTION
_ = checkTTwist(grid, piece); _ = checkTTwist(grid, new_piece);
return new_piece; return new_piece;
} }
new_piece.col -= offset[0]; new_piece.col -= offset[0];