[Scummvm-cvs-logs] SF.net SVN: scummvm:[42858] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Tue Jul 28 18:28:33 CEST 2009
Revision: 42858
http://scummvm.svn.sourceforge.net/scummvm/?rev=42858&view=rev
Author: drmccoy
Date: 2009-07-28 16:28:32 +0000 (Tue, 28 Jul 2009)
Log Message:
-----------
More alignment-related changes
Modified Paths:
--------------
scummvm/trunk/engines/gob/draw_v2.cpp
scummvm/trunk/engines/gob/gob.h
scummvm/trunk/engines/gob/inter_v1.cpp
scummvm/trunk/engines/gob/save/saveconverter.cpp
scummvm/trunk/engines/gob/sound/sounddesc.cpp
scummvm/trunk/engines/gob/sound/soundmixer.cpp
scummvm/trunk/engines/gob/sound/soundmixer.h
scummvm/trunk/engines/gob/variables.cpp
scummvm/trunk/engines/gob/variables.h
Modified: scummvm/trunk/engines/gob/draw_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/draw_v2.cpp 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/draw_v2.cpp 2009-07-28 16:28:32 UTC (rev 42858)
@@ -521,8 +521,7 @@
case 10:
str[0] = (char) 255;
- WRITE_LE_UINT16((uint16 *) (str + 1),
- ptr - _vm->_game->_resources->getTexts());
+ WRITE_LE_UINT16(str + 1, ptr - _vm->_game->_resources->getTexts());
str[3] = 0;
ptr++;
for (int i = *ptr++; i > 0; i--) {
Modified: scummvm/trunk/engines/gob/gob.h
===================================================================
--- scummvm/trunk/engines/gob/gob.h 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/gob.h 2009-07-28 16:28:32 UTC (rev 42858)
@@ -75,8 +75,6 @@
#define GET_VAR_FSTR(var) _vm->_inter->_variables->getAddressVarString(var)
#define GET_VARO_FSTR(off) _vm->_inter->_variables->getAddressOffString(off)
-#define VAR_ADDRESS(var) _vm->_inter->_variables->getAddressVar32(var)
-
#define WRITE_VAR_OFFSET(off, val) WRITE_VARO_UINT32((off), (val))
#define WRITE_VAR(var, val) WRITE_VAR_UINT32((var), (val))
#define VAR_OFFSET(off) READ_VARO_UINT32(off)
Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/inter_v1.cpp 2009-07-28 16:28:32 UTC (rev 42858)
@@ -2312,7 +2312,7 @@
void Inter_v1::o1_loadObjects(OpGobParams ¶ms) {
params.extraData = _vm->_game->_script->readInt16();
- _vm->_goblin->loadObjects((char *) VAR_ADDRESS(params.extraData));
+ _vm->_goblin->loadObjects(_variables->getAddressVarString(params.extraData));
}
void Inter_v1::o1_freeObjects(OpGobParams ¶ms) {
Modified: scummvm/trunk/engines/gob/save/saveconverter.cpp
===================================================================
--- scummvm/trunk/engines/gob/save/saveconverter.cpp 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/save/saveconverter.cpp 2009-07-28 16:28:32 UTC (rev 42858)
@@ -122,14 +122,14 @@
while (count-- > 0) {
if (*sizes == 3) // 32bit value (3 additional bytes)
- *((uint32 *) data) = SWAP_BYTES_32(*((uint32 *) data));
+ WRITE_UINT32(data, SWAP_BYTES_32(READ_UINT32(data)));
else if (*sizes == 1) // 16bit value (1 additional byte)
- *((uint16 *) data) = SWAP_BYTES_16(*((uint16 *) data));
+ WRITE_UINT16(data, SWAP_BYTES_16(READ_UINT16(data)));
else if (*sizes != 0) // else, it has to be an 8bit value
return false;
count -= *sizes;
- data += *sizes + 1;
+ data += *sizes + 1;
sizes += *sizes + 1;
}
Modified: scummvm/trunk/engines/gob/sound/sounddesc.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/sounddesc.cpp 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/sound/sounddesc.cpp 2009-07-28 16:28:32 UTC (rev 42858)
@@ -121,9 +121,9 @@
return;
if (_mixerFlags & Audio::Mixer::FLAG_16BITS) {
- uint16 *data = (uint16 *) _dataPtr;
- for (uint32 i = 0; i < _size; i++)
- data[i] ^= 0x8000;
+ byte *data = _dataPtr;
+ for (uint32 i = 0; i < _size; i++, data += 2)
+ WRITE_LE_UINT16(data, READ_LE_UINT16(data) ^ 0x8000);
} else
for (uint32 i = 0; i < _size; i++)
_dataPtr[i] ^= 0x80;
Modified: scummvm/trunk/engines/gob/sound/soundmixer.cpp
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.cpp 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/sound/soundmixer.cpp 2009-07-28 16:28:32 UTC (rev 42858)
@@ -33,8 +33,7 @@
_rate = _mixer->getOutputRate();
_end = true;
- _data8 = 0;
- _data16 = 0;
+ _data = 0;
_length = 0;
_freq = 0;
_repCount = 0;
@@ -61,9 +60,9 @@
inline int16 SoundMixer::getData(int offset) {
if (!_16bit)
- return (int16) _data8[offset];
+ return (int16) ((int8) _data[offset]);
else
- return (int16) FROM_LE_16(_data16[offset]);
+ return (int16) READ_LE_UINT16(_data + (offset * 2));
}
bool SoundMixer::isPlaying() const {
@@ -78,8 +77,7 @@
Common::StackLock slock(_mutex);
if (fadeLength <= 0) {
- _data8 = 0;
- _data16 = 0;
+ _data = 0;
_end = true;
_playingSound = 0;
return;
@@ -109,13 +107,7 @@
_16bit = (sndDesc._mixerFlags & Audio::Mixer::FLAG_16BITS) != 0;
- if (_16bit) {
- _data16 = (int16 *) sndDesc.getData();
- _shift = 0;
- } else {
- _data8 = (int8 *) sndDesc.getData();
- _shift = 8;
- }
+ _data = sndDesc.getData();
_length = sndDesc.size();
_freq = frequency;
@@ -171,7 +163,7 @@
Common::StackLock slock(_mutex);
for (int i = 0; i < numSamples; i++) {
- if (!_data8 && !_data16)
+ if (!_data)
return i;
if (_end || (_offset >= _length))
checkEndSample();
@@ -181,7 +173,7 @@
// Linear interpolation. See sound/rate.cpp
int16 val = (_last + (((_cur - _last) * _offsetFrac +
- FRAC_HALF) >> FRAC_BITS)) << _shift;
+ FRAC_HALF) >> FRAC_BITS)) << (_16bit ? 0 : 8);
*buffer++ = (val * _fadeVol) >> 16;
_offsetFrac += _offsetInc;
@@ -211,8 +203,7 @@
void SoundMixer::endFade() {
if (_fadeVolStep > 0) {
- _data8 = 0;
- _data16 = 0;
+ _data = 0;
_end = true;
_playingSound = 0;
} else {
Modified: scummvm/trunk/engines/gob/sound/soundmixer.h
===================================================================
--- scummvm/trunk/engines/gob/sound/soundmixer.h 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/sound/soundmixer.h 2009-07-28 16:28:32 UTC (rev 42858)
@@ -62,11 +62,9 @@
Common::Mutex _mutex;
bool _16bit;
- int _shift;
bool _end;
- int8 *_data8;
- int16 *_data16;
+ byte *_data;
uint32 _length;
uint32 _rate;
int32 _freq;
Modified: scummvm/trunk/engines/gob/variables.cpp
===================================================================
--- scummvm/trunk/engines/gob/variables.cpp 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/variables.cpp 2009-07-28 16:28:32 UTC (rev 42858)
@@ -123,22 +123,6 @@
return getAddressOff8(var * 4);
}
-const uint16 *Variables::getAddressVar16(uint32 var) const {
- return getAddressOff16(var * 4);
-}
-
-uint16 *Variables::getAddressVar16(uint32 var) {
- return getAddressOff16(var * 4);
-}
-
-const uint32 *Variables::getAddressVar32(uint32 var) const {
- return getAddressOff32(var * 4);
-}
-
-uint32 *Variables::getAddressVar32(uint32 var) {
- return getAddressOff32(var * 4);
-}
-
const char *Variables::getAddressVarString(uint32 var) const {
return getAddressOffString(var * 4);
}
@@ -155,22 +139,6 @@
return ((uint8 *) (_vars + offset));
}
-const uint16 *Variables::getAddressOff16(uint32 offset) const {
- return ((const uint16 *) (_vars + offset));
-}
-
-uint16 *Variables::getAddressOff16(uint32 offset) {
- return ((uint16 *) (_vars + offset));
-}
-
-const uint32 *Variables::getAddressOff32(uint32 offset) const {
- return ((const uint32 *) (_vars + offset));
-}
-
-uint32 *Variables::getAddressOff32(uint32 offset) {
- return ((uint32 *) (_vars + offset));
-}
-
const char *Variables::getAddressOffString(uint32 offset) const {
return ((const char *) (_vars + offset));
}
Modified: scummvm/trunk/engines/gob/variables.h
===================================================================
--- scummvm/trunk/engines/gob/variables.h 2009-07-28 15:19:55 UTC (rev 42857)
+++ scummvm/trunk/engines/gob/variables.h 2009-07-28 16:28:32 UTC (rev 42858)
@@ -69,24 +69,12 @@
const uint8 *getAddressVar8(uint32 var) const;
uint8 *getAddressVar8(uint32 var);
- const uint16 *getAddressVar16(uint32 var) const;
- uint16 *getAddressVar16(uint32 var);
-
- const uint32 *getAddressVar32(uint32 var) const;
- uint32 *getAddressVar32(uint32 var);
-
const char *getAddressVarString(uint32 var) const;
char *getAddressVarString(uint32 var);
const uint8 *getAddressOff8(uint32 offset) const;
uint8 *getAddressOff8(uint32 offset);
- const uint16 *getAddressOff16(uint32 offset) const;
- uint16 *getAddressOff16(uint32 offset);
-
- const uint32 *getAddressOff32(uint32 offset) const;
- uint32 *getAddressOff32(uint32 offset);
-
const char *getAddressOffString(uint32 offset) const;
char *getAddressOffString(uint32 offset);
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