[Scummvm-cvs-logs] CVS: scummvm/scumm script.cpp,1.71,1.72

[Max Horn]

Am Sonntag, 04.05.03 um 09:34 Uhr schrieb Jonathan Gray:

> Update of /cvsroot/scummvm/scummvm/scumm
> In directory sc8-pr-cvs1:/tmp/cvs-serv17366
>
> Modified Files:
> 	script.cpp
> Log Message:
> don't know why this was removed but it breaks several games making it 
> for all non v2 games
>
> Index: script.cpp
> ===================================================================
> RCS file: /cvsroot/scummvm/scummvm/scumm/script.cpp,v
> retrieving revision 1.71
> retrieving revision 1.72
> diff -u -d -r1.71 -r1.72
> --- script.cpp	4 May 2003 02:27:22 -0000	1.71
> +++ script.cpp	4 May 2003 07:34:54 -0000	1.72
> @@ -383,6 +383,9 @@
>  		var &= ~0x2000;
>  	}
>
> +	if (!(_features & GF_AFTER_V2) && !(var & 0xF000))
> +			return _vars[var];
> +

That code is not even called by v2 games; in fact it's impossible for 
them to call it because readVar is overloaded. I removed it because 
normally, that thing should already have been handled by the if above. 
No idea why it wouldn't happen... hm


Max