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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.129 by root, Tue May 6 19:37:01 2008 UTC

 /*
- * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001,2007 Mark Wedel
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
- * Crossfire TRT is free software: you can redistribute it and/or modify
+ * 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.
  *
  * This program is distributed in the hope that it will be useful,
  * 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 <http://www.gnu.org/licenses/>.
  *
- * The authors can be reached via e-mail to <crossfire@schmorp.de>
+ * The authors can be reached via e-mail to <support@deliantra.net>
  */
 /**
  * \file
  * Client handling.
 {
   char *token = buf;
   buf += strlen (buf) + 9;
   // initial map and its origin
-  maptile *map = pl->ob->map;
+  maptile *map = pl->observe->map;
-  int mapx = pl->ns->mapx / 2 - pl->ob->x;
+  int mapx = pl->ns->mapx / 2 - pl->observe->x;
-  int mapy = pl->ns->mapy / 2 - pl->ob->y;
+  int mapy = pl->ns->mapy / 2 - pl->observe->y;
   int max_distance = 8;     // limit maximum path length to something generous
   while (*buf && map && max_distance)
     {
       int dir = *buf++ - '1';
       if (dir >= 0 && dir <= 3)
         {
           if (!map->tile_path [dir])
             map = 0;
-          else if (map->tile_available (dir))
+          else if (map->tile_available (dir, false))
             {
               maptile *neigh = map->tile_map [dir];
               switch (dir)
                 {
         max_distance = 0;
     }
   if (!max_distance)
     send_packet_printf ("mapinfo %s error", token);
-  else if (!map || !map->path[0])
+  else if (!map || !map->path)
     send_packet_printf ("mapinfo %s nomap", token);
   else
     {
       int flags = 0;
  * syntax is: move (to) (tag) (nrof)
  */
 void
 MoveCmd (char *buf, int len, player *pl)
 {
-  int vals[3], i;
+  int to, tag, nrof;
-  /* A little funky here.  We only cycle for 2 records, because
+  if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
-   * we obviously are not going to find a space after the third
-   * record. Perhaps we should just replace this with a
-   * sscanf?
-   */
-  for (i = 0; i < 2; i++)
     {
-      vals[i] = atoi (buf);
-      if (!(buf = strchr (buf, ' ')))
-        {
-          LOG (llevError, "Incomplete move command: %s\n", buf);
+      LOG (llevError, "Incomplete move command: %s\n", buf);
-          return;
+      return;
-        }
-      buf++;
     }
-  vals[2] = atoi (buf);
+  esrv_move_object (pl->ob, to, tag, nrof);
-/*    LOG(llevDebug,"Move item %d (nrof=%d) to %d.\n", vals[1], vals[2], vals[0]);*/
-  esrv_move_object (pl->ob, vals[0], vals[1], vals[2]);
 }
 /******************************************************************************
  *
  * Start of commands the server sends to the client.
 /**
  * Tells the client that here is a player it should start using.
  */
 void
-esrv_new_player (player *pl, uint32 weight)
+esrv_new_player (player *pl)
 {
+  sint32 weight = pl->ob->client_weight ();
   packet sl ("player");
   sl << uint32 (pl->ob->count)
      << uint32 (weight)
      << uint32 (pl->ob->face)
   /* If player is just joining the game, he isn't here yet, so the map
    * can get swapped out.  If so, don't try to send them a map.  All will
    * be OK once they really log in.
    */
-  if (!plmap || plmap->in_memory != MAP_IN_MEMORY)
+  if (!plmap || plmap->in_memory != MAP_ACTIVE)
     return;
   int x, y, ax, ay, startlen, max_x, max_y, oldlen;
   int estartlen, eoldlen;
   uint8 eentrysize;
           if (!m)
             {
               nx = x; ny = y; m = plmap;
-              if (!xy_normalise (m, nx, ny))
+              if (xy_normalise (m, nx, ny))
+                m->touch ();
+              else
                 m = 0;
             }
           int emask, mask;
           emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
                 }
               continue;
             }
-          m->touch ();
           int d = pl->blocked_los[ax][ay];
           if (d > 3)
             {
                   uint8 flags      = 0;
                   tag_t player     = 0;
                   // send hp information, if applicable
                   if (object *op = ms.faces_obj [0])
+                    if (op->is_head () && !op->invisible)
-                    {
+                      {
-                      if (op->head || op->invisible)
+                        if (op->stats.maxhp > op->stats.hp
-                        ;       // do not show
+                            && op->stats.maxhp > 0
-                      else if (op->type == PLAYER
+                            && (op->type == PLAYER
+                                || op->type == DOOR // does not work, have maxhp 0
-                               || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR))
+                                || QUERY_FLAG (op, FLAG_MONSTER) || QUERY_FLAG (op, FLAG_ALIVE) || QUERY_FLAG (op, FLAG_GENERATOR)))
-                        {
-                          if (op->stats.maxhp > 0 && (unsigned) op->stats.maxhp > (unsigned) op->stats.hp)
-                            {
+                          {
-                              stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
+                            stat_hp = 255 - (op->stats.hp * 255 + 254) / op->stats.maxhp;
-                              stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
+                            stat_width = op->arch->max_x - op->arch->x; //TODO: should be upper-left edge
-                            }
+                          }
-                        }
-                      if (op->msg && op->msg[0] == '@')
+                        if (op->msg && op->msg[0] == '@')
-                        flags |= 1;
+                          flags |= 1;
-                      if (op->type == PLAYER && op != ob)
+                        if (op->type == PLAYER && op != ob)
-                        player = op->count;
+                          player = op->count;
-                    }
+                      }
                   if (lastcell.stat_hp != stat_hp)
                     {
                       lastcell.stat_hp = stat_hp;

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC vs. Revision 1.129 by root, Tue May 6 19:37:01 2008 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.119 by root, Fri Aug 24 00:26:10 2007 UTC vs.
Revision 1.129 by root, Tue May 6 19:37:01 2008 UTC