[ViewVC] Diff of: cvs/deliantra/server/common/item.C

Comparing deliantra/server/common/item.C (file contents):
Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
- * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
- * Copyright (©) 1992,2007 Frank Tore Johansen
+ * Copyright (©) 1992 Frank Tore Johansen
  *
  * 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.
  * Note that using the term 'human' may not be very accurate, humanoid
  * may be better.
  * Basically, for the use/nonuse, the code does something like:
  * "This item goes %s\n", with the use/nonuse values filling in the %s
  */
+// see include/object.h
 Body_Locations body_locations[NUM_BODY_LOCATIONS] = {
   {KW_body_skill   , "You can use it as your skill"         , "It is used as a skill"},
   {KW_body_combat  , "You can wield it as your weapon"      , "It is used as a combat weapon"},
   {KW_body_range   , "You can use it as your range weapon"  , "It is used as a range weapon"},
   {KW_body_shield  , "You can wield it as a shield"         , "It is used as a shield"},
   {KW_body_foot    , "You can put it on your foot"          , "It goes on a human's foot"},
   {KW_body_hand    , "You can put it on your hand"          , "It goes on a human's hand"},
   {KW_body_wrist   , "You can wear it around your wrist"    , "It goes around a human's wrist"},
   {KW_body_waist   , "You can wear it around your waist"    , "It goes around a human's waist"},
 /*{"body_dragon_torso", "your body", "a dragon's body"} */
-};
-static char numbers[21][20] = {
-  "no", "", "two", "three", "four", "five", "six", "seven", "eight", "nine", "ten",
-  "eleven", "twelve", "thirteen", "fourteen", "fifteen", "sixteen", "seventeen",
-  "eighteen", "nineteen", "twenty"
 };
 static char numbers_10[10][20] = {
   "zero", "ten", "twenty", "thirty", "fourty", "fifty", "sixty", "seventy",
   "eighty", "ninety"
   {SPELLBOOK, "spellbook", "spellbooks", SK_LITERACY, 0},
   {CLOAK, "cloak", "cloaks", SK_SMITHERY, 0},
   {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},
   {BOOTS, "boots", "boots", SK_SMITHERY, 0},
   {GLOVES, "gloves", "gloves", SK_SMITHERY, 0},
   {BUILDER, "item builder", "item builders", 0, 0},
   {MATERIAL, "building material", "building materials", 0, 0},
   {ITEM_TRANSFORMER, "item_transformer", "item_transformers", 0, 0},
 };
-const int item_types_size = sizeof (item_types) / sizeof (*item_types);
+static const int item_types_size = sizeof (item_types) / sizeof (*item_types);
-materialtype_t *materialt;
-/*
-materialtype material[NROFMATERIALS] = {
-  *  		  P  M  F  E  C  C  A  D  W  G  P S P T F  C D D C C G H B  I *
-   *		  H  A  I  L  O  O  C  R  E  H  O L A U E  A E E H O O O L  N *
-   *		  Y  G  R  E  L  N  I  A  A  O  I O R R A  N P A A U D L I  T *
-   *		  S  I  E  C  D  F  D  I  P  S  S W A N R  C L T O N   Y N  R *
-   *		  I  C     T     U     N  O  T  O   L      E E H S T P   D  N *
-  {"paper", 	{15,10,17, 9, 5, 7,13, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
-  {"metal", 	{ 2,12, 3,12, 2,10, 7, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
-  {"glass", 	{14,11, 8, 3,10, 5, 1, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
-  {"leather", 	{ 5,10,10, 3, 3,10,10, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
-  {"wood", 	{10,11,13, 2, 2,10, 9, 0,20,15, 0,0,0,0,0,12,0,0,0,0,0,0,0,0}},
-  {"organics", 	{ 3,12, 9,11, 3,10, 9, 0,20,15, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
-  {"stone", 	{ 2, 5, 2, 2, 2, 2, 1, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
-  {"cloth", 	{14,11,13, 4, 4, 5,10, 0,20,15, 0,0,0,0,0, 5,0,0,0,0,0,0,0,0}},
-  {"adamant", 	{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0,0,0,0, 0,0,0,0,0,0,0,0,0}},
-  {"liquid", 	{ 0, 8, 9, 6,17, 0,15, 0,20,15,12,0,0,0,0,11,0,0,0,0,0,0,0,0}},
-  {"soft metal",{ 6,12, 6,14, 2,10, 1, 0,20,15, 0,0,0,0,0,10,0,0,0,0,0,0,0,0}},
-  {"bone", 	{10, 9, 4, 5, 3,10,10, 0,20,15, 0,0,0,0,0, 2,0,0,0,0,0,0,0,0}},
-  {"ice", 	{14,11,16, 5, 0, 5, 6, 0,20,15, 0,0,0,0,0, 7,0,0,0,0,0,0,0,0}}
-};
-*/
 /* This curve may be too steep.  But the point is that there should
  * be tough choices - there is no real point to this if everyone can
  * wear whatever they want with no worries.  Perhaps having the steep
  * curve is good (maybe even steeper), but allowing players to
   enc += op->stats.luck;
   /* Do spell paths now */
   for (i = 1; i < NRSPELLPATHS; i++)
-    {
-      if (op->path_attuned & (1 << i))
+    if (op->path_attuned & (1 << i))
-        enc++;
+      enc++;
-      else if (op->path_denied & (1 << i))
+    else if (op->path_denied & (1 << i))
-        enc -= 2;
+      enc -= 2;
-      else if (op->path_repelled & (1 << i))
+    else if (op->path_repelled & (1 << i))
-        enc--;
+      enc--;
-    }
   if (op->flag [FLAG_LIFESAVE    ]) enc += 5;
   if (op->flag [FLAG_REFL_SPELL  ]) enc += 3;
   if (op->flag [FLAG_REFL_MISSILE]) enc += 2;
   if (op->flag [FLAG_XRAYS       ]) enc += 2;
  * but do put a newline at the end.  Useful when dumping to files
  */
 const char *
 describe_resistance (const object *op, int newline)
 {
-  static char buf[VERY_BIG_BUF];
+  static dynbuf_text buf; buf.clear ();
-  char buf1[VERY_BIG_BUF];
-  int tmpvar;
-  buf[0] = 0;
+  for (int i = 0; i < NROFATTACKS; i++)
-  for (tmpvar = 0; tmpvar < NROFATTACKS; tmpvar++)
-    {
-      if (op->resist[tmpvar] && (op->type != FLESH || atnr_is_dragon_enabled (tmpvar) == 1))
+    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]);
-          if (!newline)
-            sprintf (buf1, "(%s %+d)", resist_plus[tmpvar], op->resist[tmpvar]);
-          else
-            sprintf (buf1, "%s %d\n", resist_plus[tmpvar], op->resist[tmpvar]);
-          strcat (buf, buf1);
-        }
-    }
   return buf;
 }
 /*
  * query_weight(object) returns a character pointer to a static buffer
  * containing the text-representation of the weight of the given object.
  * The buffer will be overwritten by the next call to query_weight().
     return levelnumbers_10[i / 10];
   strcpy (buf, numbers_10[i / 10]);
   strcat (buf, levelnumbers[i % 10]);
   return buf;
-}
-/*
- * get_number(integer) returns the text-representation of the given number
- * in a static buffer.  The buffer might be overwritten at the next
- * call to get_number().
- * It is currently only used by the query_name() function.
- */
-const char *
-get_number (int i)
-{
-  if (i <= 20)
-    return numbers[i];
-  else
-    {
-      static char buf[MAX_BUF];
-      sprintf (buf, "%d", i);
-      return buf;
-    }
 }
 /*
  *  Returns pointer to static buffer containing ring's or amulet's
  *  abilities
  */
 /* Aug 95 modified this slightly so that Skill tools don't have magic bonus
  * from stats.sp - b.t.
  */
-const char *
+static const char *
 ring_desc (const object *op)
 {
   static dynbuf_text buf; buf.clear ();
   int attr, val, len;
  * returned is good forever.)  However, it makes printing statements that
  * use several names much easier (don't need to store them to temp variables.)
  *
  * It is used extensively within messages, so should return only a prose
  * and short description of the item.
+ * It is also used by examine/ex and similar functions.
  */
 const char *
 query_name (const object *op)
 {
   int len = 0;
   use_buf %= 5;
   dynbuf_text &buf = bufs [use_buf];
   buf.clear ();
+#if 0
-  if ((op->is_armor () || op->is_weapon ()) && op->materialname)
+  if ((op->is_armor () || op->is_weapon ()) && op->material)
-    if (materialtype_t *mt = name_to_material (op->materialname))
-      buf << mt->description << ' ';
+    buf << op->material->description << ' ';
+#endif
   buf << query_short_name (op);
   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))
     {
       if (QUERY_FLAG (op, FLAG_DAMNED))
         {
           case BOW:
           case WAND:
           case ROD:
           case HORN:
-            buf << (op->env && op->env->current_weapon == op ? " (readied)" : " (applied)");
+            buf << " (applied)";
             break;
           case WEAPON:
-            buf << (op->env && op->env->current_weapon == op ? " (wielded)" : " (applied)");
+            buf << " (applied)";
             break;
           case ARMOUR:
           case HELMET:
           case SHIELD:
           case RING:
  * and sending to client.
  * If plural is set, we generate the plural name of this.
  *
  * It is sometimes used to display messages, and usually only used to match stuff,
  * so maybe this function should be removed.
+ * It is also used for client-side inventory/item descriptions.
  */
 const char *
 query_base_name (const object *op, int plural)
 {
   if ((!plural && !op->name) || (plural && !op->name_pl))
     return "(null)";
-  if (!op->nrof && !op->weight && !op->title && !is_magical (op))
+  if (!op->nrof && !op->weight && !op->title && !is_magical (op)
+      && op->type != EXIT)
     return op->name;            /* To speed things up (or make things slower?) */
   static dynbuf_text buf; buf.clear ();
+#if 0
-  if ((op->is_armor () || op->is_weapon ()) && op->materialname)
+  if ((op->is_armor () || op->is_weapon ()) && op->material)
-    if (materialtype_t *mt = name_to_material (op->materialname))
-      if (op->arch->materialname != mt->name)
+    if (op->arch->material != op->material)
-        buf << mt->description << ' ';
+      buf << op->material->description << ' ';
+#endif
   buf << (plural ? op->name_pl : op->name);
   if (op->title && QUERY_FLAG (op, FLAG_IDENTIFIED))
     buf << ' ' << op->title;
             if (s && *s)
               buf << ' ' << s;
           }
         break;
+      case EXIT:
+        // random map exits "unfortunately" get patched, so this only works before entering
+        if (EXIT_PATH (op) == shstr_random_map_exit)
+          buf << " (random map)";
+        else if (!EXIT_PATH (op))
+          buf << " (closed)";
+        break;
       default:
         if (op->magic && ((QUERY_FLAG (op, FLAG_BEEN_APPLIED) && need_identify (op)) || QUERY_FLAG (op, FLAG_IDENTIFIED)))
           buf.printf (" %+d", op->magic);
     }
   /* Note that the resolution this provides for players really isn't
    * very good.  Any player with a speed greater than .67 will
    * fall into the 'lightning fast movement' category.
    */
   if (op->has_active_speed ())
-    switch ((int) ((FABS (op->speed)) * 15))
+    switch ((int)(op->speed * 15.))
       {
         case 0:
           buf << "(very slow movement)";
           break;
         case 1:
       if (op->stats.luck)
         buf.printf ("(luck%+d)", op->stats.luck);
     }
   /* describe attacktypes */
-  if (is_dragon_pl (op))
+  if (op->is_dragon ())
     {
       /* for dragon players display the attacktypes from clawing skill
        * Break apart the for loop - move the comparison checking down -
        * this makes it more readable.
        */
       buf.add_abilities ("Attacks", op->attacktype);
       /* resistance on flesh is only visible for quetzals.  If
        * non flesh, everyone can see its resistances
        */
-      if (op->type != FLESH || (owner && is_dragon_pl (owner)))
+      if (op->type != FLESH || (owner && owner->is_dragon ()))
         buf << describe_resistance (op, 0);
       buf.add_paths ("Attuned",  op->path_attuned);
       buf.add_paths ("Repelled", op->path_repelled);
       buf.add_paths ("Denied",   op->path_denied);
 {
   static dynbuf_text buf; buf.clear ();
   for (object *tmp = inv; tmp; tmp = tmp->below)
     if (who && QUERY_FLAG (who, FLAG_WIZ))
-      buf.printf ("%s- %-28.28s (%5d) %-8s\n", indent, tmp->query_name (), tmp->count, tmp->query_weight ());
+      buf.printf ("%s- %-28.28s %-8s (%9d) %s\n", indent, tmp->query_name (), tmp->query_weight (), tmp->count, tmp->uuid.c_str ());
     else if (!tmp->invisible && (type == CONTAINER || QUERY_FLAG (tmp, FLAG_APPLIED)))
       buf.printf ("%s- %-36.36s %-8s\n", indent, tmp->query_name (), tmp->query_weight ());
   if (buf.size ())
     buf.printf ("%s(total weight: %s)\n", indent, query_weight ());

Diff Legend

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

Comparing deliantra/server/common/item.C (file contents): Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs. Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC

Diff Legend

Comparing deliantra/server/common/item.C (file contents):
Revision 1.58 by root, Mon Oct 12 14:00:57 2009 UTC vs.
Revision 1.77 by root, Sat Apr 3 02:27:24 2010 UTC