[Scummvm-git-logs] scummvm master -> 492bc450932551ace9576bb2e2d8814d2f63fe1d
dreammaster
paulfgilbert at gmail.com
Sat Mar 14 21:11:42 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:
492bc45093 ULTIMA8: Remove redundant cleanup in destructors (emptying vectors etc)
Commit: 492bc450932551ace9576bb2e2d8814d2f63fe1d
https://github.com/scummvm/scummvm/commit/492bc450932551ace9576bb2e2d8814d2f63fe1d
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2020-03-14T14:11:38-07:00
Commit Message:
ULTIMA8: Remove redundant cleanup in destructors (emptying vectors etc)
Changed paths:
engines/ultima/ultima8/audio/music_flex.cpp
engines/ultima/ultima8/graphics/anim_dat.cpp
engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
engines/ultima/ultima8/graphics/gump_shape_archive.cpp
engines/ultima/ultima8/graphics/main_shape_archive.cpp
engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
engines/ultima/ultima8/gumps/paged_gump.cpp
engines/ultima/ultima8/gumps/paperdoll_gump.cpp
engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
engines/ultima/ultima8/gumps/widgets/text_widget.cpp
engines/ultima/ultima8/kernel/memory_manager.cpp
engines/ultima/ultima8/usecode/uc_machine.cpp
engines/ultima/ultima8/world/map_glob.cpp
diff --git a/engines/ultima/ultima8/audio/music_flex.cpp b/engines/ultima/ultima8/audio/music_flex.cpp
index ea45985d00..f06bcb29cf 100644
--- a/engines/ultima/ultima8/audio/music_flex.cpp
+++ b/engines/ultima/ultima8/audio/music_flex.cpp
@@ -41,7 +41,6 @@ MusicFlex::~MusicFlex() {
uint32 i;
for (i = 0; i < 128; i++) {
delete _info[i];
- _info[i] = 0;
}
Archive::uncache();
@@ -56,7 +55,6 @@ MusicFlex::SongInfo::SongInfo() : _numMeasures(0), _loopJump(0) {
MusicFlex::SongInfo::~SongInfo() {
for (int i = 0; i < 128; i++) {
delete [] _transitions[i];
- _transitions[i] = nullptr;
}
}
diff --git a/engines/ultima/ultima8/graphics/anim_dat.cpp b/engines/ultima/ultima8/graphics/anim_dat.cpp
index 465a6a4189..7c75320c1c 100644
--- a/engines/ultima/ultima8/graphics/anim_dat.cpp
+++ b/engines/ultima/ultima8/graphics/anim_dat.cpp
@@ -39,7 +39,6 @@ AnimDat::AnimDat() {
AnimDat::~AnimDat() {
for (unsigned int i = 0; i < _anims.size(); i++)
delete _anims[i];
- _anims.clear();
}
ActorAnim *AnimDat::getAnim(uint32 shape) const {
diff --git a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
index 6cdd912fba..739a371c32 100644
--- a/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
+++ b/engines/ultima/ultima8/graphics/base_soft_render_surface.cpp
@@ -238,13 +238,8 @@ BaseSoftRenderSurface::BaseSoftRenderSurface(int w, int h) :
BaseSoftRenderSurface::~BaseSoftRenderSurface() {
if (_rttTex) {
delete _rttTex;
- _rttTex = nullptr;
-
delete [] _pixels00;
- _pixels00 = nullptr;
-
delete [] _zBuffer00;
- _zBuffer00 = nullptr;
}
}
diff --git a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp b/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
index bf261a205a..2d122fba47 100644
--- a/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/gump_shape_archive.cpp
@@ -34,7 +34,6 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(GumpShapeArchive, ShapeArchive)
GumpShapeArchive::~GumpShapeArchive() {
for (unsigned int i = 0; i < _gumpItemArea.size(); ++i)
delete _gumpItemArea[i];
- _gumpItemArea.clear();
}
void GumpShapeArchive::loadGumpage(IDataSource *ds) {
diff --git a/engines/ultima/ultima8/graphics/main_shape_archive.cpp b/engines/ultima/ultima8/graphics/main_shape_archive.cpp
index de749a6fd1..4a821f5a5c 100644
--- a/engines/ultima/ultima8/graphics/main_shape_archive.cpp
+++ b/engines/ultima/ultima8/graphics/main_shape_archive.cpp
@@ -35,12 +35,10 @@ DEFINE_RUNTIME_CLASSTYPE_CODE(MainShapeArchive, ShapeArchive)
MainShapeArchive::~MainShapeArchive() {
if (_typeFlags) {
delete _typeFlags;
- _typeFlags = nullptr;
}
if (_animDat) {
delete _animDat;
- _animDat = nullptr;
}
}
diff --git a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
index 31d4a19f49..0f910204cb 100644
--- a/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
+++ b/engines/ultima/ultima8/graphics/wpn_ovlay_dat.cpp
@@ -40,7 +40,6 @@ WpnOvlayDat::WpnOvlayDat() {
WpnOvlayDat::~WpnOvlayDat() {
for (unsigned int i = 0; i < _overlay.size(); i++)
delete _overlay[i];
- _overlay.clear();
}
const AnimWeaponOverlay *WpnOvlayDat::getAnimOverlay(uint32 action) const {
diff --git a/engines/ultima/ultima8/gumps/paged_gump.cpp b/engines/ultima/ultima8/gumps/paged_gump.cpp
index 21f2c29cf3..9dece1d0ab 100644
--- a/engines/ultima/ultima8/gumps/paged_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paged_gump.cpp
@@ -42,7 +42,6 @@ PagedGump::PagedGump(int left, int right, int top, int shape):
}
PagedGump::~PagedGump(void) {
- _gumps.clear();
}
void PagedGump::Close(bool no_del) {
diff --git a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
index 6c43555506..a476f45050 100644
--- a/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
+++ b/engines/ultima/ultima8/gumps/paperdoll_gump.cpp
@@ -102,7 +102,6 @@ PaperdollGump::PaperdollGump(Shape *shape_, uint32 frameNum, uint16 owner,
PaperdollGump::~PaperdollGump() {
for (int i = 0; i < 14; ++i) { // ! constant
delete _cachedText[i];
- _cachedText[i] = nullptr;
}
}
diff --git a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
index d5bb9385c3..e66f36671f 100644
--- a/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/edit_widget.cpp
@@ -48,7 +48,6 @@ EditWidget::EditWidget(int x, int y, Std::string txt, bool gamefont_, int font,
EditWidget::~EditWidget(void) {
delete _cachedText;
- _cachedText = nullptr;
}
// Init the gump, call after construction
diff --git a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
index 43e11ff0dd..8e87c8131b 100644
--- a/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
+++ b/engines/ultima/ultima8/gumps/widgets/text_widget.cpp
@@ -52,7 +52,6 @@ TextWidget::TextWidget(int x, int y, const Std::string &txt, bool gamefont_, int
TextWidget::~TextWidget(void) {
delete _cachedText;
- _cachedText = nullptr;
}
// Init the gump, call after construction
diff --git a/engines/ultima/ultima8/kernel/memory_manager.cpp b/engines/ultima/ultima8/kernel/memory_manager.cpp
index bc8ec046db..0c4a2682a6 100644
--- a/engines/ultima/ultima8/kernel/memory_manager.cpp
+++ b/engines/ultima/ultima8/kernel/memory_manager.cpp
@@ -43,7 +43,7 @@ MemoryManager::MemoryManager() {
}
MemoryManager::~MemoryManager() {
- _memoryManager = 0;
+ _memoryManager = nullptr;
setAllocationFunctions(malloc, free);
delete _allocators[0];
diff --git a/engines/ultima/ultima8/usecode/uc_machine.cpp b/engines/ultima/ultima8/usecode/uc_machine.cpp
index b1e929f882..3a074dcdc8 100644
--- a/engines/ultima/ultima8/usecode/uc_machine.cpp
+++ b/engines/ultima/ultima8/usecode/uc_machine.cpp
@@ -107,13 +107,9 @@ UCMachine::~UCMachine() {
_ucMachine = nullptr;
delete _globals;
- _globals = nullptr;
delete _convUse;
- _convUse = nullptr;
delete _listIDs;
- _listIDs = nullptr;
delete _stringIDs;
- _stringIDs = nullptr;
}
void UCMachine::reset() {
diff --git a/engines/ultima/ultima8/world/map_glob.cpp b/engines/ultima/ultima8/world/map_glob.cpp
index 8cdc5570ba..2e524bc5f2 100644
--- a/engines/ultima/ultima8/world/map_glob.cpp
+++ b/engines/ultima/ultima8/world/map_glob.cpp
@@ -33,7 +33,6 @@ MapGlob::MapGlob() {
MapGlob::~MapGlob() {
- _contents.clear();
}
void MapGlob::read(IDataSource *ds) {
More information about the Scummvm-git-logs
mailing list