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

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.58 by elmex, Sun Dec 14 13:49:11 2008 UTC vs.
Revision 1.71 by root, Sat Nov 7 13:58:01 2009 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2003,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Deliantra is free software: you can redistribute it and/or modify
+ * Deliantra is free software: you can redistribute it and/or modify it under
- * it under the terms of the GNU General Public License as published by
+ * the terms of the Affero GNU General Public License as published by the
- * the Free Software Foundation, either version 3 of the License, or
+ * Free Software Foundation, either version 3 of the License, or (at your
- * (at your option) any later version.
+ * 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
+ * You should have received a copy of the Affero GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * and the GNU General Public License along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
  *
  * The authors can be reached via e-mail to <support@deliantra.net>
  */
 #include <global.h>
   /* Only prohibit stealing if the player does not have a free
    * hand available and in fact does have hands.
    */
   if (op->type == PLAYER && op->slot[body_arm].used <= 0 && op->slot[body_arm].info)
     {
-      new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with!");
+      new_draw_info (NDI_UNIQUE, 0, op, "But you have no free hands to steal with! "
+                                        "H<Try to unapply weapons or things you hold in your hands, use the C<body> command.>");
       return -1;
     }
   /* ADJUSTMENTS */
-  /* Its harder to steal from hostile beings! */
+  /* It's harder to steal from hostile beings! */
   if (!QUERY_FLAG (victim, FLAG_UNAGGRESSIVE))
     roll = roll / 2;
   /* Easier to steal from sleeping beings, or if the thief is
    * unseen */
 {
   object *success = NULL, *tmp = NULL, *next;
   int roll = 0, chance = 0, stats_value;
   rv_vector rv;
-  stats_value = ((who->stats.Dex + who->stats.Int) * 3) / 2;
+  stats_value = (who->stats.Dex + who->stats.Int) * 3 / 2;
   /* if the victim is aware of a thief in the area (FLAG_NO_STEAL set on them)
    * they will try to prevent stealing if they can. Only unseen theives will
    * have much chance of success.
    */
-  if (op->type != PLAYER && QUERY_FLAG (op, FLAG_NO_STEAL))
+  if (!op->is_player () && op->flag [FLAG_NO_STEAL])
     {
       if (can_detect_enemy (op, who, &rv))
         {
           npc_call_help (op);
           CLEAR_FLAG (op, FLAG_UNAGGRESSIVE);
           new_draw_info (NDI_UNIQUE, 0, who, "Your attempt is prevented!");
           return 0;
         }
       else                      /* help npc to detect thief next time by raising its wisdom */
         op->stats.Wis += (op->stats.Int / 5) + 1;
       if (op->stats.Wis > MAX_STAT)
         op->stats.Wis = MAX_STAT;
     }
-  if (op->type == PLAYER && QUERY_FLAG (op, FLAG_WIZ))
+  if (op->is_player () && op->flag [FLAG_WIZ])
     {
       new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from the dungeon master!\n");
       return 0;
     }
   // only allow stealing between hostile players (TODO: probably should change)
-  if (op->type == PLAYER && who->type == PLAYER && (who->contr->peaceful || op->contr->peaceful))
+  if (op->is_player () && who->is_player () && (who->contr->peaceful || op->contr->peaceful))
     {
       new_draw_info (NDI_UNIQUE, 0, who, "You can't steal from other players!\n");
       return 0;
     }
         }
       pl->x = x;
       pl->y = y;
       pl->map = m;
+      if (m->at (x, y).move_on & pl->move_type)
+        {
+          new_draw_info (NDI_UNIQUE, 0, pl, "Your jump is stopped.");
+          stop_jump (pl, i, spaces);
+          return 0;
+        }
     }
   stop_jump (pl, i, spaces);
   return calc_skill_exp (pl, NULL, skill);
 }
 /* Helper function for do_skill_ident, so that we can loop
  * over inventory AND objects on the ground conveniently.
  */
-int
+static int
 do_skill_ident2 (object *tmp, object *pl, int obj_class, object *skill)
 {
   int success = 0, chance;
   int skill_value = skill->level * pl->stats.Int ? pl->stats.Int : 10;
 }
 /* remove_trap() - This skill will disarm any previously discovered trap
  * the algorithm is based (almost totally) on the old command_disarm() - b.t.
  */
 int
 remove_trap (object *op, int dir, object *skill)
 {
   object *tmp, *tmp2;
   int i, success = 0, mflags;
       mflags = get_map_flags (m, &m, x, y, &x, &y);
       if (mflags & P_OUT_OF_MAP)
         continue;
       /* Check everything in the square for trapness */
-      for (tmp = GET_MAP_OB (m, x, y); tmp != NULL; tmp = tmp->above)
+      for (tmp = GET_MAP_OB (m, x, y); tmp; tmp = tmp->above)
         {
           /* And now we'd better do an inventory traversal of each
            * of these objects inventory.  Like above, only
            * do this for interesting objects.
            */
           if (tmp->type != PLAYER && !QUERY_FLAG (tmp, FLAG_MONSTER))
             {
-              for (tmp2 = tmp->inv; tmp2 != NULL; tmp2 = tmp2->below)
+              for (tmp2 = tmp->inv; tmp2; tmp2 = tmp2->below)
                 if ((tmp2->type == RUNE || tmp2->type == TRAP) && tmp2->stats.Cha <= 1)
                   {
                     trap_show (tmp2, tmp);
                     if (trap_disarm (op, tmp2, 1, skill) && (!tmp2->owner || tmp2->owner->type != PLAYER))
                       {
                         tmp->stats.exp = tmp->stats.Cha * tmp->level;
                         success += calc_skill_exp (op, tmp2, skill);
                       }
                   }
             }
           if ((tmp->type == RUNE || tmp->type == TRAP) && tmp->stats.Cha <= 1)
             {
               trap_show (tmp, tmp);
               if (trap_disarm (op, tmp, 1, skill) && (!tmp->owner || tmp->owner->type != PLAYER))
                 {
                   tmp->stats.exp = tmp->stats.Cha * tmp->level;
                   success += calc_skill_exp (op, tmp, skill);
                 }
   /* Check all objects - we could stop at floor objects,
    * but if someone buries an altar, I don't see a problem with
    * going through all the objects, and it shouldn't be much slower
    * than extra checks on object attributes.
    */
-  for (tmp = pl->below; tmp != NULL; tmp = tmp->below)
+  for (tmp = pl->below; tmp; tmp = tmp->below)
     {
       /* Only if the altar actually belongs to someone do you get special benefits */
       if (tmp && tmp->type == HOLY_ALTAR && tmp->other_arch)
         {
           sprintf (buf, "You pray over the %s.", &tmp->name);
  * ordinary inscribable 'books' (anything that is not a SPELL). b.t.
  */
 static int
 write_note (object *pl, object *item, const char *msg, object *skill)
 {
-  if (strstr (msg, "\nendmsg"))
+  if (!msg_is_safe (msg))
     {
       new_draw_info (NDI_UNIQUE, 0, pl, "Trying to cheat now are we?");
+      LOG (llevInfo, "write_note: player %s tried to write bogus note %s\n", &pl->name, msg);
       return 0;
     }
   int len = strlen (msg);
     }
   if (INVOKE_OBJECT (INSCRIBE_NOTE, item, ARG_PLAYER (pl->contr), ARG_STRING (msg), ARG_OBJECT (skill)))
     return RESULT_INT (0);
-  char buf[1024];
+  STRLEN char_len = utf8_length ((U8 *)msg, (U8 *)(msg+len));
-  if (len < sizeof (buf) - 2)
+  if (char_len <= item->weight_limit)
     {
-      snprintf (buf, sizeof (buf), "%s\n", msg);
       object *newbook = arch_to_object (item->other_arch);
       item->decrease ();
       newbook->nrof = 1;
-      newbook->msg = buf;
+      newbook->msg = shstr (msg);
       newbook->flag [FLAG_IDENTIFIED] = true;
       if (item->subtype == 1) // mailscrolls
         {
           newbook->name    = item->name;
       pl->insert (newbook);
       pl->contr->play_sound (sound_find ("inscribe_success"));
       new_draw_info_format (NDI_UNIQUE, 0, pl, "You write in the %s.", &item->name);
-      return strlen (msg);
+      return char_len;
     }
   else
-    new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s!", &item->name);
+    new_draw_info_format (NDI_UNIQUE, 0, pl, "Your message won't fit in the %s! H<It is only big enough for %d characters, your message had %d characters.>",
+                          &item->name, item->weight_limit, char_len);
   return 0;
 }
 /* write_scroll() - this routine allows players to inscribe spell scrolls
       for (tmp = op->inv; tmp != NULL; tmp = tmp->below)
         {
           /* can't toss invisible or inv-locked items */
           if (tmp->invisible || QUERY_FLAG (tmp, FLAG_INV_LOCKED))
             continue;
-          if (!request || !strcmp (query_name (tmp), request) || !strcmp (tmp->name, request))
+          if (!request || !strcmp (query_name (tmp), request) || !strcmp (&tmp->name, request))
             break;
         }
     }
   /* this should prevent us from throwing away
     {
       throw_ob->last_sp += eff_str / 3; /* fly a little further */
       throw_ob->stats.dam += throw_ob->inv->stats.dam + throw_ob->magic + 2;
       throw_ob->stats.wc -= throw_ob->magic + throw_ob->inv->stats.wc;
       /* only throw objects get directional faces */
-      if (GET_ANIM_ID (throw_ob) && NUM_ANIMATIONS (throw_ob))
+      if (throw_ob->has_anim () && throw_ob->anim_frames ())
-        SET_ANIMATION (throw_ob, dir);
+        throw_ob->set_anim_frame (dir);
     }
   else
     {
       uint16 mat = throw_ob->materials;

Diff Legend

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

Comparing deliantra/server/server/skills.C (file contents): Revision 1.58 by elmex, Sun Dec 14 13:49:11 2008 UTC vs. Revision 1.71 by root, Sat Nov 7 13:58:01 2009 UTC

Diff Legend

Comparing deliantra/server/server/skills.C (file contents):
Revision 1.58 by elmex, Sun Dec 14 13:49:11 2008 UTC vs.
Revision 1.71 by root, Sat Nov 7 13:58:01 2009 UTC