[Scummvm-cvs-logs] SF.net SVN: scummvm:[44549] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Sat Oct 3 01:13:47 CEST 2009
Revision: 44549
http://scummvm.svn.sourceforge.net/scummvm/?rev=44549&view=rev
Author: athrxx
Date: 2009-10-02 23:13:47 +0000 (Fri, 02 Oct 2009)
Log Message:
-----------
LOL: cleanup
Modified Paths:
--------------
scummvm/trunk/engines/kyra/gui_lol.cpp
scummvm/trunk/engines/kyra/kyra_hof.cpp
scummvm/trunk/engines/kyra/lol.cpp
scummvm/trunk/engines/kyra/scene_lol.cpp
scummvm/trunk/engines/kyra/script_lol.cpp
scummvm/trunk/engines/kyra/sound_towns.cpp
scummvm/trunk/engines/kyra/text_hof.cpp
Modified: scummvm/trunk/engines/kyra/gui_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/gui_lol.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/gui_lol.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -2794,12 +2794,10 @@
case 0x4072:
char filename[13];
snprintf(filename, sizeof(filename), "LEVEL%02d.%s", _vm->_currentLevel, _vm->_languageExt[_vm->_lang]);
- if (_vm->_levelLangFile)
- delete[] _vm->_levelLangFile;
+ delete[] _vm->_levelLangFile;
_vm->_levelLangFile = _vm->resource()->fileData(filename, 0);
snprintf(filename, sizeof(filename), "LANDS.%s", _vm->_languageExt[_vm->_lang]);
- if (_vm->_landsFile)
- delete[] _vm->_landsFile;
+ delete[] _vm->_landsFile;
_vm->_landsFile = _vm->resource()->fileData(filename, 0);
_newMenu = _lastMenu;
break;
Modified: scummvm/trunk/engines/kyra/kyra_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/kyra_hof.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -167,8 +167,7 @@
_sequenceSoundList = NULL;
}
- if (_dlgBuffer)
- delete[] _dlgBuffer;
+ delete[] _dlgBuffer;
for (int i = 0; i < 19; i++)
delete[] _conversationState[i];
delete[] _conversationState;
Modified: scummvm/trunk/engines/kyra/lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/lol.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/lol.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -321,8 +321,7 @@
delete[] _monsterPalettes;
delete[] _monsterShapesEx;
- if (_automapShapes)
- delete[] _automapShapes;
+ delete[] _automapShapes;
for (Common::Array<const TIMOpcode*>::iterator i = _timIntroOpcodes.begin(); i != _timIntroOpcodes.end(); ++i)
delete *i;
@@ -617,8 +616,7 @@
char filename[32];
snprintf(filename, sizeof(filename), "LANDS.%s", _languageExt[_lang]);
_res->exists(filename, true);
- if (_landsFile)
- delete[] _landsFile;
+ delete[] _landsFile;
_landsFile = _res->fileData(filename, 0);
loadItemIconShapes();
}
Modified: scummvm/trunk/engines/kyra/scene_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/scene_lol.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/scene_lol.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -379,8 +379,7 @@
tlen = READ_LE_UINT16(v) << 5;
v += 2;
- if (_vcfBlocks)
- delete[] _vcfBlocks;
+ delete[] _vcfBlocks;
_vcfBlocks = new uint8[tlen];
memcpy(_vcfBlocks, v, tlen);
@@ -395,16 +394,14 @@
if (vcnLen == -1)
vcnLen = tlen << 5;
- if (_vcnBlocks)
- delete[] _vcnBlocks;
+ delete[] _vcnBlocks;
_vcnBlocks = new uint8[vcnLen];
if (_flags.use16ColorMode) {
_screen->loadPalette("LOL.NOL", _screen->getPalette(0));
} else {
- if (_vcnShift)
- delete[] _vcnShift;
+ delete[] _vcnShift;
_vcnShift = new uint8[tlen];
memcpy(_vcnShift, v, tlen);
@@ -445,8 +442,7 @@
vmpLen = READ_LE_UINT16(v);
v += 2;
- if (_vmpPtr)
- delete[] _vmpPtr;
+ delete[] _vmpPtr;
_vmpPtr = new uint16[vmpLen];
for (int i = 0; i < vmpLen; i++)
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -1182,8 +1182,7 @@
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_loadLangFile(%p) (%s)", (const void *)script, stackPosString(0));
char filename[13];
snprintf(filename, sizeof(filename), "%s.%s", stackPosString(0), _languageExt[_lang]);
- if (_levelLangFile)
- delete[] _levelLangFile;
+ delete[] _levelLangFile;
_levelLangFile = _res->fileData(filename, 0);
return 1;
}
Modified: scummvm/trunk/engines/kyra/sound_towns.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound_towns.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/sound_towns.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -704,23 +704,20 @@
}
void Towns_EuphonyDriver::loadFmInstruments(const byte *instr) {
- if (_fmInstruments)
- delete[] _fmInstruments;
+ delete[] _fmInstruments;
_fmInstruments = new uint8[0x1800];
memcpy(_fmInstruments, instr, 0x1800);
}
void Towns_EuphonyDriver::loadWaveInstruments(const byte *instr) {
- if (_waveInstruments)
- delete[] _waveInstruments;
+ delete[] _waveInstruments;
_waveInstruments = new uint8[0x1000];
memcpy(_waveInstruments, instr, 0x1000);
const uint8 *pos = (const uint8 *)(instr + 0x1000);
for (uint8 i = 0; i < 10; i++) {
- if (_waveSounds[i])
- delete[] _waveSounds[i];
+ delete[] _waveSounds[i];
uint32 numsamples = READ_LE_UINT32(pos + 0x0C);
_waveSounds[i] = new int8[numsamples + 0x20];
memcpy(_waveSounds[i], pos, 0x20);
@@ -986,7 +983,7 @@
_driver = driver;
_last = last;
_used = _fchan = _wchan = 0;
- _playing = false;
+ _playing = _loop = false;
}
void Towns_EuphonyTrackQueue::setPlayBackStatus(bool playing) {
@@ -998,8 +995,7 @@
}
void Towns_EuphonyTrackQueue::loadDataToCurrentPosition(uint8 * trackdata, uint32 size, bool loop) {
- if (_trackData)
- delete[] _trackData;
+ delete[] _trackData;
_trackData = new uint8[0xC58A];
memset(_trackData, 0, 0xC58A);
Screen::decodeFrame4(trackdata, _trackData, size);
@@ -1043,24 +1039,18 @@
while (i) {
i->_playing = false;
i->_used = i->_fchan = i->_wchan = 0;
- if (i->_trackData) {
- delete[] i->_trackData;
- i->_trackData = 0;
- }
+ delete[] i->_trackData;
+ i->_trackData = 0;
i = i->_last;
if (i) {
res = i;
- if (i->_next) {
- delete i->_next;
- i->_next = 0;
- }
+ delete i->_next;
+ i->_next = 0;
}
}
- if (res->_trackData) {
- delete[] res->_trackData;
- res->_trackData = 0;
- }
+ delete[] res->_trackData;
+ res->_trackData = 0;
return res;
}
@@ -1759,7 +1749,7 @@
TownsPC98_OpnChannel::TownsPC98_OpnChannel(TownsPC98_OpnDriver *driver, uint8 regOffs, uint8 flgs, uint8 num,
uint8 key, uint8 prt, uint8 id) : _drv(driver), _regOffset(regOffs), _flags(flgs), _chanNum(num), _keyNum(key),
- _part(prt), _idFlag(id) {
+ _part(prt), _idFlag(id), controlEvents(0) {
_ticksLeft = _algorithm = _instr = _totalLevel = _frqBlockMSB = _keyOffTime = 0;
_ssgStartLvl = _ssgTl = _ssgStep = _ssgTicksLeft = _ssgTargetLvl = _block = 0;
@@ -2171,7 +2161,7 @@
TownsPC98_OpnChannelSSG::TownsPC98_OpnChannelSSG(TownsPC98_OpnDriver *driver, uint8 regOffs,
uint8 flgs, uint8 num, uint8 key, uint8 prt, uint8 id) :
- TownsPC98_OpnChannel(driver, regOffs, flgs, num, key, prt, id) {
+ TownsPC98_OpnChannel(driver, regOffs, flgs, num, key, prt, id), controlEvents(0) {
}
void TownsPC98_OpnChannelSSG::init() {
@@ -2468,7 +2458,7 @@
TownsPC98_OpnChannelPCM::TownsPC98_OpnChannelPCM(TownsPC98_OpnDriver *driver, uint8 regOffs,
uint8 flgs, uint8 num, uint8 key, uint8 prt, uint8 id) :
- TownsPC98_OpnChannel(driver, regOffs, flgs, num, key, prt, id) {
+ TownsPC98_OpnChannel(driver, regOffs, flgs, num, key, prt, id), controlEvents(0) {
}
void TownsPC98_OpnChannelPCM::init() {
@@ -3403,6 +3393,7 @@
TownsPC98_OpnDriver::TownsPC98_OpnDriver(Audio::Mixer *mixer, OpnType type) : TownsPC98_OpnCore(mixer, type),
_channels(0), _ssgChannels(0), _sfxChannels(0), _rhythmChannel(0),
_trackPtr(0), _sfxData(0), _sfxOffs(0), _ssgPatches(0),
+ _patches(0), _sfxBuffer(0), _musicBuffer(0),
_opnCarrier(_drvTables + 76), _opnFreqTable(_drvTables + 108), _opnFreqTableSSG(_drvTables + 132),
_opnFxCmdLen(_drvTables + 36), _opnLvlPresets(_drvTables + (type == OD_TOWNS ? 52 : 84)),
@@ -3415,6 +3406,7 @@
_musicTickCounter(0),
_musicPlaying(false), _sfxPlaying(false), _fading(false), _looping(0), _ready(false) {
+ _sfxOffsets[0] = _sfxOffsets[1] = 0;
}
TownsPC98_OpnDriver::~TownsPC98_OpnDriver() {
@@ -3438,8 +3430,7 @@
delete[] _sfxChannels;
}
- if (_rhythmChannel)
- delete _rhythmChannel;
+ delete _rhythmChannel;
delete[] _ssgPatches;
}
@@ -4049,21 +4040,16 @@
bool SoundPC98::init() {
_driver = new TownsPC98_OpnDriver(_mixer, TownsPC98_OpnDriver::OD_TYPE26);
-
return _driver->init();
}
void SoundPC98::loadSoundFile(Common::String file) {
- if (_sfxTrackData)
- delete[] _sfxTrackData;
-
+ delete[] _sfxTrackData;
_sfxTrackData = _vm->resource()->fileData(file.c_str(), 0);
}
void SoundPC98::loadSoundFile(const uint8 *data, int len) {
- if (_sfxTrackData)
- delete[] _sfxTrackData;
-
+ delete[] _sfxTrackData;
_sfxTrackData = new uint8[len];
memcpy(_sfxTrackData, data, len);
}
Modified: scummvm/trunk/engines/kyra/text_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/text_hof.cpp 2009-10-02 22:13:39 UTC (rev 44548)
+++ scummvm/trunk/engines/kyra/text_hof.cpp 2009-10-02 23:13:47 UTC (rev 44549)
@@ -447,9 +447,7 @@
if (_flags.platform != Common::kPlatformPC || _flags.isTalkie)
filename[11] = suffix[_lang];
- if (_dlgBuffer)
- delete[] _dlgBuffer;
-
+ delete[] _dlgBuffer;
_dlgBuffer = _res->fileData(filename, 0);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list