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

fix: a tetromino can't appear twice in a row, and rotation is no longer preserved

Browse Source 
Tetrominos can now appear twice in a row, and rotation is no longer
preserved for each shape.
(if you rotated a specific shape 90°, now whenever you encounter this
shape, it spawns with a 90° rotation, and so forth)
This commit is contained in:
Quinn
2025-06-27 12:30:11 +02:00
parent 699bc7a547
commit 7b3b09ebe7
4 changed files with 10 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/game/game.c
View File

@@ -36,17 +36,13 @@ static void shuffle(void* restrict ptr, size_t nmemb, size_t membs) {
void next_shape(void) {
// as long as we're not at the last shape, we can just increment
dat.pdat.sel = (i8vec2){COLUMNS / 2 - SHAPE_WIDTH / 2, 0};
dat.pdat.cur = dat.pdat.nxt[dat.pdat.idx];
dat.pdat.idx++;
if (dat.pdat.idx < TETROMINO_COUNT - 1) return;
if (dat.pdat.idx < TETROMINO_COUNT) return;
// shuffle all next shapes, preserving the last
dat.pdat.idx = 0;
shuffle(dat.pdat.nxt, TETROMINO_COUNT - 1, sizeof(u8));
// swap the first and last shape, thus preserving what the shape would've been
u8 cache = dat.pdat.nxt[0];
dat.pdat.nxt[0] = dat.pdat.nxt[TETROMINO_COUNT - 1];
dat.pdat.nxt[TETROMINO_COUNT - 1] = cache;
shuffle(dat.pdat.nxt, TETROMINO_COUNT, sizeof(u8));
}
struct gamedata* game_init(void) {
@@ -61,6 +57,8 @@ struct gamedata* game_init(void) {
// initialise the placing data correctly
dat.pdat.sel = (i8vec2){COLUMNS / 2 - SHAPE_WIDTH / 2, 0};
shuffle(dat.pdat.nxt, TETROMINO_COUNT, sizeof(u8));
dat.pdat.cur = dat.pdat.nxt[dat.pdat.idx];
dat.pdat.idx++;
return &dat;
}