Subversion Repositories wimsdev

Rev

Rev 1139 | Rev 3837 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1139 Rev 3718
Line 1231... Line 1231...
1231 
       && pm->color[0]!=gdStyled && pm->color[0]!=gdTiled) {
 1231 
       && pm->color[0]!=gdStyled && pm->color[0]!=gdTiled) {
1232 
        pm->color[1]=pm->color[0];
 1232 
        pm->color[1]=pm->color[0];
1233 
        pm->color[0]=widthcolor(width,pm->color[0]);
 1233 
        pm->color[0]=widthcolor(width,pm->color[0]);
1234 
    }
 1234 
    }
1235 
    pm->fill=o->fill_tag;
 1235 
    pm->fill=o->fill_tag;
1236 
    strcpy(pm->str,p); return 0;
 1236 
    ovlstrcpy(pm->str,p); return 0;
1237 
}
 1237 
}
1238 
 
 1238 
 
1239 
        /* Execute a command. Returns 0 if OK. */
 1239 
        /* Execute a command. Returns 0 if OK. */
1240 
int obj_main(char *p)
 1240 
int obj_main(char *p)
1241 
{
 1241 
{
Line 1262... Line 1262...
1262 
        error("bad_cmd"); return 1;
 1262 
        error("bad_cmd"); return 1;
1263 
    }
 1263 
    }
1264 
    if(image==NULL && (objtab[i].color_pos || objtab[i].required_parms>2)) {
 1264 
    if(image==NULL && (objtab[i].color_pos || objtab[i].required_parms>2)) {
1265 
        error("image_not_defined"); return 1;
 1265 
        error("image_not_defined"); return 1;
1266 
    }
 1266 
    }
1267 
    strcpy(tbuf2,pp);
 1267 
    ovlstrcpy(tbuf2,pp);
1268 
    if(objtab[i].color_pos || objtab[i].routine==obj_setstyle) {
 1268 
    if(objtab[i].color_pos || objtab[i].routine==obj_setstyle) {
1269 
        substit(tbuf2);
 1269 
        substit(tbuf2);
1270 
    }
 1270 
    }
1271 
    if(parse_parms(tbuf2,&pm,objtab+i)!=0) error("bad_parms");
 1271 
    if(parse_parms(tbuf2,&pm,objtab+i)!=0) error("bad_parms");
1272 
    else objtab[i].routine(&pm);
 1272 
    else objtab[i].routine(&pm);