[Scummvm-cvs-logs] CVS: scummvm akos.cpp,1.17,1.18 insane.cpp,1.25,1.26 saveload.cpp,1.46,1.47 scummvm.cpp,1.140,1.141 smush.h,1.3,1.4 sound.cpp,1.80,1.81
James Brown
ender at users.sourceforge.net
Mon May 6 08:33:01 CEST 2002
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv22036
Modified Files:
akos.cpp insane.cpp saveload.cpp scummvm.cpp smush.h sound.cpp
Log Message:
Add raw PCM part to dig .bun decompressor.
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- akos.cpp 24 Apr 2002 04:26:08 -0000 1.17
+++ akos.cpp 6 May 2002 15:32:32 -0000 1.18
@@ -434,7 +434,7 @@
|| !((mask[0] | mask[ar->v1.imgbufoffs]) & maskbit))) {
pcolor = ar->palette[color];
if (pcolor == 13)
- pcolor = ar->shadow_table[*dst];
+ pcolor = ar->shadow_table[*dst];
*dst = pcolor;
}
mask += 40;
Index: insane.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/insane.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- insane.cpp 5 May 2002 19:06:50 -0000 1.25
+++ insane.cpp 6 May 2002 15:32:32 -0000 1.26
@@ -130,6 +130,16 @@
}
+void SmushPlayer::parseIACT() {
+ unsigned char *src = _cur;
+ int size, codec;
+ _cur-=8; /* Move back to beginning of IACT block */
+
+ _cur+=4; size = READ_BE_UINT32(_cur) - 18;
+ _cur+=10; codec = READ_LE_UINT16(_cur);
+
+ _cur = src;
+}
void SmushPlayer::parseNPAL()
{
@@ -692,7 +702,7 @@
parseXPAL();
break;
case 'IACT':
- parseTRES();
+ parseIACT();
break;
case 'STOR':
case 'FTCH':
Index: saveload.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saveload.cpp,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- saveload.cpp 5 May 2002 20:11:01 -0000 1.46
+++ saveload.cpp 6 May 2002 15:32:32 -0000 1.47
@@ -606,10 +606,9 @@
s->saveLoadArrayOf(actor, NUM_ACTORS, sizeof(actor[0]), actorEntries);
- if (_current_version < VER_V9) {
- printf("Loading pre-v9\n");
+ if (_current_version < VER_V9)
s->saveLoadArrayOf(vm.slot, 25, sizeof(vm.slot[0]), scriptSlotEntries);
- } else
+ else
s->saveLoadArrayOf(vm.slot, NUM_SCRIPT_SLOT, sizeof(vm.slot[0]), scriptSlotEntries);
s->saveLoadArrayOf(_objs, _numLocalObjects, sizeof(_objs[0]),
objectEntries);
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.cpp,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- scummvm.cpp 5 May 2002 22:39:52 -0000 1.140
+++ scummvm.cpp 6 May 2002 15:32:32 -0000 1.141
@@ -892,7 +892,6 @@
_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
}
-
_mouseButStat = _lastKeyHit;
}
Index: smush.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/smush.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- smush.h 21 Apr 2002 17:46:41 -0000 1.3
+++ smush.h 6 May 2002 15:32:32 -0000 1.4
@@ -82,7 +82,7 @@
void parsePSAD();
void parseTRES();
void parseXPAL();
-
+ void parseIACT();
void fileRead(void *mem, int len);
uint32 nextBE32();
Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sound.cpp,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- sound.cpp 5 May 2002 20:04:25 -0000 1.80
+++ sound.cpp 6 May 2002 15:32:32 -0000 1.81
@@ -722,8 +722,8 @@
switch(table[i].codec) {
case 0:
- warning("Unimplemented bundle codec 1");
- outputSize = 0;
+ outputSize = table[i].size;
+ memcpy(&CompOutput[0], &CompInput[0], outputSize);
break;
case 1:
More information about the Scummvm-git-logs
mailing list