| version 1.7 | | version 1.8 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_map_c = | | * static char *rcsid_map_c = |
| * "$Id: CrEdit.c,v 1.7 2005/08/28 08:18:43 akirschbaum Exp $"; | | * "$Id: CrEdit.c,v 1.8 2005/08/30 22:15:25 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| yb = diff + y * self->crEdit.fontSize - 1; | | yb = diff + y * self->crEdit.fontSize - 1; |
| | | |
| while (op) { | | while (op) { |
| New_Face f; | | if (QUERY_FLAG(op, FLAG_TEAR_DOWN) && self->crEdit.show_weak_walls) { |
| if (QUERY_FLAG(op, FLAG_TEAR_DOWN) && self->crEdit.show_weak_walls) | | New_Face * f; |
| f=new_faces[GET_ANIMATION(op, | | f = &new_faces[GET_ANIMATION(op,NUM_ANIMATIONS(op)/2)]; |
| NUM_ANIMATIONS(op)/2)]; | | DrawFacePart(w, self->crEdit.gc, f, xb, yb, 0, 0); |
| else f = *op->face; | | } else { |
| FaceDraw (w, self->crEdit.gc, &f, xb, yb); | | DrawPartObject(w, self->crEdit.gc, op, xb, yb); |
| | | } |
| | | |
| if (HAS_COLOUR(w)) { | | if (HAS_COLOUR(w)) { |
| XSetForeground(XtDisplay(w), self->crEdit.gc, | | XSetForeground(XtDisplay(w), self->crEdit.gc, |
| | |
| } | | } |
| | | |
| if (displaymode==Dm_Png) { | | if (displaymode==Dm_Png) { |
| f = GET_MAP_FACE(self->crEdit.map, x, y,2); | | op = GET_MAP_FACE_OBJ(self->crEdit.map, x, y, 2); |
| if (f) FaceDraw (w, self->crEdit.gc, f, | | if (op != NULL) |
| | | DrawPartObject(w, self->crEdit.gc, op, |
| x * self->crEdit.fontSize, | | x * self->crEdit.fontSize, |
| y * self->crEdit.fontSize); | | y * self->crEdit.fontSize); |
| f = GET_MAP_FACE(self->crEdit.map, x, y,1); | | op = GET_MAP_FACE_OBJ(self->crEdit.map, x, y, 1); |
| if ((f) && f->number != blank_face->number) | | if (op != NULL && op->face->number != blank_face->number) |
| FaceDraw (w, self->crEdit.gc, f, | | DrawPartObject(w, self->crEdit.gc, op, |
| x * self->crEdit.fontSize, | | x * self->crEdit.fontSize, |
| y * self->crEdit.fontSize); | | y * self->crEdit.fontSize); |
| f = GET_MAP_FACE(self->crEdit.map, x, y,0); | | op = GET_MAP_FACE_OBJ(self->crEdit.map, x, y, 0); |
| if ((f) && f->number != blank_face->number) | | if (op != NULL && op->face->number != blank_face->number) |
| FaceDraw (w, self->crEdit.gc, f, | | DrawPartObject(w, self->crEdit.gc, op, |
| x * self->crEdit.fontSize, | | x * self->crEdit.fontSize, |
| y * self->crEdit.fontSize); | | y * self->crEdit.fontSize); |
| } | | } |
| op=get_map_ob(self->crEdit.map, x, y); | | op=get_map_ob(self->crEdit.map, x, y); |
| while (op && op->above) op=op->above; | | while (op && op->above) op=op->above; |
| if (!op) f=blank_face; | | if (op == NULL) { |
| else if (QUERY_FLAG(op, FLAG_TEAR_DOWN) && self->crEdit.show_weak_walls) | | ; /* Paint nothing */ |
| f=&new_faces[GET_ANIMATION(op,NUM_ANIMATIONS(op)/2)/2]; | | } else if (QUERY_FLAG(op, FLAG_TEAR_DOWN) && self->crEdit.show_weak_walls) { |
| | | f = &new_faces[GET_ANIMATION(op, NUM_ANIMATIONS(op)/2)]; |
| else f = op->face; | | |
| | | |
| if (displaymode==Dm_Png || f->number != blank_face->number) | | if (displaymode==Dm_Png || f->number != blank_face->number) |
| FaceDraw (w, self->crEdit.gc, f, | | DrawFacePart (w, self->crEdit.gc, f, |
| | | x * self->crEdit.fontSize, |
| | | y * self->crEdit.fontSize, |
| | | 0, 0); |
| | | } else { |
| | | if (displaymode == Dm_Png || op->face->number != blank_face->number) |
| | | DrawPartObject (w, self->crEdit.gc, op, |
| x * self->crEdit.fontSize, | | x * self->crEdit.fontSize, |
| y * self->crEdit.fontSize); | | y * self->crEdit.fontSize); |
| } | | } |
| | | } |
| return; | | return; |
| } | | } |
| | | |