[Scummvm-cvs-logs] CVS: scummvm resource.cpp,1.73,1.74 scumm.h,1.143,1.144

[Ruediger Hanke]

Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv23855

Modified Files:
	resource.cpp scumm.h 
Log Message:
Fix for the DOTTDEMO memory overwrite crash that happened at least on MorphOS

Index: resource.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/resource.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -C2 -d -r1.73 -r1.74
*** resource.cpp	26 Apr 2002 16:52:00 -0000	1.73
--- resource.cpp	26 Apr 2002 18:52:33 -0000	1.74
***************
*** 424,427 ****
--- 424,428 ----
  	memset(_charsetData, 0, sizeof(_charsetData));
  
+ 	assert(no < sizeof(_charsetData)/16);
  	checkRange(_maxCharsets - 1, 1, no, "Loading illegal charset %d");
  

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm.h,v
retrieving revision 1.143
retrieving revision 1.144
diff -C2 -d -r1.143 -r1.144
*** scumm.h	26 Apr 2002 14:13:39 -0000	1.143
--- scumm.h	26 Apr 2002 18:52:33 -0000	1.144
***************
*** 1295,1299 ****
  	byte _charsetColor;
  	uint16 _noSubtitles;	// Skip all subtitles?
! 	byte _charsetData[10][16];
  	void initCharset(int charset);
  	void restoreCharsetBg();
--- 1295,1299 ----
  	byte _charsetColor;
  	uint16 _noSubtitles;	// Skip all subtitles?
! 	byte _charsetData[15][16];
  	void initCharset(int charset);
  	void restoreCharsetBg();