1 |
|
#ifndef lint |
2 |
< |
static const char RCSid[] = "$Id$"; |
2 |
> |
static const char RCSid[] = "$Id$"; |
3 |
|
#endif |
4 |
|
/* |
5 |
|
* readobj.c - routines for reading in object descriptions. |
73 |
|
char *name; |
74 |
|
FILE *fp; |
75 |
|
{ |
76 |
+ |
#define OALIAS -2 |
77 |
|
OBJECT obj; |
78 |
|
char sbuf[MAXSTR]; |
79 |
|
int rval; |
87 |
|
fgetword(sbuf, MAXSTR, fp); |
88 |
|
if (!strcmp(sbuf, VOIDID)) |
89 |
|
objp->omod = OVOID; |
90 |
+ |
else if (!strcmp(sbuf, ALIASMOD)) |
91 |
+ |
objp->omod = OALIAS; |
92 |
|
else if ((objp->omod = modifier(sbuf)) == OVOID) { |
93 |
|
sprintf(errmsg, "(%s): undefined modifier \"%s\"", name, sbuf); |
94 |
|
error(USER, errmsg); |
96 |
|
/* get type */ |
97 |
|
strcpy(sbuf, "EOF"); |
98 |
|
fgetword(sbuf, MAXSTR, fp); |
99 |
< |
if (!strcmp(sbuf, ALIASID)) |
97 |
< |
objp->otype = -1; |
98 |
< |
else if ((objp->otype = otype(sbuf)) < 0) { |
99 |
> |
if ((objp->otype = otype(sbuf)) < 0) { |
100 |
|
sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf); |
101 |
|
error(USER, errmsg); |
102 |
|
} |
105 |
|
fgetword(sbuf, MAXSTR, fp); |
106 |
|
objp->oname = savqstr(sbuf); |
107 |
|
/* get arguments */ |
108 |
< |
if (objp->otype == -1) { |
108 |
> |
if (objp->otype == MOD_ALIAS) { |
109 |
|
register OBJECT alias; |
110 |
|
strcpy(sbuf, "EOF"); |
111 |
|
fgetword(sbuf, MAXSTR, fp); |
112 |
|
if ((alias = modifier(sbuf)) == OVOID) { |
113 |
< |
sprintf(errmsg, |
114 |
< |
"(%s): bad reference \"%s\" for %s \"%s\"", |
115 |
< |
name, sbuf, ALIASID, objp->oname); |
115 |
< |
error(USER, errmsg); |
113 |
> |
sprintf(errmsg, "(%s): bad reference \"%s\"", |
114 |
> |
name, sbuf); |
115 |
> |
objerror(objp, USER, errmsg); |
116 |
|
} |
117 |
< |
objp->otype = objptr(alias)->otype; |
118 |
< |
copystruct(&objp->oargs, &objptr(alias)->oargs); |
117 |
> |
if (objp->omod == OALIAS || |
118 |
> |
objp->omod == objptr(alias)->omod) { |
119 |
> |
objp->omod = alias; |
120 |
> |
} else { |
121 |
> |
objp->oargs.sarg = (char **)malloc(sizeof(char *)); |
122 |
> |
if (objp->oargs.sarg == NULL) |
123 |
> |
error(SYSTEM, "out of memory in getobject"); |
124 |
> |
objp->oargs.nsargs = 1; |
125 |
> |
objp->oargs.sarg[0] = savestr(sbuf); |
126 |
> |
} |
127 |
|
} else if ((rval = readfargs(&objp->oargs, fp)) == 0) { |
128 |
|
sprintf(errmsg, "(%s): bad arguments", name); |
129 |
|
objerror(objp, USER, errmsg); |
131 |
|
sprintf(errmsg, "(%s): error reading scene", name); |
132 |
|
error(SYSTEM, errmsg); |
133 |
|
} |
134 |
+ |
if (objp->omod == OALIAS) { |
135 |
+ |
sprintf(errmsg, "(%s): inappropriate use of '%s' modifier", |
136 |
+ |
name, ALIASMOD); |
137 |
+ |
objerror(objp, USER, errmsg); |
138 |
+ |
} |
139 |
|
/* initialize */ |
140 |
|
objp->os = NULL; |
141 |
|
|
142 |
|
insertobject(obj); /* add to global structure */ |
143 |
+ |
#undef OALIAS |
144 |
|
} |
145 |
|
|
146 |
|
|
147 |
< |
int |
147 |
> |
OBJECT |
148 |
|
newobject() /* get a new object */ |
149 |
|
{ |
150 |
|
register int i; |