ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/Development/ray/src/ot/readobj2.c
(Generate patch)

Comparing ray/src/ot/readobj2.c (file contents):
Revision 2.4 by greg, Sat Feb 22 02:07:26 2003 UTC vs.
Revision 2.6 by schorsch, Thu Jun 26 00:58:10 2003 UTC

# Line 5 | Line 5 | static const char      RCSid[] = "$Id$";
5   *  readobj2.c - routines for reading in object descriptions.
6   */
7  
8 < #include  "standard.h"
8 > #include  <ctype.h>
9  
10 + #include  "standard.h"
11 + #include  "platform.h"
12   #include  "object.h"
11 –
13   #include  "otypes.h"
14  
14 – #include  <ctype.h>
15  
16   extern char  *fgetword();
17  
# Line 70 | Line 70 | int  (*f)();
70          thisobj.omod = OVOID;
71                                          /* get type */
72          fgetword(sbuf, MAXSTR, fp);
73 <        if (!strcmp(sbuf, ALIASID))
74 <                thisobj.otype = -1;
75 <        else if ((thisobj.otype = otype(sbuf)) < 0) {
73 >        if ((thisobj.otype = otype(sbuf)) < 0) {
74                  sprintf(errmsg, "(%s): unknown type \"%s\"", name, sbuf);
75                  error(USER, errmsg);
76          }
# Line 80 | Line 78 | int  (*f)();
78          fgetword(sbuf, MAXSTR, fp);
79          thisobj.oname = sbuf;
80                                          /* get arguments */
81 <        if (thisobj.otype == -1) {
81 >        if (thisobj.otype == MOD_ALIAS) {
82                  fscanf(fp, "%*s");
83                  return;
84          }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)