Skip to content

GitLab

KShisen
KShisen
Commit 643c9cf5 authored by Frederik Schwarzer's avatar Frederik Schwarzer
Browse files
Options

Make more use of category logging.

parent faf285e7
Show whitespace changes
Inline Side-by-side
Showing with 48 additions and 49 deletions
src/board.cpp
View file @ 643c9cf5
...@@ -98,12 +98,12 @@ Board::Board(QWidget * parent) ...@@ -98,12 +98,12 @@ Board::Board(QWidget * parent)
void Board::loadSettings() void Board::loadSettings()
{ {
if (!loadTileset(Prefs::tileSet())) { if (!loadTileset(Prefs::tileSet())) {
qCDebug(KSHISEN_General) << "An error occurred when loading the tileset" << Prefs::tileSet() << "KShisen will continue with the default tileset."; qCWarning(KSHISEN_General) << "An error occurred when loading the tileset" << Prefs::tileSet() << "KShisen will continue with the default tileset.";
} }
// Load background // Load background
if (!loadBackground(Prefs::background())) { if (!loadBackground(Prefs::background())) {
qCDebug(KSHISEN_General) << "An error occurred when loading the background" << Prefs::background() << "KShisen will continue with the default background."; qCWarning(KSHISEN_General) << "An error occurred when loading the background" << Prefs::background() << "KShisen will continue with the default background.";
} }
// There are tile sets, that have only one tile for e.g. the flowers group. // There are tile sets, that have only one tile for e.g. the flowers group.
...@@ -193,7 +193,10 @@ int Board::tiles() const ...@@ -193,7 +193,10 @@ int Board::tiles() const
void Board::setField(TilePos const & tilePos, int value) void Board::setField(TilePos const & tilePos, int value)
{ {
if (!isValidPos(tilePos)) { if (!isValidPos(tilePos)) {
qFatal("Attempted write to invalid field position (%u,%u)", tilePos.x(), tilePos.y()); qCCritical(KSHISEN_General) << "Attempted write to invalid field position:"
<< tilePos.x()
<< ","
<< tilePos.y();
} }
m_field.at(tilePos.y() * xTiles() + tilePos.x()) = value; m_field.at(tilePos.y() * xTiles() + tilePos.x()) = value;
...@@ -204,7 +207,10 @@ int Board::field(TilePos const & tilePos) const ...@@ -204,7 +207,10 @@ int Board::field(TilePos const & tilePos) const
{ {
#ifdef DEBUGGING #ifdef DEBUGGING
if (!isValidPosWithOutline(tilePos)) { if (!isValidPosWithOutline(tilePos)) {
qFatal("Attempted read from invalid field position (%u,%u)", tilePos.x(), tilePos.y()); qCCritical(KSHISEN_General) << "Attempted read from invalid field position:"
<< tilePos.x()
<< ","
<< tilePos.y();
} }
#endif #endif
...@@ -547,7 +553,7 @@ void Board::newGame() ...@@ -547,7 +553,7 @@ void Board::newGame()
} }
// debug, tell if make solvable failed // debug, tell if make solvable failed
if (maxAttempts == 0) { if (maxAttempts == 0) {
qCDebug(KSHISEN_General) << "NewGame make solvable failed"; qCCritical(KSHISEN_General) << "NewGame make solvable failed";
} }
...@@ -1458,9 +1464,8 @@ void Board::undo() ...@@ -1458,9 +1464,8 @@ void Board::undo()
// if there is no slide, keep previous implementation: move both column up // if there is no slide, keep previous implementation: move both column up
if (!move->hasSlide()) { if (!move->hasSlide()) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] gravity from a no slide move"; qCDebug(KSHISEN_General) << "[undo] gravity from a no slide move";
#endif
// move tiles from the first column up // move tiles from the first column up
for (int y = 0; y < move->y1(); ++y) { for (int y = 0; y < move->y1(); ++y) {
setField(TilePos(move->x1(), y), field(TilePos(move->x1(), y + 1))); setField(TilePos(move->x1(), y), field(TilePos(move->x1(), y + 1)));
...@@ -1473,17 +1478,16 @@ void Board::undo() ...@@ -1473,17 +1478,16 @@ void Board::undo()
updateField(TilePos(move->x2(), y)); updateField(TilePos(move->x2(), y));
} }
} else { // else check all tiles from the slide that may have fallen down } else { // else check all tiles from the slide that may have fallen down
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] gravity from slide s1(" << move->slideX1() << "," << move->slideY1() << ")=>s2(" << move->slideX2() << "," << move->slideY2() << ") matching (" << move->x1() << "," << move->y1() << ")=>(" << move->x2() << "," << move->y2() << ")"; qCDebug(KSHISEN_General) << "[undo] gravity from slide s1(" << move->slideX1() << "," << move->slideY1() << ")=>s2(" << move->slideX2() << "," << move->slideY2() << ") matching (" << move->x1() << "," << move->y1() << ")=>(" << move->x2() << "," << move->y2() << ")";
#endif
// horizontal slide // horizontal slide
// because tiles that slides horizontaly may fall down // because tiles that slides horizontaly may fall down
// in columns different than the taken tiles columns // in columns different than the taken tiles columns
// we need to take them back up then undo the slide // we need to take them back up then undo the slide
if (move->slideY1() == move->slideY2()) { if (move->slideY1() == move->slideY2()) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] gravity from horizontal slide"; qCDebug(KSHISEN_General) << "[undo] gravity from horizontal slide";
#endif
// last slide tile went from slide_x1 -> slide_x2 // last slide tile went from slide_x1 -> slide_x2
// the number of slided tiles is n = abs(x1 - slide_x1) // the number of slided tiles is n = abs(x1 - slide_x1)
int n = move->x1() - move->slideX1(); int n = move->x1() - move->slideX1();
...@@ -1495,16 +1499,16 @@ void Board::undo() ...@@ -1495,16 +1499,16 @@ void Board::undo()
if (dx < 0) { if (dx < 0) {
dx = -dx; dx = -dx;
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] n =" << n; qCDebug(KSHISEN_General) << "[undo] n =" << n;
#endif
// slided tiles may fall down after the slide // slided tiles may fall down after the slide
// so any tiles on top of the columns between // so any tiles on top of the columns between
// slide_x2 -> slide_x2 +/- n (excluded) should go up to slide_y1 // slide_x2 -> slide_x2 +/- n (excluded) should go up to slide_y1
if (move->slideX2() > move->slideX1()) { // slide to the right if (move->slideX2() > move->slideX1()) { // slide to the right
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] slide right"; qCDebug(KSHISEN_General) << "[undo] slide right";
#endif
for (int i = move->slideX2(); i > move->slideX2() - n; --i) { for (int i = move->slideX2(); i > move->slideX2() - n; --i) {
// find top tile // find top tile
int j; int j;
...@@ -1518,9 +1522,9 @@ void Board::undo() ...@@ -1518,9 +1522,9 @@ void Board::undo()
if (j <= move->slideY1()) { if (j <= move->slideY1()) {
continue; continue;
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving (" << i << "," << j << ") up to (" << i << "," << move->slideY1() << ")"; qCDebug(KSHISEN_General) << "[undo] moving (" << i << "," << j << ") up to (" << i << "," << move->slideY1() << ")";
#endif
// put it back up // put it back up
setField(TilePos(i, move->slideY1()), field(TilePos(i, j))); setField(TilePos(i, move->slideY1()), field(TilePos(i, j)));
setField(TilePos(i, j), EMPTY); setField(TilePos(i, j), EMPTY);
...@@ -1528,9 +1532,9 @@ void Board::undo() ...@@ -1528,9 +1532,9 @@ void Board::undo()
updateField(TilePos(i, move->slideY1())); updateField(TilePos(i, move->slideY1()));
} }
} else { // slide to the left } else { // slide to the left
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] slide left"; qCDebug(KSHISEN_General) << "[undo] slide left";
#endif
for (int i = move->slideX2(); i < move->slideX2() + n; ++i) { for (int i = move->slideX2(); i < move->slideX2() + n; ++i) {
// find top tile // find top tile
int j; int j;
...@@ -1544,9 +1548,9 @@ void Board::undo() ...@@ -1544,9 +1548,9 @@ void Board::undo()
if (j <= move->slideY1()) { if (j <= move->slideY1()) {
continue; continue;
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving (" << i << "," << j << ") up to (" << i << "," << move->slideY1() << ")"; qCDebug(KSHISEN_General) << "[undo] moving (" << i << "," << j << ") up to (" << i << "," << move->slideY1() << ")";
#endif
// put it back up // put it back up
setField(TilePos(i, move->slideY1()), field(TilePos(i, j))); setField(TilePos(i, move->slideY1()), field(TilePos(i, j)));
setField(TilePos(i, j), EMPTY); setField(TilePos(i, j), EMPTY);
...@@ -1554,14 +1558,13 @@ void Board::undo() ...@@ -1554,14 +1558,13 @@ void Board::undo()
updateField(TilePos(i, move->slideY1())); updateField(TilePos(i, move->slideY1()));
} }
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving up column x2" << move->x2(); qCDebug(KSHISEN_General) << "[undo] moving up column x2" << move->x2();
#endif
// move tiles from the second column up // move tiles from the second column up
for (int y = 0; y <= move->y2(); ++y) { for (int y = 0; y <= move->y2(); ++y) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving up tile" << y + 1; qCDebug(KSHISEN_General) << "[undo] moving up tile" << y + 1;
#endif
setField(TilePos(move->x2(), y), field(TilePos(move->x2(), y + 1))); setField(TilePos(move->x2(), y), field(TilePos(move->x2(), y + 1)));
updateField(TilePos(move->x2(), y)); updateField(TilePos(move->x2(), y));
} }
...@@ -1573,19 +1576,17 @@ void Board::undo() ...@@ -1573,19 +1576,17 @@ void Board::undo()
if (move->slideX2() > move->slideX1()) { // slide to the right if (move->slideX2() > move->slideX1()) { // slide to the right
if (move->slideY1() > 0) { if (move->slideY1() > 0) {
for (int i = move->x1() + dx; i >= move->x1(); --i) { for (int i = move->x1() + dx; i >= move->x1(); --i) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving up column" << i << "until" << move->slideY1(); qCDebug(KSHISEN_General) << "[undo] moving up column" << i << "until" << move->slideY1();
#endif
for (int j = 0; j < move->slideY1(); ++j) { for (int j = 0; j < move->slideY1(); ++j) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving up tile" << j + 1; qCDebug(KSHISEN_General) << "[undo] moving up tile" << j + 1;
#endif
setField(TilePos(i, j), field(TilePos(i, j + 1))); setField(TilePos(i, j), field(TilePos(i, j + 1)));
updateField(TilePos(i, j)); updateField(TilePos(i, j));
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] clearing last tile" << move->slideY1(); qCDebug(KSHISEN_General) << "[undo] clearing last tile" << move->slideY1();
#endif
setField(TilePos(i, move->slideY1()), EMPTY); setField(TilePos(i, move->slideY1()), EMPTY);
updateField(TilePos(i, move->slideY1())); updateField(TilePos(i, move->slideY1()));
} }
...@@ -1593,35 +1594,31 @@ void Board::undo() ...@@ -1593,35 +1594,31 @@ void Board::undo()
} else { // slide to the left } else { // slide to the left
if (move->slideY1() > 0) { if (move->slideY1() > 0) {
for (int i = move->x1() - dx; i <= move->x1(); ++i) { for (int i = move->x1() - dx; i <= move->x1(); ++i) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving up column" << i << "until" << move->slideY1(); qCDebug(KSHISEN_General) << "[undo] moving up column" << i << "until" << move->slideY1();
#endif
for (int j = 0; j < move->slideY1(); ++j) { for (int j = 0; j < move->slideY1(); ++j) {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] moving up tile" << j + 1; qCDebug(KSHISEN_General) << "[undo] moving up tile" << j + 1;
#endif
setField(TilePos(i, j), field(TilePos(i, j + 1))); setField(TilePos(i, j), field(TilePos(i, j + 1)));
updateField(TilePos(i, j)); updateField(TilePos(i, j));
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] clearing last tile" << move->slideY1(); qCDebug(KSHISEN_General) << "[undo] clearing last tile" << move->slideY1();
#endif
setField(TilePos(i, move->slideY1()), EMPTY); setField(TilePos(i, move->slideY1()), EMPTY);
updateField(TilePos(i, move->slideY1())); updateField(TilePos(i, move->slideY1()));
} }
} }
} }
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] reversing slide"; qCDebug(KSHISEN_General) << "[undo] reversing slide";
#endif
// then undo the slide to put the tiles back to their original location // then undo the slide to put the tiles back to their original location
reverseSlide(TilePos(move->x1(), move->y1()), move->slideX1(), move->slideY1(), move->slideX2(), move->slideY2()); reverseSlide(TilePos(move->x1(), move->y1()), move->slideX1(), move->slideY1(), move->slideX2(), move->slideY2());
} else { } else {
#ifdef DEBUGGING
qCDebug(KSHISEN_General) << "[undo] gravity from vertical slide"; qCDebug(KSHISEN_General) << "[undo] gravity from vertical slide";
#endif
// vertical slide, in fact nothing special is necessary // vertical slide, in fact nothing special is necessary
// the default implementation works because it only affects // the default implementation works because it only affects
// the two columns were tiles were taken // the two columns were tiles were taken
...@@ -1788,13 +1785,14 @@ bool Board::isSolvable(bool restore) ...@@ -1788,13 +1785,14 @@ bool Board::isSolvable(bool restore)
TilePos const tile1(p.front().path().front().x(), p.front().path().front().y()); TilePos const tile1(p.front().path().front().x(), p.front().path().front().y());
TilePos const tile2(p.front().path().back().x(), p.front().path().back().y()); TilePos const tile2(p.front().path().back().x(), p.front().path().back().y());
if (!tilesMatch(field(tile1), field(tile2))) { if (!tilesMatch(field(tile1), field(tile2))) {
qFatal("Removing unmatched tiles: (%u,%u) => %u (%u,%u) => %u", QString errMessage = QStringLiteral("Removing unmatched tiles: (%1,%2) => %3 (%4,%5) => %6")
p.front().path().front().x(), .arg(p.front().path().front().x())
p.front().path().front().y(), .arg(p.front().path().front().y())
field(tile1), .arg(field(tile1))
p.front().path().back().x(), .arg(p.front().path().back().x())
p.front().path().back().y(), .arg(p.front().path().back().y())
field(tile2)); .arg(field(tile2));
qCCritical(KSHISEN_General) << errMessage;
} }
setField(tile1, EMPTY); setField(tile1, EMPTY);
setField(tile2, EMPTY); setField(tile2, EMPTY);
......
src/main.cpp
View file @ 643c9cf5
...@@ -32,9 +32,10 @@ ...@@ -32,9 +32,10 @@
// KShisen // KShisen
#include "app.h" #include "app.h"
#include "debug.h" #include "debug.h"
namespace KShisen namespace KShisen
{ {
Q_LOGGING_CATEGORY(KSHISEN_General, "kshisen_general") Q_LOGGING_CATEGORY(KSHISEN_General, "kshisen")
} }
static const char description[] = I18N_NOOP("A KDE game similar to Mahjongg"); static const char description[] = I18N_NOOP("A KDE game similar to Mahjongg");
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment