| 1083 |
|
add_send_object(FILE *fp) |
| 1084 |
|
{ |
| 1085 |
|
int st; |
| 1086 |
< |
char otype[32], oname[128]; |
| 1086 |
> |
char thismod[128], otype[32], oname[128]; |
| 1087 |
|
int n; |
| 1088 |
|
|
| 1089 |
< |
if (fscanf(fp, "%*s %s %s", otype, oname) != 2) |
| 1089 |
> |
if (fscanf(fp, "%s %s %s", thismod, otype, oname) != 2) |
| 1090 |
|
return(0); /* must have hit EOF! */ |
| 1091 |
|
if (!strcmp(otype, "alias")) { |
| 1092 |
|
fscanf(fp, "%*s"); /* skip alias */ |
| 1099 |
|
fputs(": cannot use source as a sender!\n", stderr); |
| 1100 |
|
return(-1); |
| 1101 |
|
} |
| 1102 |
+ |
if (strcmp(thismod, curmod)) { |
| 1103 |
+ |
if (curmod[0]) { |
| 1104 |
+ |
fputs(progname, stderr); |
| 1105 |
+ |
fputs(": warning - multiple modifiers in sender\n", |
| 1106 |
+ |
stderr); |
| 1107 |
+ |
} |
| 1108 |
+ |
strcpy(curmod, thismod); |
| 1109 |
+ |
} |
| 1110 |
|
parse_params(&curparams, newparams); |
| 1111 |
|
newparams[0] = '\0'; |
| 1112 |
|
add_surface(st, oname, fp); /* read & store surface */ |
| 1341 |
|
return(my_exec(rcarg)); /* rcontrib does everything */ |
| 1342 |
|
} |
| 1343 |
|
clear_params(&curparams, 0); /* else load sender surface & params */ |
| 1344 |
+ |
curmod[0] = '\0'; |
| 1345 |
|
if (load_scene(sendfn, add_send_object) < 0) |
| 1346 |
|
return(1); |
| 1347 |
|
if ((nsbins = prepare_sampler()) <= 0) |
