| … | |
… | |
| 39 | |
39 | |
| 40 | ob = GET_MAP_OB (map, x, y); |
40 | ob = GET_MAP_OB (map, x, y); |
| 41 | while (ob) |
41 | while (ob) |
| 42 | { |
42 | { |
| 43 | /* if ob is not a marking rune or floor, then check special cases */ |
43 | /* if ob is not a marking rune or floor, then check special cases */ |
| 44 | if (strcmp (ob->arch->name, "rune_mark") && ob->type != FLOOR) |
44 | if (strcmp (ob->arch->archname, "rune_mark") && ob->type != FLOOR) |
| 45 | { |
45 | { |
| 46 | switch (tmp->type) |
46 | switch (tmp->type) |
| 47 | { |
47 | { |
| 48 | case SIGN: |
48 | case SIGN: |
| 49 | case MAGIC_EAR: |
49 | case MAGIC_EAR: |
| … | |
… | |
| 84 | rune = GET_MAP_OB (map, x, y); |
84 | rune = GET_MAP_OB (map, x, y); |
| 85 | while (rune) |
85 | while (rune) |
| 86 | { |
86 | { |
| 87 | next = rune->above; |
87 | next = rune->above; |
| 88 | |
88 | |
| 89 | if ((rune->type == SIGN) && (!strcmp (rune->arch->name, "rune_mark"))) |
89 | if ((rune->type == SIGN) && (!strcmp (rune->arch->archname, "rune_mark"))) |
| 90 | rune->destroy (); |
90 | rune->destroy (); |
| 91 | |
91 | |
| 92 | rune = next; |
92 | rune = next; |
| 93 | } |
93 | } |
| 94 | } |
94 | } |
| … | |
… | |
| 184 | get_connection_rune (object *pl, short x, short y) |
184 | get_connection_rune (object *pl, short x, short y) |
| 185 | { |
185 | { |
| 186 | object *rune; |
186 | object *rune; |
| 187 | |
187 | |
| 188 | rune = GET_MAP_OB (pl->map, x, y); |
188 | rune = GET_MAP_OB (pl->map, x, y); |
| 189 | while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->name, "rune_mark")))) |
189 | while (rune && ((rune->type != SIGN) || (strcmp (rune->arch->archname, "rune_mark")))) |
| 190 | rune = rune->above; |
190 | rune = rune->above; |
| 191 | return rune; |
191 | return rune; |
| 192 | } |
192 | } |
| 193 | |
193 | |
| 194 | /** |
194 | /** |
| … | |
… | |
| 245 | if (!wall) |
245 | if (!wall) |
| 246 | /* Nothing -> bail out */ |
246 | /* Nothing -> bail out */ |
| 247 | return; |
247 | return; |
| 248 | |
248 | |
| 249 | /* Find base name */ |
249 | /* Find base name */ |
| 250 | assign (archetype, wall->arch->name); |
250 | assign (archetype, wall->arch->archname); |
| 251 | underscore = strchr (archetype, '_'); |
251 | underscore = strchr (archetype, '_'); |
| 252 | |
252 | |
| 253 | /* search for the first _ before a number */ |
253 | /* search for the first _ before a number */ |
| 254 | while (underscore && !isdigit (*(underscore + 1))) |
254 | while (underscore && !isdigit (*(underscore + 1))) |
| 255 | underscore = strchr (underscore + 1, '_'); |
255 | underscore = strchr (underscore + 1, '_'); |
| … | |
… | |
| 639 | case PEDESTAL: |
639 | case PEDESTAL: |
| 640 | case CF_HANDLE: |
640 | case CF_HANDLE: |
| 641 | case MAGIC_EAR: |
641 | case MAGIC_EAR: |
| 642 | case SIGN: |
642 | case SIGN: |
| 643 | /* Signs don't need a connection, but but magic mouths do. */ |
643 | /* Signs don't need a connection, but but magic mouths do. */ |
| 644 | if (tmp->type == SIGN && strcmp (tmp->arch->name, "magic_mouth")) |
644 | if (tmp->type == SIGN && strcmp (tmp->arch->archname, "magic_mouth")) |
| 645 | break; |
645 | break; |
| 646 | con_rune = get_connection_rune (pl, x, y); |
646 | con_rune = get_connection_rune (pl, x, y); |
| 647 | connected = find_or_create_connection_for_map (pl, x, y, con_rune); |
647 | connected = find_or_create_connection_for_map (pl, x, y, con_rune); |
| 648 | if (connected == -1) |
648 | if (connected == -1) |
| 649 | { |
649 | { |
| … | |
… | |
| 768 | } |
768 | } |
| 769 | |
769 | |
| 770 | tmp2 = find_marked_object (pl); |
770 | tmp2 = find_marked_object (pl); |
| 771 | while (tmp) |
771 | while (tmp) |
| 772 | { |
772 | { |
| 773 | if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->name, "rune_mark")))) |
773 | if (!QUERY_FLAG (tmp, FLAG_IS_BUILDABLE) && ((tmp->type != SIGN) || (strcmp (tmp->arch->archname, "rune_mark")))) |
| 774 | { |
774 | { |
| 775 | /* The item building function already has it's own special |
775 | /* The item building function already has it's own special |
| 776 | * checks for this |
776 | * checks for this |
| 777 | */ |
777 | */ |
| 778 | if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM)) |
778 | if ((!tmp2) || (tmp2->subtype != ST_MAT_ITEM)) |
