[Scummvm-cvs-logs] CVS: scummvm/scumm script_v5.cpp,1.120,1.121 object.cpp,1.123,1.124

Jochen Hoenicke Hoenicke at Informatik.Uni-Oldenburg.DE
Thu Jun 19 10:01:16 CEST 2003


On Thursday 19 June 2003 00:35, Jamieson Christian wrote:
> 
> Log Message:
> Fixed MSVC warnings
> 
> diff -u -d -r1.120 -r1.121
> --- script_v5.cpp	18 Jun 2003 12:33:46 -0000	1.120
> +++ script_v5.cpp	18 Jun 2003 22:35:03 -0000	1.121
> @@ -1922,7 +1922,7 @@
>  		if (_features & GF_OLD_BUNDLE)
>  			offset = *(objptr + 16);
>  		else
> -			offset = READ_LE_UINT16(objptr + 18);
> +			offset = (byte) READ_LE_UINT16(objptr + 18);
>  
>  		size = READ_LE_UINT16(objptr) - offset;
>  		name = objptr + offset;

Are you sure that this is the right fix?  The high byte is probably
needed, or otherwise I can't see the reason for READ_LE_UINT16.  We
should change "offset" to an "int" variable instead.  The same applies
to some other places you changed.

I did some research of where this problem was introduced (almost a
year ago):
 
http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/scummvm/scummvm-old/object.cpp.diff?r1=1.74&r2=1.75

According to the log, it should fix a problem with German monkeyvga. 

  Jochen






More information about the Scummvm-git-logs mailing list