--- deliantra/server/common/item.C 2009/10/12 03:09:02 1.56
+++ deliantra/server/common/item.C 2009/11/05 15:43:21 1.62
@@ -5,18 +5,19 @@
* Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
* Copyright (©) 1992,2007 Frank Tore Johansen
*
- * Deliantra is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * Deliantra is free software: you can redistribute it and/or modify it under
+ * the terms of the Affero GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
+ * You should have received a copy of the Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
*
* The authors can be reached via e-mail to
*/
@@ -171,7 +172,7 @@
{SPINNER, "spinner", "spinners", 0, 0},
{GATE, "gate", "gates", 0, 0},
{BUTTON, "button", "buttons", 0, 0},
- {CF_HANDLE, "cf handle", "cf handles", 0, 0},
+ {T_HANDLE, "cf handle", "cf handles", 0, 0},
{HOLE, "hole", "holes", 0, 0},
{TRAPDOOR, "trapdoor", "trapdoors", 0, 0},
{SIGN, "sign", "signs", 0, 0},
@@ -382,28 +383,15 @@
const char *
describe_resistance (const object *op, int newline)
{
- static char buf[VERY_BIG_BUF];
- char buf1[VERY_BIG_BUF];
- int tmpvar;
-
- buf[0] = 0;
- for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
- {
- if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1))
- {
- if (!newline)
- sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
- else
- sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
+ static dynbuf_text buf; buf.clear ();
- strcat (buf, buf1);
- }
- }
+ for (int i = 0; i < NROFATTACKS; i++)
+ if (op->resist[i] && (op->type != FLESH || atnr_is_dragon_enabled (i) == 1))
+ buf.printf (newline ? "%s %d\n" : "(%s %+d)", resist_plus[i], op->resist[i]);
return buf;
}
-
/*
* query_weight(object) returns a character pointer to a static buffer
* containing the text-representation of the weight of the given object.
@@ -650,7 +638,7 @@
if (QUERY_FLAG (op, FLAG_INV_LOCKED))
buf << " *";
- if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
+ if (op->is_open_container ())
buf << " (open)";
if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
@@ -1210,7 +1198,8 @@
if (op->slaying && op->type != FOOD)
buf.printf ("(slay %s)", &op->slaying);
- if (op->type == SKILL_TOOL && op->skill) buf.printf ("(%s)", &op->skill);
+ if (op->type == SKILL_TOOL && op->skill)
+ buf.printf ("(%s)", &op->skill);
buf.add_abilities ("Attacks", op->attacktype);
/* resistance on flesh is only visible for quetzals. If