mine counter ushort to short (#57)

* ushort mines -> short mines * ushort mines -> short mines * ushort mines -> short mines * ushort mines -> short mines * ushort mines -> short mines * ushort mines -> short mines I accidentally deleted a space, in spirit of being close to the original, I returned it
Bollos00 · Mar 19, 2024 · 4a41b0f · 4a41b0f
1 parent 4a5ef0a
commit 4a41b0f
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/src/libreminesgameengine.cpp b/src/libreminesgameengine.cpp
@@ -38,7 +38,7 @@ LibreMinesGameEngine::LibreMinesGameEngine()
 
 void LibreMinesGameEngine::vNewGame(const uchar _X,
                                     const uchar _Y,
-                                    ushort i_nMines_,
+                                    short i_nMines_,
                                     const uchar i_X_Clean,
                                     const uchar i_Y_Clean)
 {
@@ -511,7 +511,7 @@ uchar LibreMinesGameEngine::lines() const
     return iY;
 }
 
-ushort LibreMinesGameEngine::mines() const
+short LibreMinesGameEngine::mines() const
 {
     return nMines;
 }

diff --git a/src/libreminesgameengine.h b/src/libreminesgameengine.h
@@ -47,14 +47,14 @@ class LibreMinesGameEngine: public QObject
     LibreMinesGameEngine();
     void vNewGame(const uchar _X,
                   const uchar _Y,
-                  ushort i_nMines_,
+                  short i_nMines_,
                   const uchar i_X_Clean = 255,
                   const uchar i_Y_Clean = 255);
 
     const std::vector< std::vector<CellGameEngine> >& getPrincipalMatrix()const;
     uchar rows()const;
     uchar lines()const;
-    ushort mines()const;
+    short mines()const;
     ushort cellsToUnlock()const;
     ushort hiddenCells()const;
     bool isGameActive()const;
@@ -83,8 +83,8 @@ class LibreMinesGameEngine: public QObject
     uchar iX; /**< TODO: describe */
     uchar iY; /**< TODO: describe */
 
-    ushort nMines; /**< TODO: describe */
-    ushort iMinesLeft; /**< TODO: describe */
+    short nMines; /**< TODO: describe */
+    short iMinesLeft; /**< TODO: describe */
     ushort iHiddenCells; /**< TODO: describe */
     ushort iCellsToUnlock; /**< TODO: describe */
 
@@ -108,7 +108,7 @@ class LibreMinesGameEngine: public QObject
                              double dCellsPerSecond,
                              bool ignorePreferences=false);
     void SIGNAL_currentTime(const ushort);
-    void SIGNAL_minesLeft(const ushort);
+    void SIGNAL_minesLeft(const short);
     void SIGNAL_flagCell(const uchar _X, const uchar _Y);
     void SIGNAL_questionCell(const uchar _X, const uchar _Y);
     void SIGNAL_unflagCell(const uchar _X, const uchar _Y);

diff --git a/src/libreminesgui.cpp b/src/libreminesgui.cpp
@@ -166,10 +166,10 @@ void LibreMinesGui::closeEvent(QCloseEvent *e)
 
 void LibreMinesGui::vNewGame(const uchar _X,
                              const uchar _Y,
-                             ushort i_nMines_)
+                             short i_nMines_)
 {
     bMinefieldBeingCreated = true;
-
+    
     vAdjustInterfaceInGame();
     vShowInterfaceInGame();
 
@@ -1327,7 +1327,7 @@ void LibreMinesGui::SLOT_currentTime(const ushort time)
 //    Q_EMIT(sound->SIGNAL_clockTick());
 }
 
-void LibreMinesGui::SLOT_minesLeft(const ushort minesLeft)
+void LibreMinesGui::SLOT_minesLeft(const short minesLeft)
 {
     lcd_numberMinesLeft->display(minesLeft);
 }

diff --git a/src/libreminesgui.h b/src/libreminesgui.h
@@ -92,7 +92,7 @@ class LibreMinesGui : public QMainWindow
 private:
     void vNewGame(const uchar _X,
                   const uchar _Y,
-                  ushort i_nMines_);
+                  short i_nMines_);
 
     void vAttributeAllCells();
     void vResetPrincipalMatrix();
@@ -185,7 +185,7 @@ private Q_SLOTS:
                            double dCellsPerSecond,
                            bool ignorePreferences=false);
     void SLOT_currentTime(const ushort time);
-    void SLOT_minesLeft(const ushort minesLeft);
+    void SLOT_minesLeft(const short minesLeft);
     void SLOT_flagCell(const uchar _X, const uchar _Y);
     void SLOT_QuestionCell(const uchar _X, const uchar _Y);
     void SLOT_unflagCell(const uchar _X, const uchar _Y);

diff --git a/src/libreminesscore.h b/src/libreminesscore.h
@@ -34,7 +34,7 @@ class LibreMinesScore
     GameDifficulty gameDifficulty;
     uchar width;
     uchar heigth;
-    ushort mines;
+    short mines;
     bool bGameCompleted;
     double dPercentageGameCompleted;
     QString username;