[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.41,1.42

[J.Brown (Ender)]

Could this not be because you removed the Ego push in o6_printEgo? I
didn't see you doing the push elsewhere, although I may have missed it.

 - Ender

On Wed, 15 Jan 2003, Max Horn wrote:

> Date: Wed, 15 Jan 2003 17:47:02 -0800
> From: Max Horn <fingolfin at users.sourceforge.net>
> To: scummvm-cvs-logs at lists.sourceforge.net
> Subject: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.41,1.42
>
> Update of /cvsroot/scummvm/scummvm/scumm
> In directory sc8-pr-cvs1:/tmp/cvs-serv15464a
>
> Modified Files:
> 	script_v6.cpp
> Log Message:
> two changes to accomodate Dig - don't like this :-/
>
> Index: script_v6.cpp
> ===================================================================
> RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6.cpp,v
> retrieving revision 1.41
> retrieving revision 1.42
> diff -u -d -r1.41 -r1.42
> --- script_v6.cpp	16 Jan 2003 00:40:19 -0000	1.41
> +++ script_v6.cpp	16 Jan 2003 01:46:59 -0000	1.42
> @@ -1300,8 +1300,10 @@
>  void Scumm_v6::o6_getActorScaleX()
>  {
>  	Actor *a = derefActorSafe(pop(), "o6_getActorScale");
> -	assert(a);
> -	push(a->scalex);
> +	if(!a)
> +		push(0); // FIXME: DIG seems to call this with an invalid actor id
> +	else
> +		push(a->scalex);
>  }
>
>  void Scumm_v6::o6_getActorAnimCounter1()
> @@ -1315,8 +1317,10 @@
>  {
>  	int var = pop();
>  	Actor *a = derefActorSafe(pop(), "o6_getAnimateVariable");
> -	assert(a);
> -	push(a->getAnimVar(var));
> +	if(!a)
> +		push(0); // FIXME: DIG seems to call this with an invalid actor id
> +	else
> +		push(a->getAnimVar(var));
>  }
>
>  void Scumm_v6::o6_isActorInBox()
>
>
>
> -------------------------------------------------------
> This SF.NET email is sponsored by: A Thawte Code Signing Certificate
> is essential in establishing user confidence by providing assurance of
> authenticity and code integrity. Download our Free Code Signing guide:
> http://ads.sourceforge.net/cgi-bin/redirect.pl?thaw0028en
> _______________________________________________
> Scummvm-cvs-logs mailing list
> Scummvm-cvs-logs at lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/scummvm-cvs-logs
>