[Scummvm-cvs-logs] CVS: scummvm resource.cpp,1.25,1.26 script.cpp,1.14,1.15 script_v2.cpp,1.15,1.16 scumm.h,1.32,1.33 scummvm.dsp,1.15,1.16 string.cpp,1.11,1.12
Ludvig Strigeus
strigeus at users.sourceforge.net
Tue Dec 4 02:45:02 CET 2001
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv26052
Modified Files:
resource.cpp script.cpp script_v2.cpp scumm.h scummvm.dsp
string.cpp
Log Message:
* better drawBox (tnx sam_k)
* more params allowed for soundKludge opcode (8 instead of 16) will perhaps fix bugs.
Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** resource.cpp 2001/12/03 11:42:40 1.25
--- resource.cpp 2001/12/04 10:44:33 1.26
***************
*** 473,477 ****
if (basetag == MKID('MIDI')) {
fileSeek(_fileHandle, -8, SEEK_CUR);
! fileRead(_fileHandle,createResource(type, index, size+8), size+8);
return 1;
}
--- 473,477 ----
if (basetag == MKID('MIDI')) {
fileSeek(_fileHandle, -8, SEEK_CUR);
! fileRead(_fileHandle,createResource(type, index, total_size+8), total_size+8);
return 1;
}
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** script.cpp 2001/12/02 20:39:03 1.14
--- script.cpp 2001/12/04 10:44:33 1.15
***************
*** 381,385 ****
int top,bottom,count;
VirtScreen *vs;
! byte *backbuff;
if ((vs=findVirtScreen(y)) == NULL)
--- 381,385 ----
int top,bottom,count;
VirtScreen *vs;
! byte *backbuff, *bgbuff;
if ((vs=findVirtScreen(y)) == NULL)
***************
*** 408,416 ****
backbuff = getResourceAddress(rtBuffer, vs->number+1) + vs->xstart + (y-top)*320 + x;
! count = y2 - y;
! while (count) {
! memset(backbuff, color, x2 - x);
! backbuff += 320;
! count--;
}
}
--- 408,423 ----
backbuff = getResourceAddress(rtBuffer, vs->number+1) + vs->xstart + (y-top)*320 + x;
! if (color==-1) {
! if(vs->number!=0)
! error("can only copy bg to main window");
! bgbuff = getResourceAddress(rtBuffer, vs->number+5) + vs->xstart + (y-top)*320 + x;
! blit(backbuff, bgbuff, x2 - x, y2 - y);
! } else {
! count = y2 - y;
! while (count) {
! memset(backbuff, color, x2 - x);
! backbuff += 320;
! count--;
! }
}
}
Index: script_v2.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script_v2.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** script_v2.cpp 2001/12/02 20:39:03 1.15
--- script_v2.cpp 2001/12/04 10:44:33 1.16
***************
*** 1831,1835 ****
void Scumm::o6_soundKludge() {
! int16 list[8];
getStackList(list,sizeof(list)/sizeof(list[0]));
soundKludge(list);
--- 1831,1835 ----
void Scumm::o6_soundKludge() {
! int16 list[16];
getStackList(list,sizeof(list)/sizeof(list[0]));
soundKludge(list);
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** scumm.h 2001/12/01 17:06:13 1.32
--- scumm.h 2001/12/04 10:44:33 1.33
***************
*** 571,575 ****
byte *_backbuff_ptr, *_bgbak_ptr;
byte *_mask_ptr;
! byte *_bg_ptr2;
byte _colorMap[16];
--- 571,575 ----
byte *_backbuff_ptr, *_bgbak_ptr;
byte *_mask_ptr;
! byte *_dest_ptr;
byte _colorMap[16];
Index: scummvm.dsp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scummvm.dsp,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** scummvm.dsp 2001/12/01 17:06:13 1.15
--- scummvm.dsp 2001/12/04 10:44:33 1.16
***************
*** 104,108 ****
# Begin Source File
! SOURCE=.\imuse.cpp
# End Source File
# End Group
--- 104,108 ----
# Begin Source File
! SOURCE=.\sound\imuse.cpp
# End Source File
# End Group
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** string.cpp 2001/11/26 19:57:57 1.11
--- string.cpp 2001/12/04 10:44:33 1.12
***************
*** 724,728 ****
#endif
! _bg_ptr2 = _backbuff_ptr = _vm->getResourceAddress(rtBuffer, vs->number+1)
+ vs->xstart + _drawTop * 320 + _left;
--- 724,728 ----
#endif
! _dest_ptr = _backbuff_ptr = _vm->getResourceAddress(rtBuffer, vs->number+1)
+ vs->xstart + _drawTop * 320 + _left;
***************
*** 732,736 ****
if (1) {
#endif
! _bg_ptr2 = _bgbak_ptr = _vm->getResourceAddress(rtBuffer, vs->number+5)
+ vs->xstart + _drawTop * 320 + _left;
}
--- 732,736 ----
if (1) {
#endif
! _dest_ptr = _bgbak_ptr = _vm->getResourceAddress(rtBuffer, vs->number+5)
+ vs->xstart + _drawTop * 320 + _left;
}
***************
*** 775,779 ****
numbits = 8;
! dst = _bg_ptr2;
mask = _mask_ptr;
y = 0;
--- 775,779 ----
numbits = 8;
! dst = _dest_ptr;
mask = _mask_ptr;
y = 0;
***************
*** 802,806 ****
}
}
! dst = (_bg_ptr2 += 320);
mask += 40;
y++;
--- 802,806 ----
}
}
! dst = (_dest_ptr += 320);
mask += 40;
y++;
More information about the Scummvm-git-logs
mailing list