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.90 by root, Mon Oct 11 18:40:43 2010 UTC vs.
Revision 1.97 by root, Mon Dec 17 02:02:29 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * 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 Affero GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * and the GNU General Public License along with this program. If not, see 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <living.h> 26#include <living.h>
… …
146 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0}, 146 {INORGANIC, "inorganic", "inorganics", SK_ALCHEMY, 0},
147 {SKILL_TOOL, "skill tool", "skill tools", 0, 0}, 147 {SKILL_TOOL, "skill tool", "skill tools", 0, 0},
148 {LIGHTER, "lighter", "lighters", 0, 0}, 148 {LIGHTER, "lighter", "lighters", 0, 0},
149 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0}, 149 {BUILDABLE_WALL, "buildable wall", "buildable walls", 0, 0},
150 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0}, 150 {MISC_OBJECT, "bric-a-brac", "bric-a-brac", 0, 0},
151 {TORCH, "torch", "torches", 0, 0},
151 {LAMP, "lamp", "lamps", 0, 0}, 152 {LAMP, "lamp", "lamps", 0, 0},
152 {DUPLICATOR, "duplicator", "duplicators", 0, 0}, 153 {DUPLICATOR, "duplicator", "duplicators", 0, 0},
153 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0}, 154 {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
154 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0}, 155 {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
155 {SPINNER, "spinner", "spinners", 0, 0}, 156 {SPINNER, "spinner", "spinners", 0, 0},
… …
475 */ 476 */
476static const char * 477static const char *
477ring_desc (const object *op) 478ring_desc (const object *op)
478{ 479{
479 static dynbuf_text buf; buf.clear (); 480 static dynbuf_text buf; buf.clear ();
480 int attr, val, len; 481 int attr, val;
481 482
482 if (op->flag [FLAG_IDENTIFIED]) 483 if (op->flag [FLAG_IDENTIFIED])
483 { 484 {
484 for (attr = 0; attr < NUM_STATS; attr++) 485 for (attr = 0; attr < NUM_STATS; attr++)
485 if ((val = op->stats.stat (attr))) 486 if ((val = op->stats.stat (attr)))
… …
619 * It is also used by examine/ex and similar functions. 620 * It is also used by examine/ex and similar functions.
620 */ 621 */
621const char * 622const char *
622query_name (const object *op) 623query_name (const object *op)
623{ 624{
624 int len = 0;
625 static dynbuf_text bufs[5]; 625 static dynbuf_text bufs[5];
626 static int use_buf = 0; 626 static int use_buf = 0;
627 627
628 use_buf++; 628 use_buf++;
629 use_buf %= 5; 629 use_buf %= 5;
… …
1009 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000); 1009 buf.printf ("(capacity %dk; it is ", op->stats.maxsp / 1000);
1010 } 1010 }
1011 else 1011 else
1012 buf.printf ("(capacity %d; it is ", op->stats.maxsp); 1012 buf.printf ("(capacity %d; it is ", op->stats.maxsp);
1013 1013
1014 i = (op->stats.sp * 10) / op->stats.maxsp; 1014 i = op->stats.sp * 10 / max (op->stats.maxsp, 1);
1015 if (op->stats.sp == 0) 1015
1016 buf << "empty"; 1016 if (op->stats.sp == 0) buf << "empty";
1017 else if (i == 0) 1017 else if (i <= 0) buf << "almost empty";
1018 buf << "almost empty"; 1018 else if (i <= 2) buf << "partially filled";
1019 else if (i < 3) 1019 else if (i <= 5) buf << "half full";
1020 buf << "partially filled"; 1020 else if (i <= 8) buf << "well charged";
1021 else if (i < 6)
1022 buf << "half full";
1023 else if (i < 9)
1024 buf << "well charged";
1025 else if (op->stats.sp == op->stats.maxsp) 1021 else if (op->stats.sp < op->stats.maxsp) buf << "almost full";
1026 buf << "fully charged"; 1022 else buf << "fully charged";
1027 else
1028 buf << "almost full";
1029 1023
1030 buf << ')'; 1024 buf << ')';
1031 break; 1025 break;
1032 1026
1033 case LAMP: 1027 case LAMP:
… …
1352 else if (inv 1346 else if (inv
1353 && inv->msg 1347 && inv->msg
1354 && inv->type == SPELL 1348 && inv->type == SPELL
1355 && flag [FLAG_IDENTIFIED] 1349 && flag [FLAG_IDENTIFIED]
1356 && (type == SPELLBOOK || type == ROD || type == WAND 1350 && (type == SPELLBOOK || type == ROD || type == WAND
1357 || type == ROD || type == POTION || type == SCROLL)) 1351 || type == POTION || type == SCROLL))
1358 // for spellbooks and other stuff that contains spells, print the spell message, 1352 // for spellbooks and other stuff that contains spells, print the spell message,
1359 // unless the object has a custom message handled above. 1353 // unless the object has a custom message handled above.
1360 buf << '\r' << inv->msg << '\n'; 1354 buf << '\r' << inv->msg << '\n';
1361 1355
1362 // try to display the duration for some potions and scrolls 1356 // try to display the duration for some potions and scrolls

Diff Legend

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