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

Comparing deliantra/server/server/player.C (file contents):
Revision 1.231 by root, Sat Oct 3 18:46:26 2009 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 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 (©) 2002,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>
 #include <algorithm>
 #include <functional>
 playervec players;
-void
-display_motd (const object *op)
-{
-  char buf[MAX_BUF];
-  char motd[HUGE_BUF];
-  FILE *fp;
-  int comp;
-  int size;
-  sprintf (buf, "%s/%s", settings.confdir, settings.motd);
-  if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
-    return;
-  motd[0] = '\0';
-  size = 0;
-  while (fgets (buf, MAX_BUF, fp))
-    {
-      if (*buf == '#')
-        continue;
-      strncat (motd + size, buf, HUGE_BUF - size);
-      size += strlen (buf);
-    }
-  draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_MOTD, MSG_SUBTYPE_NONE, motd, NULL);
-  close_and_delete (fp, comp);
-}
-void
-send_rules (const object *op)
-{
-  char buf[MAX_BUF];
-  char rules[HUGE_BUF];
-  FILE *fp;
-  int comp;
-  int size;
-  sprintf (buf, "%s/%s", settings.confdir, settings.rules);
-  if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
-    return;
-  rules[0] = '\0';
-  size = 0;
-  while (fgets (buf, MAX_BUF, fp))
-    {
-      if (*buf == '#')
-        continue;
-      if (size + strlen (buf) >= HUGE_BUF)
-        {
-          LOG (llevDebug, "Warning, rules size is > %d bytes.\n", HUGE_BUF);
-          break;
-        }
-      strncat (rules + size, buf, HUGE_BUF - size);
-      size += strlen (buf);
-    }
-  draw_ext_info (NDI_UNIQUE | NDI_GREEN, 0, op, MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_RULES, rules, NULL);
-  close_and_delete (fp, comp);
-}
-void
-send_news (const object *op)
-{
-  char buf[MAX_BUF];
-  char news[HUGE_BUF];
-  char subject[MAX_BUF];
-  FILE *fp;
-  int comp;
-  int size;
-  sprintf (buf, "%s/%s", settings.confdir, settings.news);
-  if ((fp = open_and_uncompress (buf, 0, &comp)) == NULL)
-    return;
-  news[0] = '\0';
-  subject[0] = '\0';
-  size = 0;
-  while (fgets (buf, MAX_BUF, fp))
-    {
-      if (*buf == '#')
-        continue;
-      if (*buf == '%')
-        {                       /* send one news */
-          if (size > 0)
-            draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
-                                  MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS,
-                                  "INFORMATION: %s\n%s", (char *)"%s\n%s",
-                                  subject, news);  /*send previously read news */
-          strcpy (subject, buf + 1);
-          strip_endline (subject);
-          size = 0;
-          news[0] = '\0';
-        }
-      else
-        {
-          if (size + strlen (buf) >= HUGE_BUF)
-            {
-              LOG (llevDebug, "Warning, one news item has size > %d bytes.\n", HUGE_BUF);
-              break;
-            }
-          strncat (news + size, buf, HUGE_BUF - size);
-          size += strlen (buf);
-        }
-    }
-  draw_ext_info_format (NDI_UNIQUE | NDI_GREEN, 0, op,
-                        MSG_TYPE_ADMIN, MSG_TYPE_ADMIN_NEWS, "INFORMATION: %s\n%s\n", (char *)"%s\n%s", subject, news);
-  close_and_delete (fp, comp);
-}
 /* This loads the first map an puts the player on it. */
 static void
 set_first_map (object *op)
 {
   op->contr->maplevel = first_map_path;
   esrv_send_inventory (ob, ob);
   esrv_add_spells (this, 0);
   activate ();
-  send_rules (ob);
-  send_news (ob);
-  display_motd (ob);
   INVOKE_PLAYER (CONNECT, this);
   INVOKE_PLAYER (LOGIN, this);
 }
 void
       ns->reset_stats ();
       ns->pl = 0;
       ns = 0;
     }
-  observe = ob;
+  // this is important for the player scheduler to get the correct refcount
+  // when ns = 0
+  observe = viewpoint = ob;
   deactivate ();
 }
 // the need for this function can be explained
 // by load_object not returning the object
 void
 player::set_object (object *op)
 {
-  ob = observe = op;
+  ob = observe = viewpoint = op;
   ob->contr = this;              /* this aren't yet in archetype */
   ob->speed      = 1.0f;
   ob->speed_left = 0.5f;
 }
 void
 player::set_observe (object *op)
 {
-  observe = op ? op : ob;
+  observe = viewpoint = op ? op : ob;
+  do_los = 1;
+}
+void
+player::set_viewpoint (object *op)
+{
+  viewpoint = op ? op : (object *)observe;
   do_los = 1;
 }
 player::player ()
 {
     {
       ob->destroy_inv (false);
       ob->destroy ();
     }
-  ob = observe = 0;
+  ob = observe = viewpoint = 0;
 }
 player::~player ()
 {
   /* Clear item stack */
     }
   return true;
 }
-/* find_key
+static object *
- * We try to find a key for the door as passed.  If we find a key
- * and successfully use it, we return the key, otherwise NULL
- * This function merges both normal and locked door, since the logic
- * for both is the same - just the specific key is different.
- * pl is the player,
- * inv is the objects inventory to searched
- * door is the door we are trying to match against.
- * This function can be called recursively to search containers.
- */
-object *
-find_key (object *pl, object *container, object *door)
+find_key_ (object *pl, object *container, object *door)
 {
   object *tmp, *key;
   /* Should not happen, but sanity checking is never bad */
   if (!container->inv)
   /* First, lets try to find a key in the top level inventory */
   for (tmp = container->inv; tmp; tmp = tmp->below)
     {
       if (door->type == DOOR && tmp->type == KEY)
         break;
       /* For sanity, we should really check door type, but other stuff
        * (like containers) can be locked with special keys
        */
       if (tmp->slaying && tmp->type == SPECIAL_KEY && tmp->slaying == door->slaying)
         break;
    * a key, return
    */
   if (!tmp)
     {
       for (tmp = container->inv; tmp; tmp = tmp->below)
-        {
-          /* No reason to search empty containers */
+        /* No reason to search empty containers */
-          if (tmp->type == CONTAINER && tmp->inv)
+        if (tmp->type == CONTAINER && tmp->inv)
-            {
-              if ((key = find_key (pl, tmp, door)))
+          if ((key = find_key_ (pl, tmp, door)))
-                return key;
+            return key;
-            }
-        }
       if (!tmp)
-        return NULL;
+        return 0;
     }
   /* We get down here if we have found a key.  Now if its in a container,
    * see if we actually want to use it
    */
   if (pl != container)
     {
       /* Only let players use keys in containers */
       if (!pl->contr)
-        return NULL;
+        return 0;
       /* cases where this fails:
        * If we only search the player inventory, return now since we
        * are not in the players inventory.
        * If the container is not active, return now since only active
        * containers can be used.
        * inv must have been an container and must have been active.
        *
        * Change the color so that the message doesn't disappear with
        * all the others.
        */
-      if (pl->contr->usekeys == key_inventory ||
+      if (pl->contr->usekeys == key_inventory
-          !QUERY_FLAG (container, FLAG_APPLIED) ||
+          || !QUERY_FLAG (container, FLAG_APPLIED)
-          (pl->contr->usekeys == keyrings && container->race != shstr_keys))
+          || (pl->contr->usekeys == keyrings && container->race != shstr_keys))
         {
           new_draw_info_format (NDI_UNIQUE | NDI_BROWN, 0, pl,
                                 "The %s in your %s vibrates as you approach the door", query_name (tmp), query_name (container));
           return NULL;
         }
     }
   return tmp;
+}
+/* find_key
+ * We try to find a key for the door as passed.  If we find a key
+ * and successfully use it, we return the key, otherwise NULL
+ * This function merges both normal and locked door, since the logic
+ * for both is the same - just the specific key is different.
+ * pl is the player,
+ * inv is the objects inventory to searched
+ * door is the door we are trying to match against.
+ * This function can be called recursively to search containers.
+ */
+object *
+find_key (object *pl, object *container, object *door)
+{
+  if (door->slaying && is_match_expr (door->slaying))
+    {
+      // for match expressions, we try to find the key by applying the match
+      // to the op itself, which is supposed to find the "key", instead
+      // of searching through containers ourselves.
+      return match_one (door->slaying, container, door, pl, pl);
+    }
+  else
+    return find_key_ (pl, container, door);
 }
 /* moved door processing out of move_player_attack.
  * returns 1 if player has opened the door with a key
  * such that the caller should not do anything more,
  * going to try and move (not fire weapons).
  */
 bool
 move_player_attack (object *op, int dir)
 {
+  if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
+    {
+      --op->speed_left;
+      return true;
+    }
   int on_battleground;
   sint16 nx = freearr_x[dir] + op->x;
   sint16 ny = freearr_y[dir] + op->y;
   on_battleground = op_on_battleground (op, 0, 0);
   if (out_of_map (op->map, nx, ny))
     return false;
-  if (!op->contr->braced && op->speed_left > 0.f && move_ob (op, dir, op))
-    {
-      --op->speed_left;
-      return true;
-    }
   /* If braced, or can't move to the square, and it is not out of the
    * map, attack it.  Note order of if statement is important - don't
    * want to be calling move_ob if braced, because move_ob will move the
    * player.  This is a pretty nasty hack, because if we could

Diff Legend

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

Comparing deliantra/server/server/player.C (file contents): Revision 1.231 by root, Sat Oct 3 18:46:26 2009 UTC vs. Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC

Diff Legend

Comparing deliantra/server/server/player.C (file contents):
Revision 1.231 by root, Sat Oct 3 18:46:26 2009 UTC vs.
Revision 1.237 by root, Thu Nov 5 15:18:26 2009 UTC