1 | /* |
1 | /* |
2 | * CrossFire, A Multiplayer game |
2 | * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. |
3 | * |
3 | * |
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
7 | * |
7 | * |
8 | * This program is free software; you can redistribute it and/or modify |
8 | * Crossfire TRT is free software; you can redistribute it and/or modify it |
9 | * it under the terms of the GNU General Public License as published by |
9 | * under the terms of the GNU General Public License as published by the Free |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | * Software Foundation; either version 2 of the License, or (at your option) |
11 | * (at your option) any later version. |
11 | * any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, but |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
16 | * GNU General Public License for more details. |
16 | * for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License along |
19 | * along with this program; if not, write to the Free Software |
19 | * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
21 | * |
21 | * |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail to <crossfire@schmorp.de> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | #include <global.h> |
25 | #include <global.h> |
26 | #include <funcpoint.h> |
26 | #include <funcpoint.h> |
27 | #include <living.h> |
27 | #include <living.h> |
… | |
… | |
771 | if ((op->is_armor () || op->is_weapon ()) && op->materialname) |
771 | if ((op->is_armor () || op->is_weapon ()) && op->materialname) |
772 | mt = name_to_material (op->materialname); |
772 | mt = name_to_material (op->materialname); |
773 | |
773 | |
774 | #ifdef NEW_MATERIAL_CODE |
774 | #ifdef NEW_MATERIAL_CODE |
775 | if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt && |
775 | if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt && |
776 | op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL)) |
776 | op->arch->materialname != mt->name && !(op->material & M_SPECIAL)) |
777 | { |
777 | { |
778 | strcpy (buf, mt->description); |
778 | strcpy (buf, mt->description); |
779 | len = strlen (buf); |
779 | len = strlen (buf); |
780 | safe_strcat (buf, " ", &len, MAX_BUF); |
780 | safe_strcat (buf, " ", &len, MAX_BUF); |
781 | if (!plural) |
781 | if (!plural) |
… | |
… | |
934 | { |
934 | { |
935 | treasure *t; |
935 | treasure *t; |
936 | int first = 1; |
936 | int first = 1; |
937 | |
937 | |
938 | for (t = op->randomitems->items; t != NULL; t = t->next) |
938 | for (t = op->randomitems->items; t != NULL; t = t->next) |
939 | if (t->item && t->item->clone.type == SPELL) |
939 | if (t->item && t->item->type == SPELL) |
940 | { |
940 | { |
941 | if (first) |
941 | if (first) |
942 | { |
942 | { |
943 | first = 0; |
943 | first = 0; |
944 | strcat (retbuf, "(Spell abilities:)"); |
944 | strcat (retbuf, "(Spell abilities:)"); |
945 | } |
945 | } |
946 | strcat (retbuf, "("); |
946 | strcat (retbuf, "("); |
947 | strcat (retbuf, t->item->clone.name); |
947 | strcat (retbuf, t->item->object::name); |
948 | strcat (retbuf, ")"); |
948 | strcat (retbuf, ")"); |
949 | } |
949 | } |
950 | } |
950 | } |
951 | if (op->type == PLAYER) |
951 | if (op->type == PLAYER) |
952 | { |
952 | { |
… | |
… | |
1520 | { |
1520 | { |
1521 | if (op->inv && op->randomitems) |
1521 | if (op->inv && op->randomitems) |
1522 | op->title = op->inv->name; |
1522 | op->title = op->inv->name; |
1523 | else if (op->arch) |
1523 | else if (op->arch) |
1524 | { |
1524 | { |
1525 | op->name = op->arch->clone.name; |
1525 | op->name = op->arch->object::name; |
1526 | op->name_pl = op->arch->clone.name_pl; |
1526 | op->name_pl = op->arch->object::name_pl; |
1527 | } |
1527 | } |
1528 | } |
1528 | } |
1529 | |
1529 | |
1530 | /* If the object is on a map, make sure we update its face */ |
1530 | /* If the object is on a map, make sure we update its face */ |
1531 | if (op->map) |
1531 | if (op->map) |