| 107 |
|
) |
| 108 |
|
{ |
| 109 |
|
OBJREC *op1, *op2; |
| 110 |
< |
int i; |
| 110 |
> |
int i, n; |
| 111 |
|
|
| 112 |
|
while (obj1 != obj2) { |
| 113 |
|
if (obj1 == OVOID) |
| 132 |
|
for (i = op1->oargs.nfargs; i-- > 0; ) |
| 133 |
|
if (!eqreal(op1->oargs.farg[i], op2->oargs.farg[i])) |
| 134 |
|
return(0); |
| 135 |
< |
for (i = op1->oargs.nsargs; i-- > 0; ) |
| 135 |
> |
n = 0; |
| 136 |
> |
switch (op1->otype) { /* special cases (KEEP CONSISTENT!) */ |
| 137 |
> |
case MOD_ALIAS: |
| 138 |
> |
case MAT_ILLUM: |
| 139 |
> |
case MAT_MIRROR: |
| 140 |
> |
n = (op1->oargs.nsargs > 0); |
| 141 |
> |
break; |
| 142 |
> |
case MIX_FUNC: |
| 143 |
> |
case MIX_DATA: |
| 144 |
> |
case MIX_TEXT: |
| 145 |
> |
case MIX_PICT: |
| 146 |
> |
n = 2*(op1->oargs.nsargs >= 2); |
| 147 |
> |
break; |
| 148 |
> |
case MAT_CLIP: |
| 149 |
> |
n = op1->oargs.nsargs; |
| 150 |
> |
break; |
| 151 |
> |
} |
| 152 |
> |
/* check other string arguments */ |
| 153 |
> |
for (i = op1->oargs.nsargs; i-- > n; ) |
| 154 |
|
if (strcmp(op1->oargs.sarg[i], op2->oargs.sarg[i])) |
| 155 |
|
return(0); |
| 156 |
+ |
while (n-- > 0) /* check modifier references */ |
| 157 |
+ |
if (!eqobjects( lastmod(obj1, op1->oargs.sarg[n]), |
| 158 |
+ |
lastmod(obj2, op2->oargs.sarg[n]) )) |
| 159 |
+ |
return(0); |
| 160 |
|
obj1 = op1->omod; |
| 161 |
|
obj2 = op2->omod; |
| 162 |
|
} |
| 174 |
|
if (ismodifier(objptr(obj)->otype)) { |
| 175 |
|
i = otndx(objptr(obj)->oname, &modtab); |
| 176 |
|
if (eqobjects(obj, modtab.htab[i])) |
| 177 |
< |
return; |
| 177 |
> |
return; /* don't index if same as earlier def. */ |
| 178 |
|
modtab.htab[i] = obj; |
| 179 |
|
} |
| 180 |
|
#ifdef GETOBJ |
