mirror of
https://github.com/thepigeongenerator/tetris_clone.git
synced 2025-12-17 14:05:45 +01:00
code cleanup + call clear rows when placing a block
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
#include <time.h>
|
||||
|
||||
#include "../main.h"
|
||||
#include "../window/colour.h"
|
||||
#include "./tetromino/shapes.h"
|
||||
#include "tetromino/placing.h"
|
||||
|
||||
@@ -27,51 +26,6 @@ void game_init(GameData* const game_data) {
|
||||
srand(time(NULL));
|
||||
}
|
||||
|
||||
static bool is_filled(CRow row) {
|
||||
for (uint8_t x = 0; x < COLUMNS; x++) {
|
||||
if (row[x].packed == NONE) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
static inline void set_row(Row* rows, const uint8_t y, Row row) {
|
||||
rows[(ROWS - 1) - y] = row;
|
||||
}
|
||||
|
||||
static void clear_rows(Row* row) {
|
||||
uint8_t filled_rows = 0;
|
||||
|
||||
// loop through each row
|
||||
for (uint8_t y = 0; y < ROWS; y++) {
|
||||
// zero out the row instead if we've reached the top rows
|
||||
if ((ROWS - y) <= filled_rows) {
|
||||
for (uint8_t x = 0; x < COLUMNS; x++)
|
||||
row[filled_rows--][x].packed = 0; // use filled_rows as the y index and decrease them as we go.
|
||||
continue;
|
||||
}
|
||||
|
||||
// get the row we currently need to check
|
||||
Row crow = filled_rows > 0
|
||||
? row[y + filled_rows]
|
||||
: row[y];
|
||||
|
||||
// set the current y to the current row
|
||||
Row row_cache = row[y];
|
||||
set_row(row, y, crow);
|
||||
|
||||
if (!is_filled(crow)) continue;
|
||||
|
||||
// write the cached row to the top if we know that the current row pointer will be lost
|
||||
row[filled_rows] = row_cache;
|
||||
filled_rows++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
// called every time the game's state is updated
|
||||
void game_update(GameData* game_data, const uint8_t* keys) {
|
||||
if (keys[SDL_SCANCODE_ESCAPE])
|
||||
|
||||
Reference in New Issue
Block a user