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.13 by elmex, Wed Dec 20 13:07:12 2006 UTC vs.
Revision 1.18 by pippijn, Sat Jan 6 14:42:28 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) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 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
8 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
161 {LIGHTER, "lighter", "lighters", 0, 0}, 162 {LIGHTER, "lighter", "lighters", 0, 0},
162 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 163 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
163 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 164 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
164 {LAMP, "lamp", "lamps", 0, 0}, 165 {LAMP, "lamp", "lamps", 0, 0},
165 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 166 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
166 {TOOL, "tool", "tools", 0, 0},
167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 167 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
168 {BUILDFAC, "building facility", "building facilities", 0, 0},
169 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 168 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
170 {SPINNER, "spinner", "spinners", 0, 0}, 169 {SPINNER, "spinner", "spinners", 0, 0},
171 {GATE, "gate", "gates", 0, 0}, 170 {GATE, "gate", "gates", 0, 0},
172 {BUTTON, "button", "buttons", 0, 0}, 171 {BUTTON, "button", "buttons", 0, 0},
173 {CF_HANDLE, "cf handle", "cf handles", 0, 0}, 172 {CF_HANDLE, "cf handle", "cf handles", 0, 0},
180 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0}, 179 {SPELL_EFFECT, "spell effect", "spell effects", 0, 0},
181 {CONVERTER, "converter", "converters", 0, 0}, 180 {CONVERTER, "converter", "converters", 0, 0},
182 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0}, 181 {BRACERS, "bracers", "bracers", SK_SMITHERY, 0},
183 {POISONING, "poisoning", "poisonings", 0, 0}, 182 {POISONING, "poisoning", "poisonings", 0, 0},
184 {SAVEBED, "savebed", "savebeds", 0, 0}, 183 {SAVEBED, "savebed", "savebeds", 0, 0},
185 {POISONCLOUD, "poison cloud", "poison clouds", 0, 0},
186 {FIREHOLES, "fireholes", "fireholes", 0, 0},
187 {WAND, "wand", "wands", SK_THAUMATURGY, 0}, 184 {WAND, "wand", "wands", SK_THAUMATURGY, 0},
188 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0}, 185 {SCROLL, "scroll", "scrolls", SK_LITERACY, 0},
189 {DIRECTOR, "director", "directors", 0, 0}, 186 {DIRECTOR, "director", "directors", 0, 0},
190 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0}, 187 {GIRDLE, "girdle", "girdles", SK_SMITHERY, 0},
191 {FORCE, "force", "forces", 0, 0}, 188 {FORCE, "force", "forces", 0, 0},
871 868
872 /* Note that the resolution this provides for players really isn't 869 /* Note that the resolution this provides for players really isn't
873 * very good. Any player with a speed greater than .67 will 870 * very good. Any player with a speed greater than .67 will
874 * fall into the 'lightning fast movement' category. 871 * fall into the 'lightning fast movement' category.
875 */ 872 */
876 if (FABS (op->speed) > MIN_ACTIVE_SPEED) 873 if (op->has_active_speed ())
877 { 874 {
878 switch ((int) ((FABS (op->speed)) * 15)) 875 switch ((int) ((FABS (op->speed)) * 15))
879 { 876 {
880 case 0: 877 case 0:
881 strcat (retbuf, "(very slow movement)"); 878 strcat (retbuf, "(very slow movement)");
937 { 934 {
938 treasure *t; 935 treasure *t;
939 int first = 1; 936 int first = 1;
940 937
941 for (t = op->randomitems->items; t != NULL; t = t->next) 938 for (t = op->randomitems->items; t != NULL; t = t->next)
942 if (t->item && (t->item->clone.type == SPELL)) 939 if (t->item && t->item->clone.type == SPELL)
943 { 940 {
944 if (first) 941 if (first)
945 { 942 {
946 first = 0; 943 first = 0;
947 strcat (retbuf, "(Spell abilities:)"); 944 strcat (retbuf, "(Spell abilities:)");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines