ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/item.C
(Generate patch)

Comparing deliantra/server/common/item.C (file contents):
Revision 1.18 by pippijn, Sat Jan 6 14:42:28 2007 UTC vs.
Revision 1.20 by root, Mon Feb 5 01:24:45 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * This program is free software; you can redistribute it and/or modify
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
11 (at your option) any later version. 11 * (at your option) 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License 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
19 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, 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 at <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>
28#include <spells.h> 28#include <spells.h>
… …
785 } 785 }
786 else 786 else
787 { 787 {
788#endif 788#endif
789 if (!plural) 789 if (!plural)
790 strcpy (buf, op->name); 790 assign (buf, op->name);
791 else 791 else
792 strcpy (buf, op->name_pl); 792 assign (buf, op->name_pl);
793
793 len = strlen (buf); 794 len = strlen (buf);
794#ifdef NEW_MATERIAL_CODE 795#ifdef NEW_MATERIAL_CODE
795 } 796 }
796#endif 797#endif
797 798
… …
801 safe_strcat (buf, op->title, &len, MAX_BUF); 802 safe_strcat (buf, op->title, &len, MAX_BUF);
802 } 803 }
803 804
804 switch (op->type) 805 switch (op->type)
805 { 806 {
806 case SPELLBOOK: 807 case SPELLBOOK:
807 case SCROLL: 808 case SCROLL:
808 case WAND: 809 case WAND:
809 case ROD: 810 case ROD:
810 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED)) 811 if (QUERY_FLAG (op, FLAG_IDENTIFIED) || QUERY_FLAG (op, FLAG_BEEN_APPLIED))
811 { 812 {
812 if (!op->title) 813 if (!op->title)
813 { 814 {
814 safe_strcat (buf, " of ", &len, MAX_BUF); 815 safe_strcat (buf, " of ", &len, MAX_BUF);
815 if (op->inv) 816 if (op->inv)
816 safe_strcat (buf, op->inv->name, &len, MAX_BUF); 817 safe_strcat (buf, op->inv->name, &len, MAX_BUF);
817 else 818 else
818 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name); 819 LOG (llevError, "Spellbook %s lacks inventory\n", &op->name);
819 } 820 }
820 if (op->type != SPELLBOOK) 821 if (op->type != SPELLBOOK)
821 { 822 {
822 sprintf (buf2, " (lvl %d)", op->level); 823 sprintf (buf2, " (lvl %d)", op->level);
823 safe_strcat (buf, buf2, &len, MAX_BUF); 824 safe_strcat (buf, buf2, &len, MAX_BUF);
824 } 825 }
825 } 826 }
826 break; 827 break;
827 828
828 829
829 case SKILL: 830 case SKILL:
830 case AMULET: 831 case AMULET:
831 case RING: 832 case RING:
832 if (!op->title) 833 if (!op->title)
833 { 834 {
834 /* If ring has a title, full description isn't so useful */ 835 /* If ring has a title, full description isn't so useful */
835 char *s = ring_desc (op); 836 char *s = ring_desc (op);
836 837
837 if (s[0]) 838 if (s[0])
838 { 839 {
839 safe_strcat (buf, " ", &len, MAX_BUF); 840 safe_strcat (buf, " ", &len, MAX_BUF);
840 safe_strcat (buf, s, &len, MAX_BUF); 841 safe_strcat (buf, s, &len, MAX_BUF);
841 } 842 }
842 } 843 }
843 break; 844 break;
844 default: 845 default:
845 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED))) 846 if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
846 { 847 {
847 sprintf (buf + strlen (buf), " %+d", op->magic); 848 sprintf (buf + strlen (buf), " %+d", op->magic);
848 } 849 }
849 } 850 }
851
850 return buf; 852 return buf;
851} 853}
852 854
853/* Break this off from describe_item - that function was way 855/* Break this off from describe_item - that function was way
854 * too long, making it difficult to read. This function deals 856 * too long, making it difficult to read. This function deals

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines