[Scummvm-git-logs] scummvm master -> 9fc0c74b5733303d2dad622cae9bc6d5ee66576f
OMGPizzaGuy
noreply at scummvm.org
Sat Dec 31 02:53:54 UTC 2022
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d713003db0 ULTIMA8: Use debug channel for graphics and remove excess unused logging
9fc0c74b57 ULTIMA8: Fix Kernel::listProcesses command output
Commit: d713003db0aca918b808f38976a55f01100a2112
https://github.com/scummvm/scummvm/commit/d713003db0aca918b808f38976a55f01100a2112
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-30T20:53:26-06:00
Commit Message:
ULTIMA8: Use debug channel for graphics and remove excess unused logging
Changed paths:
engines/ultima/ultima8/convert/convert_shape.cpp
engines/ultima/ultima8/graphics/fonts/font.cpp
engines/ultima/ultima8/graphics/fonts/font_manager.cpp
engines/ultima/ultima8/graphics/shape_archive.cpp
diff --git a/engines/ultima/ultima8/convert/convert_shape.cpp b/engines/ultima/ultima8/convert/convert_shape.cpp
index 6f45022f17c..20101e64956 100644
--- a/engines/ultima/ultima8/convert/convert_shape.cpp
+++ b/engines/ultima/ultima8/convert/convert_shape.cpp
@@ -20,6 +20,7 @@
*/
#include "common/memstream.h"
+#include "ultima/ultima.h"
#include "ultima/ultima8/convert/convert_shape.h"
#include "ultima/ultima8/misc/stream_util.h"
#include "ultima/ultima8/misc/pent_include.h"
@@ -27,12 +28,6 @@
namespace Ultima {
namespace Ultima8 {
-//#define COMP_SHAPENUM 39
-
-#ifdef COMP_SHAPENUM
-extern int shapenum;
-#endif
-
void ConvertShapeFrame::Free() {
delete [] _line_offsets;
_line_offsets = nullptr;
@@ -79,19 +74,11 @@ void ConvertShape::Read(Common::SeekableReadStream &source, const ConvertShapeFo
// Read the header unknown
if (csf->_bytes_header_unk) source.read(_header_unknown, csf->_bytes_header_unk);
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << Std::hex;
-#endif
-
// Now read _num_frames
_num_frames = 1;
if (csf->_bytes_num_frames) _num_frames = readX(source, csf->_bytes_num_frames);
if (_num_frames == 0) _num_frames = CalcNumFrames(source,csf,real_len,start_pos);
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "_num_frames " << _num_frames << Std::endl;
-#endif
-
// if (_num_frames == 0xFFFF || _num_frames == 0xFFFFFF || _num_frames == -1)
// {
// warning("Corrupt shape?);
@@ -105,28 +92,14 @@ void ConvertShape::Read(Common::SeekableReadStream &source, const ConvertShapeFo
// Now read the _frames
for(uint32 f = 0; f < _num_frames; ++f) {
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "Frame " << f << Std::endl;
-#endif
ConvertShapeFrame *frame = _frames + f;
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "Seeking to " << (csf->_len_header + (csf->_len_frameheader * f)) << Std::endl;
- if (shapenum == COMP_SHAPENUM) pout << "Real " << (start_pos + csf->_len_header + (csf->_len_frameheader * f)) << Std::endl;
-#endif
// Seek to initial pos
source.seek(start_pos + csf->_len_header + (csf->_len_frameheader * f));
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "seeked to " << source.pos() << Std::endl;
-#endif
-
// Read the offset
uint32 frame_offset = csf->_len_header + (csf->_len_frameheader * f);
if (csf->_bytes_frame_offset) frame_offset = readX(source, csf->_bytes_frame_offset);
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "frame_offset " << frame_offset << Std::endl;
-#endif
// Read the unknown
if (csf->_bytes_frameheader_unk) source.read(frame->_header_unknown, csf->_bytes_frameheader_unk);
@@ -134,9 +107,6 @@ void ConvertShape::Read(Common::SeekableReadStream &source, const ConvertShapeFo
// Read frame_length
uint32 frame_length = real_len-frame_offset;
if (csf->_bytes_frame_length) frame_length = readX(source, csf->_bytes_frame_length) + csf->_bytes_frame_length_kludge;
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << "frame_length " << frame_length << Std::endl;
-#endif
// Seek to start of frame
source.seek(start_pos + frame_offset + csf->_bytes_special);
@@ -146,10 +116,6 @@ void ConvertShape::Read(Common::SeekableReadStream &source, const ConvertShapeFo
else
frame->Read(source, csf, frame_length);
}
-
-#ifdef COMP_SHAPENUM
- if (shapenum == COMP_SHAPENUM) pout << Std::dec;
-#endif
}
void ConvertShapeFrame::Read(Common::SeekableReadStream &source, const ConvertShapeFormat *csf, uint32 frame_length) {
@@ -163,17 +129,6 @@ void ConvertShapeFrame::Read(Common::SeekableReadStream &source, const ConvertSh
_xoff = readXS(source, csf->_bytes_frame_xoff);
_yoff = readXS(source, csf->_bytes_frame_yoff);
-#ifdef COMP_SHAPENUM
- if (_width <= 0 || _height <= 0 ||shapenum == COMP_SHAPENUM )
- {
- pout << "_compression " << _compression << Std::endl;
- pout << "_width " << _width << Std::endl;
- pout << "_height " << _height << Std::endl;
- pout << "_xoff " << _xoff << Std::endl;
- pout << "_yoff " << _yoff << Std::endl;
- }
-#endif
-
if (_compression != 0 && _compression != 1) {
_compression = 0;
_width = 0;
@@ -199,13 +154,10 @@ void ConvertShapeFrame::Read(Common::SeekableReadStream &source, const ConvertSh
// Calculate the number of bytes of RLE data
_bytes_rle = frame_length - (csf->_len_frameheader2 + (_height * csf->_bytes_line_offset));
-#ifdef COMP_SHAPENUM
if (_bytes_rle < 0) {
_bytes_rle = 0;
warning("Corrupt frame?");
}
-
-#endif
} else
_line_offsets = nullptr;
@@ -401,7 +353,7 @@ int ConvertShape::CalcNumFrames(Common::SeekableReadStream &source, const Conver
uint32 frame_length = real_len-frame_offset;
if (csf->_bytes_frame_length)
frame_length = readX(source, csf->_bytes_frame_length) + csf->_bytes_frame_length_kludge;
- debug(MM_INFO, "Frame %d length = %xh", f, frame_length);
+ debugC(kDebugGraphics, "Frame %d length = %xh", f, frame_length);
}
source.seek(save_pos);
@@ -410,9 +362,7 @@ int ConvertShape::CalcNumFrames(Common::SeekableReadStream &source, const Conver
}
bool ConvertShape::Check(Common::SeekableReadStream &source, const ConvertShapeFormat *csf, uint32 real_len) {
-#if 0
- pout << "Testing " << csf->_name << "..." << Std::endl;
-#endif
+ debugC(kDebugGraphics, "Testing shape format %s...", csf->_name);
bool result = true;
// Just to be safe
@@ -585,13 +535,13 @@ bool ConvertShape::Check(Common::SeekableReadStream &source, const ConvertShapeF
// Return to start position
source.seek(start_pos);
+ if (result)
+ debugC(kDebugGraphics, "Detected Shape Format: %s", csf->_name);
return result;
}
bool ConvertShape::CheckUnsafe(Common::SeekableReadStream &source, const ConvertShapeFormat *csf, uint32 real_len) {
-#if 0
- pout << "Testing " << csf->_name << "..." << Std::endl;
-#endif
+ debugC(kDebugGraphics, "Testing shape format %s...", csf->_name);
bool result = true;
// Just to be safe
@@ -690,6 +640,8 @@ bool ConvertShape::CheckUnsafe(Common::SeekableReadStream &source, const Convert
// Return to start position
source.seek(start_pos);
+ if (result)
+ debugC(kDebugGraphics, "Detected Shape Format: %s", csf->_name);
return result;
}
diff --git a/engines/ultima/ultima8/graphics/fonts/font.cpp b/engines/ultima/ultima8/graphics/fonts/font.cpp
index 2845951f12e..14dc55c7d53 100644
--- a/engines/ultima/ultima8/graphics/fonts/font.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font.cpp
@@ -19,8 +19,8 @@
*
*/
+#include "ultima/ultima.h"
#include "ultima/ultima8/misc/pent_include.h"
-
#include "ultima/ultima8/graphics/fonts/font.h"
namespace Ultima {
@@ -181,10 +181,8 @@ Std::list<PositionedText> typesetText(Font *font,
const Std::string &text, unsigned int &remaining, int32 width, int32 height,
Font::TextAlign align, bool u8specials, int32 &resultwidth,
int32 &resultheight, Std::string::size_type cursor) {
-#if 0
- pout << "typeset (" << width << "," << height << ") : "
- << text << Std::endl;
-#endif
+
+ debugC(kDebugGraphics, "typeset (%d, %d) %s", width, height, text.c_str());
// be optimistic and assume everything will fit
remaining = text.size();
@@ -350,11 +348,9 @@ Std::list<PositionedText> typesetText(Font *font,
lineiter->_dims.moveTo((totalwidth - lineiter->_dims.width()) / 2, lineiter->_dims.top);
break;
}
-#if 0
- pout << lineiter->_dims.x << "," << lineiter->_dims.y << " "
- << lineiter->_dims.width() << "," << lineiter->_dims.height() << ": "
- << lineiter->text << Std::endl;
-#endif
+
+ debugC(kDebugGraphics, "%d, %d, %d, %d: %s", lineiter->_dims.left, lineiter->_dims.top,
+ lineiter->_dims.width(), lineiter->_dims.height(), lineiter->_text.c_str());
}
resultwidth = totalwidth;
diff --git a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
index 4248216296b..4acfbd594b5 100644
--- a/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
+++ b/engines/ultima/ultima8/graphics/fonts/font_manager.cpp
@@ -19,6 +19,7 @@
*
*/
+#include "ultima/ultima.h"
#include "ultima/ultima8/misc/pent_include.h"
#include "ultima/ultima8/graphics/fonts/font_manager.h"
@@ -117,10 +118,7 @@ Graphics::Font *FontManager::getTTF_Font(const Std::string &filename, int points
_ttfFonts[id] = font;
-#ifdef DEBUG
- pout << "Opened TTF: data/" << filename << "." << Std::endl;
-#endif
-
+ debugC(kDebugGraphics, "Opened TTF: data/%s.", filename.c_str());
return font;
#else // !USE_FREETYPE2
return nullptr;
@@ -152,10 +150,7 @@ bool FontManager::addTTFOverride(unsigned int fontnum, const Std::string &filena
setOverride(fontnum, font);
-#ifdef DEBUG
- pout << "Added TTF override for font " << fontnum << Std::endl;
-#endif
-
+ debugC(kDebugGraphics, "Added TTF override for font %u", fontnum);
return true;
}
@@ -184,10 +179,7 @@ bool FontManager::addJPOverride(unsigned int fontnum,
}
palman->updatedPalette(fontpal);
-#ifdef DEBUG
- pout << "Added JP override for font " << fontnum << Std::endl;
-#endif
-
+ debugC(kDebugGraphics, "Added JP override for font %u", fontnum);
return true;
}
diff --git a/engines/ultima/ultima8/graphics/shape_archive.cpp b/engines/ultima/ultima8/graphics/shape_archive.cpp
index d2217665beb..6a363be79a6 100644
--- a/engines/ultima/ultima8/graphics/shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/shape_archive.cpp
@@ -54,7 +54,6 @@ void ShapeArchive::cache(uint32 shapenum) {
// Auto detect format
if (!_format) {
_format = Shape::DetectShapeFormat(data, shpsize);
- if (_format) pout << "Detected Shape Format: " << _format->_name << Std::endl;
}
if (!_format) {
Commit: 9fc0c74b5733303d2dad622cae9bc6d5ee66576f
https://github.com/scummvm/scummvm/commit/9fc0c74b5733303d2dad622cae9bc6d5ee66576f
Author: Matthew Jimenez (matthew.jimenez at outlook.com)
Date: 2022-12-30T20:53:26-06:00
Commit Message:
ULTIMA8: Fix Kernel::listProcesses command output
A mix of logging methods caused data to be skipped on the debug console. Building a string in Process::dumpInfo instead of logging allows for flexible use.
Changed paths:
engines/ultima/ultima8/gumps/gump_notify_process.cpp
engines/ultima/ultima8/gumps/gump_notify_process.h
engines/ultima/ultima8/kernel/delay_process.cpp
engines/ultima/ultima8/kernel/delay_process.h
engines/ultima/ultima8/kernel/process.cpp
engines/ultima/ultima8/kernel/process.h
engines/ultima/ultima8/misc/debugger.cpp
engines/ultima/ultima8/usecode/uc_process.cpp
engines/ultima/ultima8/usecode/uc_process.h
engines/ultima/ultima8/world/actors/actor_anim_process.cpp
engines/ultima/ultima8/world/actors/actor_anim_process.h
engines/ultima/ultima8/world/actors/attack_process.cpp
engines/ultima/ultima8/world/actors/attack_process.h
engines/ultima/ultima8/world/actors/combat_process.cpp
engines/ultima/ultima8/world/actors/combat_process.h
engines/ultima/ultima8/world/actors/loiter_process.cpp
engines/ultima/ultima8/world/actors/loiter_process.h
engines/ultima/ultima8/world/gravity_process.cpp
engines/ultima/ultima8/world/gravity_process.h
diff --git a/engines/ultima/ultima8/gumps/gump_notify_process.cpp b/engines/ultima/ultima8/gumps/gump_notify_process.cpp
index 87bb3b56ea6..adffe7fae5e 100644
--- a/engines/ultima/ultima8/gumps/gump_notify_process.cpp
+++ b/engines/ultima/ultima8/gumps/gump_notify_process.cpp
@@ -65,9 +65,9 @@ void GumpNotifyProcess::terminate() {
void GumpNotifyProcess::run() {
}
-void GumpNotifyProcess::dumpInfo() const {
- Process::dumpInfo();
- pout << " gump: " << _gump << Std::endl;
+Common::String GumpNotifyProcess::dumpInfo() const {
+ return Process::dumpInfo() +
+ Common::String::format(", gump: %u", _gump);
}
void GumpNotifyProcess::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/gumps/gump_notify_process.h b/engines/ultima/ultima8/gumps/gump_notify_process.h
index d0cd45d9c56..1b3c26a724e 100644
--- a/engines/ultima/ultima8/gumps/gump_notify_process.h
+++ b/engines/ultima/ultima8/gumps/gump_notify_process.h
@@ -51,7 +51,7 @@ public:
void run() override;
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
diff --git a/engines/ultima/ultima8/kernel/delay_process.cpp b/engines/ultima/ultima8/kernel/delay_process.cpp
index b8c3eabf6a6..1afcc883aa9 100644
--- a/engines/ultima/ultima8/kernel/delay_process.cpp
+++ b/engines/ultima/ultima8/kernel/delay_process.cpp
@@ -39,9 +39,9 @@ void DelayProcess::run() {
terminate();
}
-void DelayProcess::dumpInfo() const {
- Process::dumpInfo();
- pout << "Frames left: " << _count << Std::endl;
+Common::String DelayProcess::dumpInfo() const {
+ return Process::dumpInfo() +
+ Common::String::format(", frames left: %d", _count);
}
diff --git a/engines/ultima/ultima8/kernel/delay_process.h b/engines/ultima/ultima8/kernel/delay_process.h
index 7b445bbea52..5c7e8d96a76 100644
--- a/engines/ultima/ultima8/kernel/delay_process.h
+++ b/engines/ultima/ultima8/kernel/delay_process.h
@@ -39,7 +39,7 @@ public:
void run() override;
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
diff --git a/engines/ultima/ultima8/kernel/process.cpp b/engines/ultima/ultima8/kernel/process.cpp
index 7aacb97ba54..e55141ad0ff 100644
--- a/engines/ultima/ultima8/kernel/process.cpp
+++ b/engines/ultima/ultima8/kernel/process.cpp
@@ -104,7 +104,7 @@ void Process::suspend() {
_flags |= PROC_SUSPENDED;
}
-void Process::dumpInfo() const {
+Common::String Process::dumpInfo() const {
Common::String info = Common::String::format(
"Process %d class %s, item %d, type %x, status ",
getPid(), GetClassType()._className, _itemNum, _type);
@@ -125,7 +125,7 @@ void Process::dumpInfo() const {
}
}
- g_debugger->debugPrintf("%s\n", info.c_str());
+ return info;
}
void Process::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/kernel/process.h b/engines/ultima/ultima8/kernel/process.h
index dfe1240d31d..dda666fd869 100644
--- a/engines/ultima/ultima8/kernel/process.h
+++ b/engines/ultima/ultima8/kernel/process.h
@@ -110,8 +110,8 @@ public:
return _ticksPerRun;
}
- //! dump some info about this process to pout
- virtual void dumpInfo() const;
+ //! dump some info about this process to a string
+ virtual Common::String dumpInfo() const;
//! load Process data
bool loadData(Common::ReadStream *rs, uint32 version);
diff --git a/engines/ultima/ultima8/misc/debugger.cpp b/engines/ultima/ultima8/misc/debugger.cpp
index 90d54b2468c..abdad27b389 100644
--- a/engines/ultima/ultima8/misc/debugger.cpp
+++ b/engines/ultima/ultima8/misc/debugger.cpp
@@ -876,8 +876,9 @@ bool Debugger::cmdListProcesses(int argc, const char **argv) {
for (ProcessIterator it = kern->_processes.begin();
it != kern->_processes.end(); ++it) {
Process *p = *it;
- if (argc == 1 || p->_itemNum == item)
- p->dumpInfo();
+ if (argc == 1 || p->_itemNum == item) {
+ debugPrintf("%s\n", p->dumpInfo().c_str());
+ }
}
}
@@ -896,7 +897,7 @@ bool Debugger::cmdProcessInfo(int argc, const char **argv) {
if (p == 0) {
debugPrintf("No such process: %d\n", procid);
} else {
- p->dumpInfo();
+ debugPrintf("%s\n", p->dumpInfo().c_str());
}
}
diff --git a/engines/ultima/ultima8/usecode/uc_process.cpp b/engines/ultima/ultima8/usecode/uc_process.cpp
index e5c8d2bd084..04161043be4 100644
--- a/engines/ultima/ultima8/usecode/uc_process.cpp
+++ b/engines/ultima/ultima8/usecode/uc_process.cpp
@@ -140,16 +140,17 @@ void UCProcess::terminate() {
Process::terminate();
}
-void UCProcess::dumpInfo() const {
- Process::dumpInfo();
+Common::String UCProcess::dumpInfo() const {
+ Common::String info = Process::dumpInfo();
if (_classId == 0xFFFF) {
- pout.Print("IP undefined\n");
+ info += ", IP undefined";
} else {
const char *classname = GameData::get_instance()->getMainUsecode()->
get_class_name(_classId);
- pout.Print("classname: %s, IP: %04X:%04X\n", classname, _classId, _ip);
+ info += Common::String::format(", classname: %s, IP: %04X:%04X", classname, _classId, _ip);
}
+ return info;
}
void UCProcess::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/usecode/uc_process.h b/engines/ultima/ultima8/usecode/uc_process.h
index 2230273c9d6..ff0939126ff 100644
--- a/engines/ultima/ultima8/usecode/uc_process.h
+++ b/engines/ultima/ultima8/usecode/uc_process.h
@@ -52,8 +52,7 @@ public:
_temp32 = retval;
}
- //! dump some info about this process to pout
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
index 7090c194a8a..931ec4e8f3e 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.cpp
@@ -699,9 +699,9 @@ void ActorAnimProcess::terminate() {
Process::terminate();
}
-void ActorAnimProcess::dumpInfo() const {
- Process::dumpInfo();
- pout << "_action: " << _action << ", _dir: " << _dir << Std::endl;
+Common::String ActorAnimProcess::dumpInfo() const {
+ return Process::dumpInfo() +
+ Common::String::format(", _action: %d, _dir: %d", _action, _dir);
}
void ActorAnimProcess::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/world/actors/actor_anim_process.h b/engines/ultima/ultima8/world/actors/actor_anim_process.h
index bee095569d6..111b50b6ce1 100644
--- a/engines/ultima/ultima8/world/actors/actor_anim_process.h
+++ b/engines/ultima/ultima8/world/actors/actor_anim_process.h
@@ -49,7 +49,7 @@ public:
void terminate() override;
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
Animation::Sequence getAction() const {
return _action;
diff --git a/engines/ultima/ultima8/world/actors/attack_process.cpp b/engines/ultima/ultima8/world/actors/attack_process.cpp
index 05a8dec3333..6b8efd44344 100644
--- a/engines/ultima/ultima8/world/actors/attack_process.cpp
+++ b/engines/ultima/ultima8/world/actors/attack_process.cpp
@@ -1111,9 +1111,8 @@ uint16 AttackProcess::readNextWordRaw() {
return _tacticDatReadStream->readUint16LE();
}
-void AttackProcess::dumpInfo() const {
- Process::dumpInfo();
-
+Common::String AttackProcess::dumpInfo() const {
+ return Process::dumpInfo();
}
void AttackProcess::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/world/actors/attack_process.h b/engines/ultima/ultima8/world/actors/attack_process.h
index d223c42fc29..f71645ab9c2 100644
--- a/engines/ultima/ultima8/world/actors/attack_process.h
+++ b/engines/ultima/ultima8/world/actors/attack_process.h
@@ -51,7 +51,7 @@ public:
void terminate() override;
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
void setIsActivityAOrB() {
_isActivityAorB = true;
diff --git a/engines/ultima/ultima8/world/actors/combat_process.cpp b/engines/ultima/ultima8/world/actors/combat_process.cpp
index aed3fe84e73..fad7ccd5ac8 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.cpp
+++ b/engines/ultima/ultima8/world/actors/combat_process.cpp
@@ -300,9 +300,9 @@ void CombatProcess::waitForTarget() {
}
}
-void CombatProcess::dumpInfo() const {
- Process::dumpInfo();
- pout << "Target: " << _target << Std::endl;
+Common::String CombatProcess::dumpInfo() const {
+ return Process::dumpInfo() +
+ Common::String::format(", target: %u", _target);
}
void CombatProcess::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/world/actors/combat_process.h b/engines/ultima/ultima8/world/actors/combat_process.h
index 940cef5c980..c52fe43301e 100644
--- a/engines/ultima/ultima8/world/actors/combat_process.h
+++ b/engines/ultima/ultima8/world/actors/combat_process.h
@@ -45,7 +45,7 @@ public:
void setTarget(ObjId target);
ObjId seekTarget();
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.cpp b/engines/ultima/ultima8/world/actors/loiter_process.cpp
index b9fbb3d3e66..9786823fd23 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.cpp
+++ b/engines/ultima/ultima8/world/actors/loiter_process.cpp
@@ -116,9 +116,9 @@ void LoiterProcess::run() {
}
}
-void LoiterProcess::dumpInfo() const {
- Process::dumpInfo();
- pout << "Frames left: " << _count;
+Common::String LoiterProcess::dumpInfo() const {
+ return Process::dumpInfo() +
+ Common::String::format(", frames left: %d", _count);
}
void LoiterProcess::saveData(Common::WriteStream *ws) {
diff --git a/engines/ultima/ultima8/world/actors/loiter_process.h b/engines/ultima/ultima8/world/actors/loiter_process.h
index be5f3139409..81dcc08b44b 100644
--- a/engines/ultima/ultima8/world/actors/loiter_process.h
+++ b/engines/ultima/ultima8/world/actors/loiter_process.h
@@ -41,7 +41,7 @@ public:
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
protected:
int32 _count;
};
diff --git a/engines/ultima/ultima8/world/gravity_process.cpp b/engines/ultima/ultima8/world/gravity_process.cpp
index 79ec576575d..54a6dbf2c56 100644
--- a/engines/ultima/ultima8/world/gravity_process.cpp
+++ b/engines/ultima/ultima8/world/gravity_process.cpp
@@ -374,11 +374,9 @@ void GravityProcess::actorFallStoppedCru(Actor *actor, int height) {
}
}
-void GravityProcess::dumpInfo() const {
- Process::dumpInfo();
-
- pout << "_gravity: " << _gravity << ", speed: (" << _xSpeed << ","
- << _ySpeed << "," << _zSpeed << ")" << Std::endl;
+Common::String GravityProcess::dumpInfo() const {
+ return Process::dumpInfo() +
+ Common::String::format(", _gravity: %d, speed: (%d, %d, %d)", _gravity, _xSpeed, _ySpeed, _zSpeed);
}
diff --git a/engines/ultima/ultima8/world/gravity_process.h b/engines/ultima/ultima8/world/gravity_process.h
index 95754873edf..8ed17821a9c 100644
--- a/engines/ultima/ultima8/world/gravity_process.h
+++ b/engines/ultima/ultima8/world/gravity_process.h
@@ -46,7 +46,7 @@ public:
void run() override;
void terminate() override;
- void dumpInfo() const override;
+ Common::String dumpInfo() const override;
bool loadData(Common::ReadStream *rs, uint32 version);
void saveData(Common::WriteStream *ws) override;
More information about the Scummvm-git-logs
mailing list