thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

HDB: Remove redundant custom free() function

Browse source
This commit is contained in:
Nipun Garg 2019-07-18 00:13:06 +05:30 • committed by Eugene Sandulenko
parent f5aff6c72d
commit 8825980e1f
8 changed files with 133 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

52
engines/hdb/ai-init.cpp
View file

@ -1155,7 +1155,7 @@ void AI::restartSystem() {
memset(_clubRightGfx, 0, sizeof(_clubRightGfx));
if (_weaponSelGfx)
_weaponSelGfx->free();
delete _weaponSelGfx;
_playerDead = false;
_playerInvisible = false;
@ -1171,73 +1171,73 @@ void AI::restartSystem() {
int i;
if (_icepSnowballGfxDown) {
_icepSnowballGfxDown->free();
delete _icepSnowballGfxDown;
_icepSnowballGfxDown = NULL;
}
if (_icepSnowballGfxLeft) {
_icepSnowballGfxLeft->free();
delete _icepSnowballGfxLeft;
_icepSnowballGfxLeft = NULL;
}
if (_icepSnowballGfxRight) {
_icepSnowballGfxRight->free();
delete _icepSnowballGfxRight;
_icepSnowballGfxRight = NULL;
}
if (_tileFroglickMiddleUD) {
_tileFroglickMiddleUD->free();
delete _tileFroglickMiddleUD;
_tileFroglickMiddleUD = NULL;
}
if (_tileFroglickWiggleUD[0]) {
for (i = 0; i < 3; i++) {
_tileFroglickWiggleUD[i]->free();
delete _tileFroglickWiggleUD[i];
_tileFroglickWiggleUD[i] = NULL;
}
}
if (_tileFroglickMiddleLR) {
_tileFroglickMiddleLR->free();
delete _tileFroglickMiddleLR;
_tileFroglickMiddleLR = NULL;
}
if (_tileFroglickWiggleLeft[0]) {
for (i = 0; i < 3; i++) {
_tileFroglickWiggleLeft[i]->free();
delete _tileFroglickWiggleLeft[i];
_tileFroglickWiggleLeft[i] = NULL;
}
}
if (_tileFroglickWiggleRight[0]) {
for (i = 0; i < 3; i++) {
_tileFroglickWiggleRight[i]->free();
delete _tileFroglickWiggleRight[i];
_tileFroglickWiggleRight[i] = NULL;
}
}
// dragon! see ya!
if (_gfxDragonAsleep) {
_gfxDragonAsleep->free();
delete _gfxDragonAsleep;
_gfxDragonAsleep = NULL;
_gfxDragonFlap[0]->free();
_gfxDragonFlap[1]->free();
delete _gfxDragonFlap[0];
delete _gfxDragonFlap[1];
_gfxDragonFlap[0] = _gfxDragonFlap[1] = NULL;
_gfxDragonBreathe[0]->free();
_gfxDragonBreathe[1]->free();
_gfxDragonBreathe[2]->free();
delete _gfxDragonBreathe[0];
delete _gfxDragonBreathe[1];
delete _gfxDragonBreathe[2];
_gfxDragonBreathe[0] = _gfxDragonBreathe[1] =
_gfxDragonBreathe[2] = NULL;
}
// PANIC ZONE gfx - see ya!
if (g_hdb->_window->_pzInfo.gfxPanic) {
g_hdb->_window->_pzInfo.gfxPanic->free();
delete g_hdb->_window->_pzInfo.gfxPanic;
g_hdb->_window->_pzInfo.gfxPanic = NULL;
g_hdb->_window->_pzInfo.gfxZone->free();
delete g_hdb->_window->_pzInfo.gfxZone;
g_hdb->_window->_pzInfo.gfxZone = NULL;
g_hdb->_window->_pzInfo.gfxFace[0]->free();
delete g_hdb->_window->_pzInfo.gfxFace[0];
g_hdb->_window->_pzInfo.gfxFace[0] = NULL;
g_hdb->_window->_pzInfo.gfxFace[1]->free();
delete g_hdb->_window->_pzInfo.gfxFace[1];
g_hdb->_window->_pzInfo.gfxFace[1] = NULL;
for (i = 0; i < 10; i++) {
g_hdb->_window->_pzInfo.gfxNumber[i]->free();
delete g_hdb->_window->_pzInfo.gfxNumber[i];
g_hdb->_window->_pzInfo.gfxNumber[i] = NULL;
}
}
@ -1246,12 +1246,12 @@ void AI::restartSystem() {
// laser beams
if (_gfxLaserbeamUD[0]) {
for (i = 0; i < 4; i++) {
_gfxLaserbeamUD[i]->free();
_gfxLaserbeamUDTop[i]->free();
_gfxLaserbeamUDBottom[i]->free();
_gfxLaserbeamLR[i]->free();
_gfxLaserbeamLRLeft[i]->free();
_gfxLaserbeamLRRight[i]->free();
delete _gfxLaserbeamUD[i];
delete _gfxLaserbeamUDTop[i];
delete _gfxLaserbeamUDBottom[i];
delete _gfxLaserbeamLR[i];
delete _gfxLaserbeamLRLeft[i];
delete _gfxLaserbeamLRRight[i];
_gfxLaserbeamUD[i] = NULL;
_gfxLaserbeamUDTop[i] = NULL;

12
engines/hdb/gfx.cpp
View file

@ -998,8 +998,8 @@ void Gfx::drawBonusStars() {
// timed out?
if (_starsInfo.totalTime < g_hdb->getTimeSlice()) {
_starsInfo.active = false;
_starsInfo.gfx[0]->free();
_starsInfo.gfx[1]->free();
delete _starsInfo.gfx[0];
delete _starsInfo.gfx[1];
_starsInfo.gfx[0] = _starsInfo.gfx[1] = 0;
}
}
@ -1088,10 +1088,6 @@ int Picture::drawMasked(int x, int y, int alpha) {
return 0;
}
void Picture::free() {
_surface.free();
}
Tile::Tile() : _flags(0), _name("") {
_surface.create(32, 32, g_hdb->_format);
}
@ -1146,8 +1142,4 @@ int Tile::drawMasked(int x, int y, int alpha) {
return 0;
}
void Tile::free() {
_surface.free();
}
}

2
engines/hdb/gfx.h
View file

@ -256,7 +256,6 @@ public:
Graphics::Surface load(Common::SeekableReadStream *stream);
int draw(int x, int y);
int drawMasked(int x, int y, int alpha = 0xff);
void free();
int _width, _height;
@ -279,7 +278,6 @@ public:
Graphics::Surface load(Common::SeekableReadStream *stream);
int draw(int x, int y);
int drawMasked(int x, int y, int alpha = 0xff);
void free();
uint32 _flags;

6
engines/hdb/hdb.cpp
View file

@ -86,6 +86,12 @@ HDBGame::~HDBGame() {
delete _window;
delete _rnd;
delete _progressGfx;
delete _progressMarkGfx;
delete _loadingScreenGfx;
if (_logoGfx)
delete _logoGfx;
DebugMan.clearAllDebugChannels();
}

86
engines/hdb/menu.cpp
View file

@ -25,6 +25,10 @@
namespace HDB {
Menu::~Menu() {
freeMenu();
}
bool Menu::init() {
_starWarp = 0;
_rocketEx = 0;
@ -599,125 +603,125 @@ void Menu::freeMenu() {
// title sequence stuff
if (_titleScreen)
_titleScreen->free();
delete _titleScreen;
_titleScreen = NULL;
if (_oohOohGfx)
_oohOohGfx->free();
delete _oohOohGfx;
_oohOohGfx = NULL;
if (_newGfx)
_newGfx->free();
delete _newGfx;
_newGfx = NULL;
if (_loadGfx)
_loadGfx->free();
delete _loadGfx;
_loadGfx = NULL;
if (_optionsGfx)
_optionsGfx->free();
delete _optionsGfx;
_optionsGfx = NULL;
if (_quitGfx)
_quitGfx->free();
delete _quitGfx;
_quitGfx = NULL;
if (_resumeGfx)
_resumeGfx->free();
delete _resumeGfx;
_resumeGfx = NULL;
if (_slotGfx)
_slotGfx->free();
delete _slotGfx;
_slotGfx = NULL;
if (_rocketMain)
_rocketMain->free();
delete _rocketMain;
_rocketMain = NULL;
if (_rocketSecond)
_rocketSecond->free();
delete _rocketSecond;
_rocketSecond = NULL;
if (_rocketEx1)
_rocketEx1->free();
delete _rocketEx1;
_rocketEx1 = NULL;
if (_rocketEx2)
_rocketEx2->free();
delete _rocketEx2;
_rocketEx2 = NULL;
if (_titleLogo)
_titleLogo->free();
delete _titleLogo;
_titleLogo = NULL;
if (_hdbLogoScreen)
_hdbLogoScreen->free();
delete _hdbLogoScreen;
_hdbLogoScreen = NULL;
if (_nebulaGfx[0])
for (i = 0; i < kNebulaCount; i++) {
_nebulaGfx[i]->free();
delete _nebulaGfx[i];
_nebulaGfx[i] = NULL;
}
if (_sliderLeft)
_sliderLeft->free();
delete _sliderLeft;
_sliderLeft = NULL;
if (_sliderMid)
_sliderMid->free();
delete _sliderMid;
_sliderMid = NULL;
if (_sliderRight)
_sliderRight->free();
delete _sliderRight;
_sliderRight = NULL;
if (_sliderKnob)
_sliderKnob->free();
delete _sliderKnob;
_sliderKnob = NULL;
if (_modePuzzleGfx)
_modePuzzleGfx->free();
delete _modePuzzleGfx;
_modePuzzleGfx = NULL;
if (_modeActionGfx)
_modeActionGfx->free();
delete _modeActionGfx;
_modeActionGfx = NULL;
if (_modeLoadGfx)
_modeLoadGfx->free();
delete _modeLoadGfx;
_modeLoadGfx = NULL;
if (_modeSaveGfx)
_modeSaveGfx->free();
delete _modeSaveGfx;
_modeSaveGfx = NULL;
if (_menuBackoutGfx)
_menuBackoutGfx->free();
delete _menuBackoutGfx;
_menuBackoutGfx = NULL;
if (_controlButtonGfx)
_controlButtonGfx->free();
delete _controlButtonGfx;
_controlButtonGfx = NULL;
if (_controlsGfx)
_controlsGfx->free();
delete _controlsGfx;
_controlsGfx = NULL;
if (_vortexian[0]) {
_vortexian[0]->free();
_vortexian[1]->free();
_vortexian[2]->free();
delete _vortexian[0];
delete _vortexian[1];
delete _vortexian[2];
_vortexian[0] = _vortexian[1] = _vortexian[2] = NULL;
}
if (_star[0]) {
_star[0]->free();
_star[1]->free();
_star[2]->free();
delete _star[0];
delete _star[1];
delete _star[2];
_star[0] = _star[1] = _star[2] = NULL;
}
// secret stars
if (_starRedGfx[0]) {
_starRedGfx[0]->free();
_starRedGfx[1]->free();
_starGreenGfx[0]->free();
_starGreenGfx[1]->free();
_starBlueGfx[0]->free();
_starBlueGfx[1]->free();
delete _starRedGfx[0];
delete _starRedGfx[1];
delete _starGreenGfx[0];
delete _starGreenGfx[1];
delete _starBlueGfx[0];
delete _starBlueGfx[1];
_starRedGfx[0] = _starRedGfx[1] = NULL;
_starGreenGfx[0] = _starGreenGfx[1] = NULL;
_starBlueGfx[0] = _starBlueGfx[1] = NULL;
}
if (_versionGfx)
_versionGfx->free();
delete _versionGfx;
_versionGfx = NULL;
if (_warpGfx)
_warpGfx->free();
delete _warpGfx;
_warpGfx = NULL;
}
@ -1243,7 +1247,7 @@ void Menu::processInput(int x, int y) {
if ((x >= kQuitNoX1 && x <= kQuitNoX2 && y > kQuitNoY1 && y < kQuitNoY2 && _quitTimer < g_hdb->getTimeSlice()) || xit) {
g_hdb->_sound->playSound(SND_MENU_BACKOUT);
_quitScreen->free();
delete _quitScreen;
_quitScreen = NULL;
_menuActive = true;

2
engines/hdb/menu.h
View file

@ -152,6 +152,8 @@ struct Star {
class Menu {
public:
~Menu();
bool init();
void readConfig();

53
engines/hdb/window.cpp
View file

@ -24,6 +24,53 @@
namespace HDB {
Window::~Window() {
delete _gfxTL;
delete _gfxTM;
delete _gfxTR;
delete _gfxL;
delete _gfxM;
delete _gfxR;
delete _gfxBL;
delete _gfxBM;
delete _gfxBR;
delete _gfxTitleL;
delete _gfxTitleM;
delete _gfxTitleR;
delete _gGfxTL;
delete _gGfxTM;
delete _gGfxTR;
delete _gGfxL;
delete _gGfxM;
delete _gGfxR;
delete _gGfxBL;
delete _gGfxBM;
delete _gGfxBR;
delete _gGfxTitleL;
delete _gGfxTitleM;
delete _gGfxTitleR;
delete _gfxIndent;
delete _gfxArrowTo;
delete _gfxInvSelect;
delete _gfxHandright;
delete _gfxInfobar;
delete _gfxDarken;
delete _gfxPausePlaque;
delete _mstoneGfx;
delete _gemGfx;
}
bool Window::init() {
_gfxTL = g_hdb->_gfx->loadPic(MENU_BACK_TOPLEFT);
@ -1236,9 +1283,9 @@ void Window::drawTryAgain() {
}
void Window::clearTryAgain() {
_gfxTry->free();
_gfxAgain->free();
_gfxLevelRestart->free();
delete _gfxTry;
delete _gfxAgain;
delete _gfxLevelRestart;
_gfxTry = _gfxAgain = _gfxLevelRestart = NULL;
}

2
engines/hdb/window.h
View file

@ -189,6 +189,8 @@ struct TOut {
class Window {
public:
~Window();
bool init();
void save(Common::OutSaveFile *out);
void loadSaveFile(Common::InSaveFile *in);