aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/bladerunner/debugger.cpp24
-rw-r--r--engines/bladerunner/ui/kia_section_crimes.cpp10
-rw-r--r--engines/bladerunner/ui/kia_section_suspects.cpp10
3 files changed, 17 insertions, 27 deletions
diff --git a/engines/bladerunner/debugger.cpp b/engines/bladerunner/debugger.cpp
index d7315afec6..4d2ffa0aba 100644
--- a/engines/bladerunner/debugger.cpp
+++ b/engines/bladerunner/debugger.cpp
@@ -2064,10 +2064,8 @@ bool Debugger::cmdList(int argc, const char **argv) {
if (waypoint->setId != _vm->_scene->getSetId()) {
continue;
}
- char waypointText[40];
Vector3 a = waypoint->position;
- sprintf(waypointText, "Waypoint %i, Pos(%02.2f,%02.2f,%02.2f)", i, a.x, a.y, a.z);
- debugPrintf("%s\n", waypointText);
+ debugPrintf("Waypoint %i, Pos(%02.2f,%02.2f,%02.2f)\n", i, a.x, a.y, a.z);
++count;
}
@@ -2077,10 +2075,8 @@ bool Debugger::cmdList(int argc, const char **argv) {
if (cover->setId != _vm->_scene->getSetId()) {
continue;
}
- char coverText[40];
Vector3 a = cover->position;
- sprintf(coverText, "Cover %i, Pos(%02.2f,%02.2f,%02.2f)", i, a.x, a.y, a.z);
- debugPrintf("%s\n", coverText);
+ debugPrintf("Cover %i, Pos(%02.2f,%02.2f,%02.2f)\n", i, a.x, a.y, a.z);
++count;
}
@@ -2090,10 +2086,8 @@ bool Debugger::cmdList(int argc, const char **argv) {
if (flee->setId != _vm->_scene->getSetId()) {
continue;
}
- char fleeText[40];
Vector3 a = flee->position;
- sprintf(fleeText, "Flee %i, Pos(%02.2f,%02.2f,%02.2f)", i, a.x, a.y, a.z);
- debugPrintf("%s\n", fleeText);
+ debugPrintf("Flee %i, Pos(%02.2f,%02.2f,%02.2f)\n", i, a.x, a.y, a.z);
++count;
}
debugPrintf("%d waypoints were found in scene.\n", count);
@@ -2229,9 +2223,8 @@ void Debugger::drawSceneObjects() {
|| (_specificItemsDrawn && findInDbgDrawList(debuggerObjTypeItem, sceneObject->id - kSceneObjectOffsetItems, -1, -1) != -1)
) {
color = _vm->_surfaceFront.format.RGBToColor(0, 255, 0);
- char itemText[40];
drawBBox(a, b, _vm->_view, &_vm->_surfaceFront, color);
- sprintf(itemText, "item %i", sceneObject->id - kSceneObjectOffsetItems);
+ Common::String itemText = Common::String::format("item %i", sceneObject->id - kSceneObjectOffsetItems);
_vm->_surfaceFront.frameRect(sceneObject->screenRectangle, color);
_vm->_mainFont->drawString(&_vm->_surfaceFront, itemText, pos.x, pos.y, _vm->_surfaceFront.w, color);
}
@@ -2369,8 +2362,7 @@ void Debugger::drawWaypoints() {
int color = _vm->_surfaceFront.format.RGBToColor(255, 255, 255);
drawBBox(pos - size, pos + size, _vm->_view, &_vm->_surfaceFront, color);
Vector3 spos = _vm->_view->calculateScreenPosition(pos);
- char waypointText[40];
- sprintf(waypointText, "waypoint %i", i);
+ Common::String waypointText = Common::String::format("waypoint %i", i);
_vm->_mainFont->drawString(&_vm->_surfaceFront, waypointText, spos.x, spos.y, _vm->_surfaceFront.w, color);
}
}
@@ -2391,8 +2383,7 @@ void Debugger::drawWaypoints() {
int color = _vm->_surfaceFront.format.RGBToColor(255, 0, 255);
drawBBox(pos - size, pos + size, _vm->_view, &_vm->_surfaceFront, color);
Vector3 spos = _vm->_view->calculateScreenPosition(pos);
- char coverText[40];
- sprintf(coverText, "cover %i", i);
+ Common::String coverText = Common::String::format("cover %i", i);
_vm->_mainFont->drawString(&_vm->_surfaceFront, coverText, spos.x, spos.y, _vm->_surfaceFront.w, color);
}
}
@@ -2413,8 +2404,7 @@ void Debugger::drawWaypoints() {
int color = _vm->_surfaceFront.format.RGBToColor(0, 255, 255);
drawBBox(pos - size, pos + size, _vm->_view, &_vm->_surfaceFront, color);
Vector3 spos = _vm->_view->calculateScreenPosition(pos);
- char fleeText[40];
- sprintf(fleeText, "flee %i", i);
+ Common::String fleeText = Common::String::format("flee %i", i);
_vm->_mainFont->drawString(&_vm->_surfaceFront, fleeText, spos.x, spos.y, _vm->_surfaceFront.w, color);
}
}
diff --git a/engines/bladerunner/ui/kia_section_crimes.cpp b/engines/bladerunner/ui/kia_section_crimes.cpp
index 2b335e4793..4eedd8c284 100644
--- a/engines/bladerunner/ui/kia_section_crimes.cpp
+++ b/engines/bladerunner/ui/kia_section_crimes.cpp
@@ -167,7 +167,7 @@ void KIASectionCrimes::draw(Graphics::Surface &surface) {
surface.vLine(267, 304, 315, surface.format.RGBToColor(88, 80, 96));
surface.hLine(267, 316, 267, surface.format.RGBToColor(72, 64, 72));
- char generatedText[64];
+ Common::String generatedText;
if (_suspectSelected == -1) {
text = _vm->_textKIA->getText(22);
} else {
@@ -175,11 +175,11 @@ void KIASectionCrimes::draw(Graphics::Surface &surface) {
if (_suspectsWithIdentity[_suspectSelected]) {
text = suspectName;
} else if (_vm->_suspectsDatabase->get(_suspectSelected)->getSex()) {
- sprintf(generatedText, "%s %s", _vm->_textKIA->getText(20), _vm->_kia->scrambleSuspectsName(suspectName));
- text = generatedText;
+ generatedText = Common::String::format("%s %s", _vm->_textKIA->getText(20), _vm->_kia->scrambleSuspectsName(suspectName));
+ text = generatedText.c_str();
} else {
- sprintf(generatedText, "%s %s", _vm->_textKIA->getText(21), _vm->_kia->scrambleSuspectsName(suspectName));
- text = generatedText;
+ generatedText = Common::String::format("%s %s", _vm->_textKIA->getText(21), _vm->_kia->scrambleSuspectsName(suspectName));
+ text = generatedText.c_str();
}
}
_vm->_mainFont->drawString(&surface, text, 201 - _vm->_mainFont->getStringWidth(text) / 2, 306, surface.w, surface.format.RGBToColor(136, 168, 255));
diff --git a/engines/bladerunner/ui/kia_section_suspects.cpp b/engines/bladerunner/ui/kia_section_suspects.cpp
index 962d0a332f..93895a7d5b 100644
--- a/engines/bladerunner/ui/kia_section_suspects.cpp
+++ b/engines/bladerunner/ui/kia_section_suspects.cpp
@@ -203,7 +203,7 @@ void KIASectionSuspects::draw(Graphics::Surface &surface) {
surface.vLine(251, 134, 145, surface.format.RGBToColor(88, 80, 96));
surface.hLine(251, 146, 251, surface.format.RGBToColor(72, 64, 72));
- char generatedText[64];
+ Common::String generatedText;
if (_suspectSelected == -1) {
text = _vm->_textKIA->getText(22);
} else {
@@ -211,11 +211,11 @@ void KIASectionSuspects::draw(Graphics::Surface &surface) {
if (_suspectsWithIdentity[_suspectSelected]) {
text = suspectName;
} else if (_vm->_suspectsDatabase->get(_suspectSelected)->getSex()) {
- sprintf(generatedText, "%s %s", _vm->_textKIA->getText(20), _vm->_kia->scrambleSuspectsName(suspectName));
- text = generatedText;
+ generatedText = Common::String::format("%s %s", _vm->_textKIA->getText(20), _vm->_kia->scrambleSuspectsName(suspectName));
+ text = generatedText.c_str();
} else {
- sprintf(generatedText, "%s %s", _vm->_textKIA->getText(21), _vm->_kia->scrambleSuspectsName(suspectName));
- text = generatedText;
+ generatedText = Common::String::format("%s %s", _vm->_textKIA->getText(21), _vm->_kia->scrambleSuspectsName(suspectName));
+ text = generatedText.c_str();
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 13:14:53 +0000