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

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC vs.
Revision 1.198 by root, Wed Dec 5 19:03:27 2018 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
+ * Copyright (©) 2017,2018 Marc Alexander Lehmann / the Deliantra team
- * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2001 Mark Wedel
  * 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
  * \file
  * Client handling.
  *
  * \date 2003-12-02
  *
  * This file implements all of the goo on the server side for handling
  * clients.  It's got a bunch of global variables for keeping track of
  * each of the clients.
  *
  * Note:  All functions that are used to process data from the client
  * have the prototype of (char *data, int datalen, int client_num).  This
  * way, we can use one dispatch table.
  *
 /**
  * RequestInfo is sort of a meta command. There is some specific
  * request of information, but we call other functions to provide
  * that information.
+ * requestinfo is completely deprecated, use resource exti request
+ * and the fxix or http protocols.
  */
 void
 RequestInfo (char *buf, int len, client *ns)
 {
   char *params;
 //-GPL
 void
 client::mapinfo_queue_clear ()
 {
-  for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
+  for (auto &&i : mapinfo_queue)
-    free (*i);
+    free (i);
   mapinfo_queue.clear ();
 }
 bool
       // due to historical glitches, the mapinfo index and tile index differs
       static unsigned char dirmap [] = { TILE_NORTH, TILE_EAST, TILE_SOUTH, TILE_WEST, TILE_UP, TILE_DOWN };
       // maybe we should only allow the four flat directions
-      if (IN_RANGE_EXC (dir, 0, array_length (dirmap)))
+      if (IN_RANGE_EXC (dir, 0, ecb_array_length (dirmap)))
         {
           dir = dirmap [dir];
           if (!map->tile_path [dir])
             map = 0;
    * Cleaning up the input should probably be done first - all actions
    * for the command that issued the count should be done before any other
    * commands.
    */
   pl->count = 0;
-}
-/**
- * This handles the general commands from the client (ie, north, fire, cast,
- * etc.).  It is a lot like PlayerCmd above, but is called with the
- * 'ncom' method which gives more information back to the client so it
- * can throttle.
- */
-void
-NewPlayerCmd (char *buf, int len, player *pl)
-{
-  if (len <= 6)
-    {
-      LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
-      return;
-    }
-  uint16 cmdid  = net_uint16 ((uint8 *)buf);
-  sint32 repeat = net_sint32 ((uint8 *)buf + 2);
-  /* -1 is special - no repeat, but don't update */
-  if (repeat != -1)
-    pl->count = repeat;
-  buf += 6; //len -= 6;
-  execute_newserver_command (pl->ob, buf);
-  /* Perhaps something better should be done with a left over count.
-   * Cleaning up the input should probably be done first - all actions
-   * for the command that issued the count should be done before any other
-   * commands.
-   */
-  pl->count = 0;
-  //TODO: schmorp thinks whatever this calculates, it makes no sense at all
-  int time = pl->ob->has_active_speed ()
-             ? (int) (MAX_TIME / pl->ob->speed)
-             : MAX_TIME * 100;
-  /* Send confirmation of command execution now */
-  packet sl ("comc");
-  sl << uint16 (cmdid) << uint32 (time);
-  pl->ns->send_packet (sl);
 }
 /** This is a reply to a previous query. */
 void
 ReplyCmd (char *buf, int len, client *ns)
       {
         /* This block deals with spaces that are not visible for whatever
          * reason. Still may need to send the head for this space.
          */
         if (lastcell.count != -1
             || lastcell.faces[0]
             || lastcell.faces[1]
             || lastcell.faces[2]
             || lastcell.stat_hp
             || lastcell.flags
             || lastcell.player)
           sl << uint16 (mask);
         /* properly clear a previously sent big face */
         map_clearcell (&lastcell, -1);
                 {
                   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
                 }
-              if (expect_false (op->has_dialogue ()))
+              if (ecb_expect_false (op->has_dialogue ()))
                 flags |= 1;
-              if (expect_false (op->type == PLAYER))
+              if (ecb_expect_false (op->type == PLAYER))
                 player = op == ob     ? pl->ob->count
                        : op == pl->ob ? ob->count
                        :                op->count;
             }
-        if (expect_false (lastcell.stat_hp != stat_hp))
+        if (ecb_expect_false (lastcell.stat_hp != stat_hp))
           {
             lastcell.stat_hp = stat_hp;
             mask |= 0x8;
             *last_ext |= 0x80;
                 sl << uint8 (6) << uint8 (stat_width);
               }
           }
-        if (expect_false (lastcell.player != player))
+        if (ecb_expect_false (lastcell.player != player))
           {
             lastcell.player = player;
             mask |= 0x8;
             *last_ext |= 0x80;
             last_ext = &sl[sl.length ()];
             sl << uint8 (0x47) << uint8 (4) << (uint32)player;
           }
-        if (expect_false (lastcell.flags != flags))
+        if (ecb_expect_false (lastcell.flags != flags))
           {
             lastcell.flags = flags;
             mask |= 0x8;
             *last_ext |= 0x80;
         /* Middle face */
         if (update_space (sl, socket, ms, lastcell, 1))
           mask |= 0x2;
-        if (expect_false (ob->invisible)
+        if (ecb_expect_false (ob->invisible)
             && ob->invisible & (ob->invisible < 50 ? 1 : 7)
             && ms.player () == ob)
           {
             // force player to be visible to himself if invisible
             if (lastcell.faces[0] != ob->face)
      << uint16 (spell->cached_grace)
      << uint16 (spell->cached_eat)
      << uint8  (skill)
      << uint32 (spell->path_attuned)
      << uint32 (spell->face)
-     << data8  (spell->name)
+     << data8  (spell->name);
+  if (pl->ns->monitor_spells < 2)
-     << data16 (spell->msg);
+     sl << data16 (spell->msg);
 }
 /**
  * This tells the client to add the spell *ob, if *ob is NULL, then add
  * all spells in the player's inventory.
  */
 void
 esrv_add_spells (player *pl, object *spell)
 {
   if (!spell)
     {
       for (spell = pl->ob->inv; spell; spell = spell->below)
         {
           /* were we to simply keep appending data here, we could exceed
            * MAXSOCKBUF if the player has enough spells to add, we know that
            * append_spells will always append 19 data bytes, plus 4 length
            * bytes and 3 strings (because that is the spec) so we need to
            * check that the length of those 3 strings, plus the 23 bytes,
            * won't take us over the length limit for the socket, if it does,
            * we need to send what we already have, and restart packet formation
            */
           if (spell->type != SPELL)
             continue;
           /* Seeing crashes by overflowed buffers.  Quick arithemetic seems

Diff Legend

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

Comparing deliantra/server/socket/request.C (file contents): Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC vs. Revision 1.198 by root, Wed Dec 5 19:03:27 2018 UTC

Diff Legend

Comparing deliantra/server/socket/request.C (file contents):
Revision 1.189 by root, Wed Oct 31 09:17:14 2012 UTC vs.
Revision 1.198 by root, Wed Dec 5 19:03:27 2018 UTC