Update file

SXKA · Jan 19, 2024 · 320143f · 320143f
1 parent e44bf3a
commit 320143f
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 13 deletions.
diff --git a/Qt-Gomoku/src/gomoku/engine.cpp b/Qt-Gomoku/src/gomoku/engine.cpp
@@ -45,8 +45,19 @@ Engine::Engine()
         }
     }
 
-    blackShapes.fill(std::string(15, '0'));
-    whiteShapes.fill(std::string(15, '0'));
+    std::fill_n(blackShapes.begin(), 30, std::string(15, '0'));
+    std::fill_n(whiteShapes.begin(), 30, std::string(15, '0'));
+
+    for (int i = 5; i <= 15; ++i) {
+	    blackShapes[25 + i] = std::string(i, '0');
+        whiteShapes[25 + i] = std::string(i, '0');
+        blackShapes[35 + i] = std::string(20 - i, '0');
+        whiteShapes[35 + i] = std::string(20 - i, '0');
+        blackShapes[46 + i] = std::string(i, '0');
+        whiteShapes[46 + i] = std::string(i, '0');
+        blackShapes[56 + i] = std::string(20 - i, '0');
+        whiteShapes[56 + i] = std::string(20 - i, '0');
+    }
 }
 
 bool Engine::isLegal(const QPoint &point)
@@ -350,11 +361,7 @@ bool Engine::inCheck(const Stone &stone)
                 point.setY(qMax(0, line - 61) + index);
             }
 
-            if (isLegal(point)) {
-                escapes.insert(point);
-            } else {
-                return false;
-            }
+        	escapes.insert(point);
         }
 
         return true;
@@ -365,6 +372,8 @@ bool Engine::inCheck(const Stone &stone)
 
 int Engine::evaluatePoint(const QPoint &point) const
 {
+    const auto &x = point.x();
+    const auto &y = point.y();
     int score = 0;
 
     for (int i = 0; i < 4; ++i) {
@@ -451,8 +460,6 @@ int Engine::lineScore(const QPoint &point, const int &direction) const
         blackLine[qMin(y, 14 - x)] = '1';
         whiteLine[qMin(y, 14 - x)] = '1';
 
-        break;
-    default:
         break;
     }
 

diff --git a/Qt-Gomoku/src/windows/gamewindow.cpp b/Qt-Gomoku/src/windows/gamewindow.cpp
@@ -19,9 +19,13 @@ void GameWindow::mouseMoveEvent(QMouseEvent *event)
     const auto x = event->pos().x();
     const auto y = event->pos().y();
 
+    update((move.y() + 1) * 40 - 21, (move.x() + 1) * 40 - 1, 42, 42);
+
     move.setX((y - 40) / 40);
     move.setY((x - 20) / 40);
 
+    update((move.y() + 1) * 40 - 21, (move.x() + 1) * 40 - 1, 42, 42);
+
     if (x < 20 || x >= 620 || y < 40 || y >= 640) {
         setCursor(Qt::ArrowCursor);
     } else {
@@ -31,8 +35,6 @@ void GameWindow::mouseMoveEvent(QMouseEvent *event)
             setCursor(Qt::ArrowCursor);
         }
     }
-
-    update();
 }
 
 void GameWindow::mouseReleaseEvent(QMouseEvent *event)
@@ -62,11 +64,13 @@ void GameWindow::mouseReleaseEvent(QMouseEvent *event)
         return;
     }
 
+    update((last.y() + 1) * 40 - 21, (last.x() + 1) * 40 - 1, 42, 42);
+
     ui.undo->setEnabled(true);
     last = engine.lastMove();
     ++step;
 
-    repaint();
+    update((last.y() + 1) * 40 - 21, (last.x() + 1) * 40 - 1, 42, 42);
 
     const auto gameState = engine.gameState(move, playerStone);
 
@@ -93,7 +97,7 @@ void GameWindow::mouseReleaseEvent(QMouseEvent *event)
     if (gameType == PVC) {
         ui.undo->setDisabled(true);
 
-        repaint();
+        repaint((last.y() + 1) * 40 - 21, (last.x() + 1) * 40 - 1, 42, 42);
         setUpdatesEnabled(false);
 
         future = QtConcurrent::run([ &, this]() {