thepigeongenerator/tetris_clone
1
0
Fork 0
mirror of https://github.com/thepigeongenerator/tetris_clone.git synced 2025-12-17 05:55:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

add losing when the next shape overlaps the current one (just a basic quit)

Browse Source
This commit is contained in:
Quinn
2025-02-11 11:51:24 +01:00
parent 4ed4e9522f
commit 8105d35272
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/tetromino/placing.c
View File

@@ -2,6 +2,7 @@
#include <stdint.h> #include <stdint.h>
#include "../../main.h"
#include "../../window/colour8.h" #include "../../window/colour8.h"
#include "../game.h" #include "../game.h"
#include "shapes.h" #include "shapes.h"
@@ -114,6 +115,8 @@ void place_update(game_data* const game_data, InputData const move) {
clear_rows(game_data->rows, &game_data->score); // clear the rows that have been completed clear_rows(game_data->rows, &game_data->score); // clear the rows that have been completed
next_shape(game_data); next_shape(game_data);
if (shape_intersects(game_data->rows, game_data->curr_idx, game_data->sel_x, game_data->sel_y))
stop();
return; return;
} }
@@ -132,8 +135,8 @@ void place_update(game_data* const game_data, InputData const move) {
// update the shape's rotation // update the shape's rotation
if (move & 8 || move & 16) { if (move & 8 || move & 16) {
shape_id const id = move & 8 // check which direction we should move shape_id const id = move & 8 // check which direction we should move
? rotate_id(curr_id, -8) ? rotate_id(curr_id, -8)
: rotate_id(curr_id, 8); : rotate_id(curr_id, 8);
if (shape_intersects(game_data->rows, id, game_data->sel_x, game_data->sel_y) == false) { if (shape_intersects(game_data->rows, id, game_data->sel_x, game_data->sel_y) == false) {
game_data->nxt[curr_idx] = id; game_data->nxt[curr_idx] = id;
} }