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

full throttle speech,

Browse source 
fixed two bugs appearing in DOTT

svn-id: r3541
This commit is contained in:
Ludvig Strigeus 2002-01-02 11:50:28 +00:00
parent 03abddf888
commit 46dd55cf2a
4 changed files with 17 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

1
saveload.cpp
View file

@ -352,6 +352,7 @@ void Scumm::saveOrLoad(Serializer *s) {
#endif #endif
MKLINE(Scumm,_actorToPrintStrFor,sleByte), MKLINE(Scumm,_actorToPrintStrFor,sleByte),
MKLINE(Scumm,_charsetColor,sleByte), MKLINE(Scumm,_charsetColor,sleByte),
/* XXX Convert into word next time format changes */
MKLINE(Scumm,charset._bufPos,sleByte), MKLINE(Scumm,charset._bufPos,sleByte),
MKLINE(Scumm,_haveMsg,sleByte), MKLINE(Scumm,_haveMsg,sleByte),
MKLINE(Scumm,_useTalkAnims,sleByte), MKLINE(Scumm,_useTalkAnims,sleByte),

4
script_v2.cpp
View file

@ -1319,9 +1319,9 @@ void Scumm::o6_roomOps() {
b = pop(); b = pop();
a = pop(); a = pop();
if (a < 160) a=160; if (a < 160) a=160;
if (a > _scrWidth) a=_scrWidth;
if (b < 160) b=160; if (b < 160) b=160;
if (b > _scrHeight) b=_scrHeight; if (a > _scrWidth-160) a=_scrWidth-160;
if (b > _scrWidth-160) b=_scrWidth-160;
_vars[VAR_CAMERA_MIN_X] = a; _vars[VAR_CAMERA_MIN_X] = a;
_vars[VAR_CAMERA_MAX_X] = b; _vars[VAR_CAMERA_MAX_X] = b;
break; break;

2
scumm.h
View file

@ -558,7 +558,7 @@ struct CharsetRenderer {
int _xpos2, _ypos2; int _xpos2, _ypos2;
byte _bufPos; int _bufPos;
byte _unk12,_disableOffsX; byte _unk12,_disableOffsX;
byte *_ptr; byte *_ptr;
byte _unk2, _bpp; byte _unk2, _bpp;

24
sound.cpp
View file

@ -303,27 +303,29 @@ void Scumm::pauseSounds(bool pause) {
_soundsPaused = pause; _soundsPaused = pause;
} }
#pragma START_PACK_STRUCTS enum {
struct VOCHeader { SOUND_HEADER_SIZE = 26,
byte id[19]; SOUND_HEADER_BIG_SIZE = 26+8,
byte extra[7];
} GCC_PACK;
#pragma END_PACK_STRUCTS
static const char VALID_VOC_ID[] = "Creative Voice File"; };
void Scumm::startSfxSound(void *file) { void Scumm::startSfxSound(void *file) {
VOCHeader hdr; char ident[8];
int block_type; int block_type;
byte work[8]; byte work[8];
uint size,i; uint size,i;
int rate,comp; int rate,comp;
byte *data; byte *data;
/* Full throttle audio fix HERE */ if ( fread(ident, 8, 1, (FILE*)file) != 1)
goto invalid;
if (fread(&hdr, sizeof(hdr), 1, (FILE*)file) != 1 || if (!memcmp(ident, "VTLK", 4)) {
memcmp(hdr.id, VALID_VOC_ID, sizeof(hdr.id)) != 0) { fseek((FILE*)file, SOUND_HEADER_BIG_SIZE - 8, SEEK_CUR);
} else if (!memcmp(ident, "Creative", 8)) {
fseek((FILE*)file, SOUND_HEADER_SIZE - 8, SEEK_CUR);
} else {
invalid:;
warning("startSfxSound: invalid header"); warning("startSfxSound: invalid header");
return; return;
} }