From 59551259218b30cff042ad272360e090cfd944f7 Mon Sep 17 00:00:00 2001 From: nick black Date: Thu, 26 Mar 2020 20:40:03 -0400 Subject: [PATCH] Tetris: remove dead code #421 --- src/tetris/clear.h | 2 +- src/tetris/lock.h | 2 +- src/tetris/stuck.h | 6 ------ 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/src/tetris/clear.h b/src/tetris/clear.h index 347d22a1e..344e2a2b7 100644 --- a/src/tetris/clear.h +++ b/src/tetris/clear.h @@ -6,7 +6,7 @@ bool LineClear(int y){ if(board_->get_at(y, x, &c) < 0){ throw TetrisNotcursesErr("get_at()"); } - if(!c.get().gcluster || c.get().gcluster == ' '){ + if(c.is_simple()){ return false; } } diff --git a/src/tetris/lock.h b/src/tetris/lock.h index fdee35e4b..5ece56080 100644 --- a/src/tetris/lock.h +++ b/src/tetris/lock.h @@ -40,7 +40,7 @@ void LockPiece(){ throw TetrisNotcursesErr("putc()"); } c.get().gcluster = 0; - if(board_->putc(dy, x, &c) < 0){ + if(board_->putc(dy, x, &c) < 0){ // could just do this at end... throw TetrisNotcursesErr("putc()"); } } diff --git a/src/tetris/stuck.h b/src/tetris/stuck.h index fdde31623..d32ba07e7 100644 --- a/src/tetris/stuck.h +++ b/src/tetris/stuck.h @@ -18,12 +18,6 @@ bool PieceStuck() { if(piecec.is_simple()){ continue; } - ///* - const char* egc = curpiece_->get_extended_gcluster(piecec); - if(strcmp(egc, "█")){ - continue; - } - //*/ int cmpy = y + 1, cmpx = x; // need game area coordinates via translation curpiece_->translate(*board_, &cmpy, &cmpx); ncpp::Cell c;