[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.543,2.544 resource_v7he.cpp,1.52,1.53 scumm.cpp,1.672,1.673
kirben
kirben at users.sourceforge.net
Fri Jan 6 15:55:02 CET 2006
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26088/scumm
Modified Files:
intern.h resource_v7he.cpp scumm.cpp
Log Message:
Rename variables.
Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.543
retrieving revision 2.544
diff -u -d -r2.543 -r2.544
--- intern.h 5 Jan 2006 07:06:47 -0000 2.543
+++ intern.h 6 Jan 2006 23:54:42 -0000 2.544
@@ -1087,7 +1087,7 @@
const OpcodeEntryV80he *_opcodesV80he;
int32 _heSndResId;
- int _curSndId, _sndOffs1, _sndOffs2;
+ int _curSndId, _sndPtrOffs, _sndTmrOffs;
public:
ScummEngine_v80he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex);
Index: resource_v7he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/resource_v7he.cpp,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- resource_v7he.cpp 6 Jan 2006 06:40:27 -0000 1.52
+++ resource_v7he.cpp 6 Jan 2006 23:54:42 -0000 1.53
@@ -1799,18 +1799,18 @@
byte *sbng1Ptr, *sbng2Ptr;
byte *sdat1Ptr, *sdat2Ptr;
byte *src, *dst, *tmp;
- int curOffs, len, offs, size;
+ int len, offs, size;
if (snd2id == -1) {
- _sndOffs1 = 0;
- _sndOffs2 = 0;
+ _sndPtrOffs = 0;
+ _sndTmrOffs = 0;
return;
}
if (snd1id != _curSndId) {
_curSndId = snd1id;
- _sndOffs1 = 0;
- _sndOffs2 = 0;
+ _sndPtrOffs = 0;
+ _sndTmrOffs = 0;
}
res.lock(rtSound, snd1id);
@@ -1833,7 +1833,7 @@
if (sbng1Ptr != NULL && sbng2Ptr != NULL) {
if (chan != -1 && _sound->_heChannel[chan].codeOffs > 0) {
- curOffs = _sound->_heChannel[chan].codeOffs;
+ int curOffs = _sound->_heChannel[chan].codeOffs;
src = snd1Ptr + curOffs;
dst = sbng1Ptr + 8;
@@ -1863,59 +1863,56 @@
len = tmp - sbng2Ptr - 6;
memcpy(dst, src, len);
- int time;
- while (READ_LE_UINT16(dst) != 0) {
+ int32 time;
+ while ((size = READ_LE_UINT16(dst)) != 0) {
time = READ_LE_UINT32(dst + 2);
- time += _sndOffs2;
- size = READ_LE_UINT16(dst);
+ time += _sndTmrOffs;
WRITE_LE_UINT32(dst + 2, time);
dst += size;
}
}
- int size1, size2;
-
+ int sdat1size, sdat2size;
sdat1Ptr = heFindResource(MKID('SDAT'), snd1Ptr);
assert(sdat1Ptr);
sdat2Ptr = heFindResource(MKID('SDAT'), snd2Ptr);
assert(sdat2Ptr);
- size1 = READ_BE_UINT32(sdat1Ptr + 4) - 8 - _sndOffs1;
- size2 = READ_BE_UINT32(sdat2Ptr + 4) - 8;
-
- debug(0, "SDAT size1 %d size2 %d", size1, size2);
+ sdat1size = READ_BE_UINT32(sdat1Ptr + 4) - 8 - _sndPtrOffs;
+ sdat2size = READ_BE_UINT32(sdat2Ptr + 4) - 8;
- if (size1 <= 0) {
- debug(0, "createSound: Invalid offset (%d) for sound (%d)", snd1id, size1);
+ debug(0, "SDAT size1 %d size2 %d", sdat1size, sdat2size);
+ if (sdat1size <= 0) {
+ debug(0, "createSound: Invalid offset (%d) for sound (%d)", snd1id, sdat1size);
return;
}
- if (size2 < size1) {
+ if (sdat2size < sdat1size) {
src = sdat2Ptr + 8;
- dst = sdat1Ptr + 8 + _sndOffs1;
- len = size2;
+ dst = sdat1Ptr + 8 + _sndPtrOffs;
+ len = sdat2size;
memcpy(dst, src, len);
- _sndOffs1 += size2;
- _sndOffs2 += size2;
+ _sndPtrOffs += len;
+ _sndTmrOffs += sdat2size;
} else {
src = sdat2Ptr + 8;
- dst = sdat1Ptr + 8 + _sndOffs1;
- len = size1;
+ dst = sdat1Ptr + 8 + _sndPtrOffs;
+ len = sdat1size;
memcpy(dst, src, len);
- if (size2 != size1) {
- src = sdat2Ptr + 8 + size1;
+ if (sdat2size != sdat1size) {
+ src = sdat2Ptr + 8 + sdat1size;
dst = sdat1Ptr + 8;
- len = size2 - size1;
+ len = sdat2size - sdat1size;
memcpy(dst, src, len);
}
- _sndOffs1 += size2 - size1;
- _sndOffs2 += size2;
+ _sndPtrOffs += sdat2size - sdat1size;
+ _sndTmrOffs += sdat2size;
}
}
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.672
retrieving revision 1.673
diff -u -d -r1.672 -r1.673
--- scumm.cpp 6 Jan 2006 14:03:40 -0000 1.672
+++ scumm.cpp 6 Jan 2006 23:54:42 -0000 1.673
@@ -1609,8 +1609,8 @@
: ScummEngine_v72he(detector, syst, gs, md5sum, substResFileNameIndex) {
_heSndResId = 0;
_curSndId = 0;
- _sndOffs1 = 0;
- _sndOffs2 = 0;
+ _sndPtrOffs = 0;
+ _sndTmrOffs = 0;
}
ScummEngine_v90he::ScummEngine_v90he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16], int substResFileNameIndex)
More information about the Scummvm-git-logs
mailing list