[Scummvm-git-logs] scummvm master -> 1e07ed582d8bc81eabaf6e592bc36cf670a51c6f
sev-
noreply at scummvm.org
Mon Oct 24 09:12:54 UTC 2022
This automated email contains information about 12 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
25833ad126 PINK: Init structure. CID 1428860
0e60adfa58 PEETKA: Init class variables CID 1428864
d56f1ea53c PETKA: Prefer copy over resource leak.
a156789f40 PETKA: Init class variables. CID 1428847
0bb127e4fb PETKA: Add default constructor. CID 1429040
bfc606770e PETKA: Init class member variables. CID 1428851
527ddedc37 PETKA: Init class variables. CID 1428882
eeeb0a7099 PETKA: Init structure on instantiation. CID 1428871
85b239fd3e PETKA: Avoid unnecessary object copying. CID 1498689
eb752bf109 PETKA: Avoid unnecessary object copying. CID 1498702
8f2c6b0bac PETKA: Init class variables. CID 1429743
1e07ed582d PETKA: Init Walk class variables. CID 1433125
Commit: 25833ad126d8a22dd47371bad54610d112d77d21
https://github.com/scummvm/scummvm/commit/25833ad126d8a22dd47371bad54610d112d77d21
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:27+02:00
Commit Message:
PINK: Init structure. CID 1428860
Changed paths:
engines/petka/base.h
diff --git a/engines/petka/base.h b/engines/petka/base.h
index 0dc3dc1829f..dbf0beced68 100644
--- a/engines/petka/base.h
+++ b/engines/petka/base.h
@@ -96,7 +96,11 @@ enum Opcode {
class QMessageObject;
struct QMessage {
- QMessage() {}
+ QMessage() {
+ objId = opcode = arg1 = arg2 = arg3 = 0;
+ sender = nullptr;
+ unk = 0;
+ }
QMessage(uint16 _objId, uint16 _opcode, uint16 _arg1, int16 _arg2, int16 _arg3, QMessageObject *_sender, int _unk) {
this->objId = _objId;
this->opcode = _opcode;
Commit: 0e60adfa586dc88460929b31ddd68fd6ba68f226
https://github.com/scummvm/scummvm/commit/0e60adfa586dc88460929b31ddd68fd6ba68f226
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:27+02:00
Commit Message:
PEETKA: Init class variables CID 1428864
Changed paths:
engines/petka/interfaces/dialog_interface.cpp
diff --git a/engines/petka/interfaces/dialog_interface.cpp b/engines/petka/interfaces/dialog_interface.cpp
index 4e8f1777672..c0d7a19b031 100644
--- a/engines/petka/interfaces/dialog_interface.cpp
+++ b/engines/petka/interfaces/dialog_interface.cpp
@@ -46,6 +46,9 @@ DialogInterface::DialogInterface() {
_sender = nullptr;
_reaction = nullptr;
_firstTime = true;
+
+ _savedCursorId = _savedCursorActType = 0;
+ _wasCursorAnim = _wasCursorShown = false;
}
DialogInterface::~DialogInterface() {
Commit: d56f1ea53c163f53966ab3b6b3716b7edb89b4c2
https://github.com/scummvm/scummvm/commit/d56f1ea53c163f53966ab3b6b3716b7edb89b4c2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:28+02:00
Commit Message:
PETKA: Prefer copy over resource leak.
Fixes CID 1429046, 1433642, 1428846, 1429047, 1433123, 1433641,
1428973, 1429049, 1428856, 1428867, 1428869, 1429039, 1428850,
1433640
Changed paths:
engines/petka/flc.cpp
engines/petka/flc.h
diff --git a/engines/petka/flc.cpp b/engines/petka/flc.cpp
index 7642297bae9..c161850d4e1 100644
--- a/engines/petka/flc.cpp
+++ b/engines/petka/flc.cpp
@@ -65,20 +65,20 @@ void FlicDecoder::load(Common::SeekableReadStream *stream, Common::SeekableReadS
delete mskStream;
}
-const Common::Rect &FlicDecoder::getBounds() const {
+const Common::Rect FlicDecoder::getBounds() const {
const Track *track = getTrack(0);
if (track)
return ((const FlicVideoTrack *)track)->getBounds();
- return *(new Common::Rect(0, 0));
+ return Common::Rect(0, 0);
}
-const Common::Array<Common::Rect> &FlicDecoder::getMskRects() const {
+const Common::Array<Common::Rect> FlicDecoder::getMskRects() const {
const Track *track = getTrack(0);
if (track)
return ((const FlicVideoTrack *)track)->getMskRects();
- return *(new Common::Array<Common::Rect>());
+ return Common::Array<Common::Rect>();
}
uint32 FlicDecoder::getTransColor(const Graphics::PixelFormat &fmt) const {
@@ -160,7 +160,7 @@ bool FlicDecoder::FlicVideoTrack::loadMsk(Common::SeekableReadStream &stream) {
return true;
}
-const Common::Rect &FlicDecoder::FlicVideoTrack::getBounds() const {
+const Common::Rect FlicDecoder::FlicVideoTrack::getBounds() const {
return _bounds;
}
@@ -168,7 +168,7 @@ const Graphics::Surface *FlicDecoder::FlicVideoTrack::getSurface() const {
return _surface;
}
-const Common::Array<Common::Rect> &FlicDecoder::FlicVideoTrack::getMskRects() const {
+const Common::Array<Common::Rect> FlicDecoder::FlicVideoTrack::getMskRects() const {
assert(_curFrame >= 0);
return _msk[_curFrame];
}
diff --git a/engines/petka/flc.h b/engines/petka/flc.h
index 84391b46c6e..b649131d98e 100644
--- a/engines/petka/flc.h
+++ b/engines/petka/flc.h
@@ -33,8 +33,8 @@ public:
void setFrame(int frame);
uint getDelay() const;
- const Common::Rect &getBounds() const;
- const Common::Array<Common::Rect> &getMskRects() const;
+ const Common::Rect getBounds() const;
+ const Common::Array<Common::Rect> getMskRects() const;
const Graphics::Surface *getCurrentFrame() const;
uint32 getTransColor(const Graphics::PixelFormat &fmt) const;
@@ -48,8 +48,8 @@ protected:
bool loadMsk(Common::SeekableReadStream &stream);
uint getDelay() const;
- const Common::Rect &getBounds() const;
- const Common::Array<Common::Rect> &getMskRects() const;
+ const Common::Rect getBounds() const;
+ const Common::Array<Common::Rect> getMskRects() const;
const Graphics::Surface *getSurface() const;
private:
Commit: a156789f4027019c4761203e2d809cb28ea7a9c4
https://github.com/scummvm/scummvm/commit/a156789f4027019c4761203e2d809cb28ea7a9c4
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:28+02:00
Commit Message:
PETKA: Init class variables. CID 1428847
Changed paths:
engines/petka/interfaces/main.cpp
diff --git a/engines/petka/interfaces/main.cpp b/engines/petka/interfaces/main.cpp
index 7ae6609de8b..af1e6e89b37 100644
--- a/engines/petka/interfaces/main.cpp
+++ b/engines/petka/interfaces/main.cpp
@@ -43,8 +43,12 @@ namespace Petka {
InterfaceMain::InterfaceMain() {
Common::ScopedPtr<Common::SeekableReadStream> stream(g_vm->openFile("backgrnd.bg", true));
+ _hasTextDesc = false;
+ _roomId = 0;
+
if (!stream)
return;
+
_bgs.resize(stream->readUint32LE());
for (uint i = 0; i < _bgs.size(); ++i) {
_bgs[i].objId = stream->readUint16LE();
Commit: 0bb127e4fbdc4b828f06a1486eecf27579dc5c5d
https://github.com/scummvm/scummvm/commit/0bb127e4fbdc4b828f06a1486eecf27579dc5c5d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:28+02:00
Commit Message:
PETKA: Add default constructor. CID 1429040
Changed paths:
engines/petka/interfaces/map.h
diff --git a/engines/petka/interfaces/map.h b/engines/petka/interfaces/map.h
index 017fc6f0939..3be5aae53f0 100644
--- a/engines/petka/interfaces/map.h
+++ b/engines/petka/interfaces/map.h
@@ -28,6 +28,7 @@ namespace Petka {
class InterfaceMap: public SubInterface {
public:
+ InterfaceMap() : _roomResID(0) {}
void start(int id) override;
void stop() override;
Commit: bfc606770e5b152a1ba25ae13f78d32271120f7b
https://github.com/scummvm/scummvm/commit/bfc606770e5b152a1ba25ae13f78d32271120f7b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:28+02:00
Commit Message:
PETKA: Init class member variables. CID 1428851
Changed paths:
engines/petka/objects/heroes.cpp
diff --git a/engines/petka/objects/heroes.cpp b/engines/petka/objects/heroes.cpp
index 74de40612d6..209589fde8f 100644
--- a/engines/petka/objects/heroes.cpp
+++ b/engines/petka/objects/heroes.cpp
@@ -46,6 +46,11 @@ QObjectPetka::QObjectPetka()
_surfH = 0;
_surfW = 0;
_k = 1.0;
+
+ _x_ = _y_ = 0;
+ _destX = _destY = 0;
+ _imageId = 0;
+ _fieldB4 = 0;
}
void QObjectPetka::processMessage(const QMessage &arg) {
Commit: 527ddedc37282500f8cbeddd4a25f013b6c8f5ee
https://github.com/scummvm/scummvm/commit/527ddedc37282500f8cbeddd4a25f013b6c8f5ee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:28+02:00
Commit Message:
PETKA: Init class variables. CID 1428882
Changed paths:
engines/petka/objects/object.cpp
diff --git a/engines/petka/objects/object.cpp b/engines/petka/objects/object.cpp
index 1793b630705..3240b7f1c8c 100644
--- a/engines/petka/objects/object.cpp
+++ b/engines/petka/objects/object.cpp
@@ -65,6 +65,11 @@ QMessageObject::QMessageObject() {
_loopedSound = false;
_startSound = false;
_reaction = nullptr;
+
+ _x = _y = _walkX = _walkY = 0;
+ _frame = 0;
+ _sound = nullptr;
+ _reactionId = 0;
}
void QMessageObject::processMessage(const QMessage &msg) {
Commit: eeeb0a7099270ab5dad83b110dccd1b1dbb3385b
https://github.com/scummvm/scummvm/commit/eeeb0a7099270ab5dad83b110dccd1b1dbb3385b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:28+02:00
Commit Message:
PETKA: Init structure on instantiation. CID 1428871
Changed paths:
engines/petka/objects/object_bg.h
diff --git a/engines/petka/objects/object_bg.h b/engines/petka/objects/object_bg.h
index bbc416c0fe3..be09f3f6f9f 100644
--- a/engines/petka/objects/object_bg.h
+++ b/engines/petka/objects/object_bg.h
@@ -33,6 +33,8 @@ struct Perspective {
int y0;
int y1;
double f1;
+
+ Perspective() { f0 = f1 = 1.0; k = 0.0; y0 = 0; y1 = 480; }
};
class QObjectBG : public QMessageObject {
Commit: 85b239fd3e07449ac93e5637cb9028909db5263d
https://github.com/scummvm/scummvm/commit/85b239fd3e07449ac93e5637cb9028909db5263d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:29+02:00
Commit Message:
PETKA: Avoid unnecessary object copying. CID 1498689
Changed paths:
engines/petka/objects/text.cpp
diff --git a/engines/petka/objects/text.cpp b/engines/petka/objects/text.cpp
index fe3731eaba0..e74446db7fd 100644
--- a/engines/petka/objects/text.cpp
+++ b/engines/petka/objects/text.cpp
@@ -164,7 +164,7 @@ void QTextDescription::draw() {
Graphics::Surface *s = resMgr->getSurface(-2);
FlicDecoder *flc = resMgr->getFlic(6008);
- for (auto dirty : videoSys->rects()) {
+ for (auto &dirty : videoSys->rects()) {
videoSys->transBlitFrom(*s, dirty, dirty, flc->getTransColor(s->format));
}
}
Commit: eb752bf109b9cd97538bba5580a6c5d507304918
https://github.com/scummvm/scummvm/commit/eb752bf109b9cd97538bba5580a6c5d507304918
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:29+02:00
Commit Message:
PETKA: Avoid unnecessary object copying. CID 1498702
Changed paths:
engines/petka/video.cpp
diff --git a/engines/petka/video.cpp b/engines/petka/video.cpp
index aa8d8a64a2f..5cc2ef1155d 100644
--- a/engines/petka/video.cpp
+++ b/engines/petka/video.cpp
@@ -94,7 +94,7 @@ void VideoSystem::addDirtyRect(Common::Point pos, FlicDecoder &flc) {
}
void VideoSystem::addDirtyMskRects(Common::Point pos, FlicDecoder &flc) {
- for (auto rect : flc.getMskRects()) {
+ for (auto &rect : flc.getMskRects()) {
addDirtyRect(pos, rect);
}
}
Commit: 8f2c6b0bac766f39251070c7863a4a21455e61ee
https://github.com/scummvm/scummvm/commit/8f2c6b0bac766f39251070c7863a4a21455e61ee
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:29+02:00
Commit Message:
PETKA: Init class variables. CID 1429743
Changed paths:
engines/petka/q_system.cpp
diff --git a/engines/petka/q_system.cpp b/engines/petka/q_system.cpp
index d1b7a4cf034..fdc023a2885 100644
--- a/engines/petka/q_system.cpp
+++ b/engines/petka/q_system.cpp
@@ -46,7 +46,8 @@ namespace Petka {
QSystem::QSystem(PetkaEngine &vm)
: _vm(vm), _mainInterface(nullptr), _currInterface(nullptr), _prevInterface(nullptr),
- _totalInit(false), _sceneWidth(640), _room(nullptr), _xOffset(0), _reqOffset(0) {}
+ _totalInit(false), _sceneWidth(640), _room(nullptr), _xOffset(0), _reqOffset(0),
+ _fxId(0), _musicId(0) {}
QSystem::~QSystem() {
for (uint i = 0; i < _allObjects.size(); ++i) {
Commit: 1e07ed582d8bc81eabaf6e592bc36cf670a51c6f
https://github.com/scummvm/scummvm/commit/1e07ed582d8bc81eabaf6e592bc36cf670a51c6f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2022-10-24T11:12:29+02:00
Commit Message:
PETKA: Init Walk class variables. CID 1433125
Changed paths:
engines/petka/walk.cpp
diff --git a/engines/petka/walk.cpp b/engines/petka/walk.cpp
index f8af88f0c73..34b8dabed7a 100644
--- a/engines/petka/walk.cpp
+++ b/engines/petka/walk.cpp
@@ -85,6 +85,15 @@ Walk::Walk(int id) { // CHECKED
_vertices = nullptr;
field_190 = 0;
resId = 0;
+
+ field_170 = field_178 = 0.0;
+ field_180 = field_181 = field_182 = field_183 = field_184 = field_185 =
+ field_186 = field_187 = field_188 = field_189 = field_18A = field_18B =
+ field_18C = field_18D = field_18E = field_18F = 0;
+ field_194 = 0;
+ field_198 = 0.0;
+ destX = destY = 0;
+ field_1C4 = field_1C5 = field_1C6 = field_1C7 = 0;
}
Walk::~Walk() { // CHECKED
More information about the Scummvm-git-logs
mailing list