[Scummvm-git-logs] scummvm master -> 834ab1299d2d3f880835fd1bcb20eda06767cc05
dreammaster
paulfgilbert at gmail.com
Sat May 9 05:09:35 UTC 2020
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:
834ab1299d ULTIMA4: Add destructor for tile anim pixel transforms
Commit: 834ab1299d2d3f880835fd1bcb20eda06767cc05
https://github.com/scummvm/scummvm/commit/834ab1299d2d3f880835fd1bcb20eda06767cc05
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-05-08T22:08:52-07:00
Commit Message:
ULTIMA4: Add destructor for tile anim pixel transforms
Changed paths:
engines/ultima/ultima4/map/tileanim.cpp
engines/ultima/ultima4/map/tileanim.h
diff --git a/engines/ultima/ultima4/map/tileanim.cpp b/engines/ultima/ultima4/map/tileanim.cpp
index db1e86fa1e..12d0bde65e 100644
--- a/engines/ultima/ultima4/map/tileanim.cpp
+++ b/engines/ultima/ultima4/map/tileanim.cpp
@@ -101,7 +101,7 @@ TileAnimTransform *TileAnimTransform::create(const ConfigElement &conf) {
RGBA *TileAnimTransform::loadColorFromConf(const ConfigElement &conf) {
RGBA *rgba;
- rgba = new RGBA;
+ rgba = new RGBA();
rgba->r = conf.getInt("red");
rgba->g = conf.getInt("green");
rgba->b = conf.getInt("blue");
@@ -186,6 +186,11 @@ TileAnimPixelColorTransform::TileAnimPixelColorTransform(int xp, int yp, int wid
_start = _end = nullptr;
}
+TileAnimPixelColorTransform::~TileAnimPixelColorTransform() {
+ delete _start;
+ delete _end;
+}
+
bool TileAnimPixelColorTransform::drawsTile() const {
return false;
}
@@ -289,6 +294,8 @@ TileAnim *TileAnimSet::getByName(const Common::String &name) {
return i->_value;
}
+/*------------------------------------------------------------------------*/
+
TileAnim::TileAnim(const ConfigElement &conf) : _random(0) {
_name = conf.getString("name");
if (conf.exists("random"))
diff --git a/engines/ultima/ultima4/map/tileanim.h b/engines/ultima/ultima4/map/tileanim.h
index 18a193c699..6295290e1b 100644
--- a/engines/ultima/ultima4/map/tileanim.h
+++ b/engines/ultima/ultima4/map/tileanim.h
@@ -121,6 +121,8 @@ protected:
class TileAnimPixelColorTransform : public TileAnimTransform {
public:
TileAnimPixelColorTransform(int xp, int yp, int width, int height);
+ ~TileAnimPixelColorTransform() override;
+
void draw(Image *dest, Tile *tile, MapTile &mapTile) override;
bool drawsTile() const override;
More information about the Scummvm-git-logs
mailing list