[Scummvm-git-logs] scummvm master -> d5c239ea63fcf729a52825e7a9af678a53a09b0b
sev-
noreply at scummvm.org
Fri Oct 18 22:20:17 UTC 2024
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d5c239ea63 QDENGINE: Moved debug output to ScummVM API
Commit: d5c239ea63fcf729a52825e7a9af678a53a09b0b
https://github.com/scummvm/scummvm/commit/d5c239ea63fcf729a52825e7a9af678a53a09b0b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-10-19T00:19:27+02:00
Commit Message:
QDENGINE: Moved debug output to ScummVM API
Changed paths:
engines/qdengine/minigames/adv/ExportInterface.cpp
engines/qdengine/minigames/adv/common.h
engines/qdengine/minigames/adv/m_karaoke.cpp
engines/qdengine/minigames/adv/m_puzzle.cpp
engines/qdengine/minigames/adv/m_scores.cpp
engines/qdengine/minigames/adv/m_swap.cpp
engines/qdengine/minigames/adv/m_triangles.cpp
diff --git a/engines/qdengine/minigames/adv/ExportInterface.cpp b/engines/qdengine/minigames/adv/ExportInterface.cpp
index aea96013aaa..b5d29fef219 100644
--- a/engines/qdengine/minigames/adv/ExportInterface.cpp
+++ b/engines/qdengine/minigames/adv/ExportInterface.cpp
@@ -19,13 +19,16 @@
*
*/
+#include "common/debug.h"
+
+#include "qdengine/qdengine.h"
#include "qdengine/minigames/adv/common.h"
#include "qdengine/minigames/adv/RunTime.h"
namespace QDEngine {
qdMiniGameInterface *open_game_interface(const char* name) {
- dprintf("open_game_interface: %s, runtime%s\n", name, runtime ? "!=0" : "==0");
+ debugC(3, kDebugMinigames, "open_game_interface: %s, runtime%s", name, runtime ? "!=0" : "==0");
if (!runtime)
return runtime = new MinigameManager;
@@ -34,7 +37,7 @@ qdMiniGameInterface *open_game_interface(const char* name) {
}
bool close_game_interface(qdMiniGameInterface* game) {
- dprintf("close_game_interface, runtime%s%s\n", runtime == game ? "==game" : "!=game", runtime ? "!=0" : "==0");
+ debugC(3, kDebugMinigames, "close_game_interface, runtime%s%s", runtime == game ? "==game" : "!=game", runtime ? "!=0" : "==0");
delete game;
if (game == runtime)
diff --git a/engines/qdengine/minigames/adv/common.h b/engines/qdengine/minigames/adv/common.h
index f14aa1207b7..238cd8fa0c9 100644
--- a/engines/qdengine/minigames/adv/common.h
+++ b/engines/qdengine/minigames/adv/common.h
@@ -27,8 +27,6 @@
namespace QDEngine {
-void dprintf(const char *format, ...);
-
typedef mgVect3<int> mgVect3i;
using namespace std;
diff --git a/engines/qdengine/minigames/adv/m_karaoke.cpp b/engines/qdengine/minigames/adv/m_karaoke.cpp
index 858e1cb6e4e..24d39056eb9 100644
--- a/engines/qdengine/minigames/adv/m_karaoke.cpp
+++ b/engines/qdengine/minigames/adv/m_karaoke.cpp
@@ -130,7 +130,7 @@ Karaoke::Karaoke() {
}
Parse(file, nodes_);
- dprintf("read %d tags\n", nodes_.size());
+ debugC(2, kDebugMinigames, "read %d tags", nodes_.size());
startScreenTag_ = 0;
currentTag_ = 0;
@@ -189,7 +189,7 @@ void Karaoke::quant(float dt) {
}
if (runtime->mouseRightPressed())
- dprintf("%s\n", outText.c_str());
+ debugC(2, kDebugMinigames, "%s", outText.c_str());
runtime->setText(controlName_, outText.c_str());
}
diff --git a/engines/qdengine/minigames/adv/m_puzzle.cpp b/engines/qdengine/minigames/adv/m_puzzle.cpp
index 7b5a6e8a35c..2cd15352126 100644
--- a/engines/qdengine/minigames/adv/m_puzzle.cpp
+++ b/engines/qdengine/minigames/adv/m_puzzle.cpp
@@ -130,13 +130,13 @@ Puzzle::Puzzle() {
nodes_[0].angle = angles_ - 1;
size_ = runtime->getSize(nodes_[0].obj);
- dprintf("size = (%6.2f,%6.2f)\n", size_.x, size_.y);
+ debugC(2, kDebugMinigames, "size = (%6.2f,%6.2f)", size_.x, size_.y);
depth_ = nodes_[0].obj.depth();
stackPlaceSize_ = getParameter("inventory_place_size", size_ * 1.2f);
xassert(stackPlaceSize_.x > 0.f && stackPlaceSize_.x < 500.f && stackPlaceSize_.y > 0.f && stackPlaceSize_.y < 500.f);
- dprintf("stackPlaceSize = (%5.1f, %5.1f)\n", stackPlaceSize_.x, stackPlaceSize_.y);
+ debugC(2, kDebugMinigames, "stackPlaceSize = (%5.1f, %5.1f)", stackPlaceSize_.x, stackPlaceSize_.y);
prevPlace_ = -1;
pickedItem_ = -1;
diff --git a/engines/qdengine/minigames/adv/m_scores.cpp b/engines/qdengine/minigames/adv/m_scores.cpp
index 5ed9a912c64..178b39eaea4 100644
--- a/engines/qdengine/minigames/adv/m_scores.cpp
+++ b/engines/qdengine/minigames/adv/m_scores.cpp
@@ -86,7 +86,7 @@ Scores::Scores() {
return;
}
Level lvl(level);
- dprintf("%d: ", level);
+ debugCN(2, kDebugMinigames, "%d: ", level);
while (xbuf.tell() < xbuf.size()) {
xbuf > ch;
if (isdigit(ch)) {
@@ -94,7 +94,7 @@ Scores::Scores() {
int game;
xbuf >= game;
lvl.games.push_back(game);
- dprintf("%d, ", game);
+ debugCN(2, kDebugMinigames, "%d, ", game);
if (const MinigameData * data = runtime->getScore(level, game))
lvl.data.push_back(GameData(game, *data));
}
@@ -105,7 +105,7 @@ Scores::Scores() {
}
sort(lvl.data.begin(), lvl.data.end());
levels_.push_back(lvl);
- dprintf("\n");
+ debugC(2, kDebugMinigames, "");
}
if (levels_.empty())
return;
diff --git a/engines/qdengine/minigames/adv/m_swap.cpp b/engines/qdengine/minigames/adv/m_swap.cpp
index a316e41bfaf..4602351267c 100644
--- a/engines/qdengine/minigames/adv/m_swap.cpp
+++ b/engines/qdengine/minigames/adv/m_swap.cpp
@@ -94,7 +94,7 @@ Swap::Swap() {
size_ = getParameter("element_size", runtime->getSize(nodes_[0].obj));
xassert(size_.x > 0.f && size_.y > 0.f && size_.x < 500.f && size_.y < 500.f);
- dprintf("element_size = (%6.2f,%6.2f)\n", size_.x, size_.y);
+ debugC(2, kDebugMinigames, "element_size = (%6.2f,%6.2f)", size_.x, size_.y);
pickedItem_ = -1;
last1_ = last2_ = -1;
@@ -161,7 +161,6 @@ void Swap::quant(float dt) {
}
}
- //dprintf("%d\n", hovPlace);
if (runtime->mouseLeftPressed()) {
if (hovPlace >= 0) { // клик по полю
if (pickedItem_ == -1) { // мышь пуÑтаÑ, берем
diff --git a/engines/qdengine/minigames/adv/m_triangles.cpp b/engines/qdengine/minigames/adv/m_triangles.cpp
index 9b8d165cb8a..051333c551d 100644
--- a/engines/qdengine/minigames/adv/m_triangles.cpp
+++ b/engines/qdengine/minigames/adv/m_triangles.cpp
@@ -181,7 +181,7 @@ MinigameTriangle::~MinigameTriangle() {
}
void MinigameTriangle::Node::debugInfo() const {
- dprintf("name:\"%s\" state:\"%s\" number:%d rotation:%d flip:%d isBack:%d highlight:%d animated:%d\n", obj().getName(), obj()->current_state_name(), number_, rotation_, flip, isBack_, highlight_, animated_);
+ debugC(5, kDebugMinigames, "name:\"%s\" state:\"%s\" number:%d rotation:%d flip:%d isBack:%d highlight:%d animated:%d", obj().getName(), obj()->current_state_name(), number_, rotation_, flip, isBack_, highlight_, animated_);
}
const char *MinigameTriangle::Node::getFaceStateName(int angle, bool selected, bool animated, bool instantaneous) {
@@ -273,9 +273,9 @@ void MinigameTriangle::beginSwapNodes(int pos1, int pos2) {
updateNode(node1, pos1, destination(pos1, pos2));
updateNode(node2, pos2, destination(pos1, pos2));
- //dprintf(">>>>>>>>>>>>>>>>>>>>>>>>>>> change %d <> %d, 1st phase <<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", pos1, pos2);
- //nodes_[pos1].debugInfo();
- //nodes_[pos2].debugInfo();
+ debugC(5, kDebugMinigames, ">>>>>>>>>>>>>>>>>>>>>>>>>>> change %d <> %d, 1st phase <<<<<<<<<<<<<<<<<<<<<<<<<<<<", pos1, pos2);
+ nodes_[pos1].debugInfo();
+ nodes_[pos2].debugInfo();
}
void MinigameTriangle::endSwapNodes(int pos1, int pos2) {
@@ -363,9 +363,9 @@ bool MinigameTriangle::animate(float dt) {
animationTimer_ = 0.f;
animationState_ = SECOND_PHASE;
- //dprintf(">>>>>>>>>>>>>>>>>>>>>>>>>>> change %d <> %d, 2nd phase 1 <<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", animatedNodes_[0], animatedNodes_[1]);
- //node1.debugInfo();
- //node2.debugInfo();
+ debugC(5, kDebugMinigames, ">>>>>>>>>>>>>>>>>>>>>>>>>>> change %d <> %d, 2nd phase 1 <<<<<<<<<<<<<<<<<<<<<<<<<<<<", animatedNodes_[0], animatedNodes_[1]);
+ node1.debugInfo();
+ node2.debugInfo();
return true;
}
@@ -381,9 +381,9 @@ bool MinigameTriangle::animate(float dt) {
animationTimer_ = animationTime_;
animationState_ = FIRD_PHASE;
- //dprintf(">>>>>>>>>>>>>>>>>>>>>>>>>>> change %d <> %d, 2nd phase 2 <<<<<<<<<<<<<<<<<<<<<<<<<<<<\n", animatedNodes_[0], animatedNodes_[1]);
- //node2.debugInfo();
- //node1.debugInfo();
+ debugC(5, kDebugMinigames, ">>>>>>>>>>>>>>>>>>>>>>>>>>> change %d <> %d, 2nd phase 2 <<<<<<<<<<<<<<<<<<<<<<<<<<<<", animatedNodes_[0], animatedNodes_[1]);
+ node2.debugInfo();
+ node1.debugInfo();
return true;
@@ -398,7 +398,7 @@ bool MinigameTriangle::animate(float dt) {
updateNode(node2, animatedNodes_[1]);
endSwapNodes(animatedNodes_[0], animatedNodes_[1]);
- //dprintf("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ change %d <> %d, finished ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n", animatedNodes_[0], animatedNodes_[1]);
+ debugC(5, kDebugMinigames, "^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ change %d <> %d, finished ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^", animatedNodes_[0], animatedNodes_[1]);
animatedNodes_[0] = -1;
animatedNodes_[1] = -1;
@@ -504,8 +504,8 @@ void MinigameTriangle::quant(float dt) {
}
if (runtime->mouseRightPressed() && mousePos >= 0) {
- dprintf("----- DUBUG INFO FOR %d POSITION --------------------\n", mousePos);
- dprintf("row = %d, begin = %d, orientation = %d\n", rowByNum(mousePos), rowBegin(rowByNum(mousePos)), orientation(mousePos));
+ debugC(2, kDebugMinigames, "----- DUBUG INFO FOR %d POSITION --------------------", mousePos);
+ debugC(2, kDebugMinigames, "row = %d, begin = %d, orientation = %d", rowByNum(mousePos), rowBegin(rowByNum(mousePos)), orientation(mousePos));
nodes_[mousePos].debugInfo();
}
}
More information about the Scummvm-git-logs
mailing list