--- deliantra/server/socket/request.C 2006/12/15 03:53:44 1.39
+++ deliantra/server/socket/request.C 2009/11/07 18:30:06 1.159
@@ -1,25 +1,28 @@
/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2001 Mark Wedel
- Copyright (C) 1992 Frank Tore Johansen
-
- This program 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 2 of the License, or
- (at your 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
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2001,2007 Mark Wedel
+ * Copyright (©) 1992,2007 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.
+ *
+ * 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 Affero GNU General Public License
+ * and the GNU General Public License along with this program. If not, see
+ * .
+ *
+ * The authors can be reached via e-mail to
+ */
- The author can be reached via e-mail to
-*/
+//+GPL
/**
* \file
@@ -37,19 +40,11 @@
*
* esrv_map_new starts updating the map
*
- * esrv_map_setbelow allows filling in all of the faces for the map.
- * if a face has not already been sent to the client, it is sent now.
- *
- * mapcellchanged, compactlayer, compactstack, perform the map compressing
- * operations
- *
*/
#include
#include
-#include
-#include
#include
#include
@@ -73,7 +68,7 @@
* client. If a value is -1, then we don't send that to the
* client.
*/
-short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
+static short atnr_cs_stat[NROFATTACKS] = { CS_STAT_RES_PHYS,
CS_STAT_RES_MAG, CS_STAT_RES_FIRE, CS_STAT_RES_ELEC,
CS_STAT_RES_COLD, CS_STAT_RES_CONF, CS_STAT_RES_ACID,
CS_STAT_RES_DRAIN, -1 /* weaponmagic */ ,
@@ -90,17 +85,12 @@
};
static void
-socket_map_scroll (client_socket * ns, int dx, int dy)
+socket_map_scroll (client *ns, int dx, int dy)
{
struct Map newmap;
int x, y, mx, my;
- {
- packet sl;
-
- sl.printf ("map_scroll %d %d", dx, dy);
- ns->send_packet (sl);
- }
+ ns->send_packet_printf ("map_scroll %d %d", dx, dy);
/* If we are using the Map1aCmd, we may in fact send
* head information that is outside the viewable map.
@@ -112,32 +102,22 @@
mx = ns->mapx;
my = ns->mapy;
- if (ns->mapmode == Map1aCmd)
- {
- mx += MAX_HEAD_OFFSET;
- my += MAX_HEAD_OFFSET;
- }
-
/* the x and y here are coordinates for the new map, i.e. if we moved
- * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
+ * (dx,dy), newmap[x][y] = oldmap[x-dx][y-dy]. For this reason,
* if the destination x or y coordinate is outside the viewable
* area, we clear the values - otherwise, the old values
* are preserved, and the check_head thinks it needs to clear them.
*/
for (x = 0; x < mx; x++)
- {
- for (y = 0; y < my; y++)
- {
- if (x >= ns->mapx || y >= ns->mapy)
- /* clear cells outside the viewable area */
- memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
- else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
- /* clear newly visible tiles within the viewable area */
- memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
- else
- memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
- }
- }
+ for (y = 0; y < my; y++)
+ if (x >= ns->mapx || y >= ns->mapy)
+ /* clear cells outside the viewable area */
+ memset (&newmap.cells[x][y], 0, sizeof (struct MapCell));
+ else if ((x + dx) < 0 || (x + dx) >= ns->mapx || (y + dy) < 0 || (y + dy) >= ns->mapy)
+ /* clear newly visible tiles within the viewable area */
+ memset (&(newmap.cells[x][y]), 0, sizeof (struct MapCell));
+ else
+ memcpy (&(newmap.cells[x][y]), &(ns->lastmap.cells[x + dx][y + dy]), sizeof (struct MapCell));
memcpy (&(ns->lastmap), &newmap, sizeof (struct Map));
@@ -150,455 +130,325 @@
static void
clear_map (player *pl)
{
- client_socket &socket = *pl->socket;
+ pl->ns->mapinfo_queue_clear ();
+
+ memset (&pl->ns->lastmap, 0, sizeof (pl->ns->lastmap));
- memset (&socket.lastmap, 0, sizeof (socket.lastmap));
+ pl->ns->force_newmap = false;
- if (socket.newmapcmd == 1)
- socket.send_packet ("newmap");
+ if (pl->ns->newmapcmd == 1)
+ pl->ns->send_packet ("newmap");
- socket.update_look = 1;
- socket.look_position = 0;
+ pl->ns->floorbox_reset ();
}
-/** check for map change and send new map data */
static void
-check_map_change (player *pl)
+send_map_info (player *pl)
{
- client_socket &socket = *pl->socket;
- object *ob = pl->ob;
- char buf[MAX_BUF]; /* eauugggh */
+ client &socket = *pl->ns;
+ object *ob = pl->viewpoint;
- if (socket.current_map != ob->map)
+ if (socket.mapinfocmd)
{
- socket.current_map = ob->map;
+ if (ob->map && ob->map->path[0])
+ {
+ int flags = 0;
- clear_map (pl);
+ if (ob->map->tile_path[0]) flags |= 1;
+ if (ob->map->tile_path[1]) flags |= 2;
+ if (ob->map->tile_path[2]) flags |= 4;
+ if (ob->map->tile_path[3]) flags |= 8;
+
+ socket.send_packet_printf ("mapinfo - spatial %d %d %d %d %d %s",
+ flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y,
+ ob->map->width, ob->map->height, &ob->map->path);
+ }
+ else
+ socket.send_packet ("mapinfo current");
+ }
+}
- if (socket.mapinfocmd)
- {
- if (ob->map && ob->map->path[0])
- {
- int flags = 0;
+/** check for map/region change and send new map data */
+static void
+check_map_change (player *pl)
+{
+ client &socket = *pl->ns;
+ object *ob = pl->viewpoint;
- if (ob->map->tile_path[0])
- flags |= 1;
- if (ob->map->tile_path[1])
- flags |= 2;
- if (ob->map->tile_path[2])
- flags |= 4;
- if (ob->map->tile_path[3])
- flags |= 8;
+ region *reg = ob->region ();
+ if (socket.current_region != reg)
+ {
+ INVOKE_PLAYER (REGION_CHANGE, pl, ARG_REGION (reg), ARG_REGION (socket.current_region));
+ socket.current_region = reg;
+ }
- snprintf (buf, MAX_BUF, "mapinfo - spatial %d %d %d %d %d %s",
- flags, socket.mapx / 2 - ob->x, socket.mapy / 2 - ob->y, ob->map->width, ob->map->height, ob->map->path);
- }
- else
- snprintf (buf, MAX_BUF, "mapinfo current");
+ // first try to aovid a full newmap on tiled map scrolls
+ if (socket.current_map != ob->map && !socket.force_newmap)
+ {
+ rv_vector rv;
+
+ get_rangevector_from_mapcoord (socket.current_map, socket.current_x, socket.current_y, ob, &rv, 0);
- socket.send_packet (buf);
+ // manhattan distance is very handy here
+ if (rv.distance < 8) // 8 works nicely for speed << 70 and buggy gcfclient
+ {
+ socket.current_map = ob->map;
+ socket.current_x = ob->x;
+ socket.current_y = ob->y;
+
+ socket_map_scroll (&socket, rv.distance_x, rv.distance_y);
+ socket.floorbox_reset ();
+ send_map_info (pl);
}
}
+
+ if (socket.current_map != ob->map || socket.force_newmap)
+ {
+ clear_map (pl);
+ socket.current_map = ob->map;
+ send_map_info (pl);
+ }
else if (socket.current_x != ob->x || socket.current_y != ob->y)
{
int dx = ob->x - socket.current_x;
int dy = ob->y - socket.current_y;
- if (socket.buggy_mapscroll && (abs (dx) > 8 || abs (dy) > 8))
- clear_map (pl); // current (<= 1.9.1) clients have unchecked buffer overflows
- else
- {
- socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
- socket.update_look = 1;
- socket.look_position = 0;
- }
+ socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
+ socket.floorbox_reset ();
}
socket.current_x = ob->x;
socket.current_y = ob->y;
}
-void
-ExtCmd (char *buf, int len, player *pl)
-{
- INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
-}
-
-void
-MapInfoCmd (char *buf, int len, player *pl)
+/**
+ * This sends the skill number to name mapping. We ignore
+ * the params - we always send the same info no matter what.
+ */
+static void
+send_skill_info (client *ns, char *params)
{
- // mapinfo tag spatial flags x y w h hash
-
- char bigbuf[MAX_BUF], *token;
-
- token = buf;
- // copy token
- if (!(buf = strchr (buf, ' ')))
- return;
+ packet sl;
+ sl << "replyinfo skill_info\n";
- *buf++ = 0;
+ for (int i = 1; i < NUM_SKILLS; i++)
+ sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names [i]);
- if (!strncmp (buf, "spatial ", 8))
+ if (sl.length () > MAXSOCKBUF)
{
- buf += 8;
-
- // initial map and its origin
- maptile *map = pl->ob->map;
- sint16 dx, dy;
- int mapx = pl->socket->mapx / 2 - pl->ob->x;
- int mapy = pl->socket->mapy / 2 - pl->ob->y;
- int max_distance = 8; // limit maximum path length to something generous
-
- while (*buf && map && max_distance)
- {
- int dir = *buf++;
+ LOG (llevError, "Buffer overflow in send_skill_info!\n");
+ fatal (0);
+ }
- switch (dir)
- {
- case '1':
- dx = 0;
- dy = -1;
- map = get_map_from_coord (map, &dx, &dy);
- map && (mapy -= map->height);
- break;
- case '2':
- mapx += map->width;
- dx = map->width;
- dy = 0;
- map = get_map_from_coord (map, &dx, &dy);
- break;
- case '3':
- mapy += map->height;
- dx = 0;
- dy = map->height;
- map = get_map_from_coord (map, &dx, &dy);
- break;
- case '4':
- dx = -1;
- dy = 0;
- map = get_map_from_coord (map, &dx, &dy);
- map && (mapx -= map->width);
- break;
- }
+ ns->send_packet (sl);
+}
- --max_distance;
- }
+/**
+ * This sends the spell path to name mapping. We ignore
+ * the params - we always send the same info no matter what.
+ */
+static void
+send_spell_paths (client * ns, char *params)
+{
+ packet sl;
- if (!max_distance)
- snprintf (bigbuf, MAX_BUF, "mapinfo %s error", token);
- else if (map && map->path[0])
- {
- int flags = 0;
+ sl << "replyinfo spell_paths\n";
- if (map->tile_path[0])
- flags |= 1;
- if (map->tile_path[1])
- flags |= 2;
- if (map->tile_path[2])
- flags |= 4;
- if (map->tile_path[3])
- flags |= 8;
+ for (int i = 0; i < NRSPELLPATHS; i++)
+ sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
- snprintf (bigbuf, MAX_BUF, "mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, map->path);
- }
- else
- snprintf (bigbuf, MAX_BUF, "mapinfo %s nomap", token);
+ if (sl.length () > MAXSOCKBUF)
+ {
+ LOG (llevError, "Buffer overflow in send_spell_paths!\n");
+ fatal (0);
}
- else
- snprintf (bigbuf, MAX_BUF, "mapinfo %s unsupported", token);
- pl->socket->send_packet (bigbuf);
+ ns->send_packet (sl);
}
-/** This is the Setup cmd - easy first implementation */
+/**
+ * RequestInfo is sort of a meta command. There is some specific
+ * request of information, but we call other functions to provide
+ * that information.
+ */
void
-SetUp (char *buf, int len, client_socket * ns)
+RequestInfo (char *buf, int len, client *ns)
{
- int s, slen;
- char *cmd, *param, cmdback[HUGE_BUF];
+ char *params;
- /* run through the cmds of setup
- * syntax is setup ...
- *
- * we send the status of the cmd back, or a FALSE is the cmd is the server unknown
- * The client then must sort this out
+ /* find the first space, make it null, and update the
+ * params pointer.
*/
+ for (params = buf; *params; params++)
+ if (*params == ' ')
+ {
+ *params++ = 0;
+ break;
+ }
- //LOG (llevInfo, "Get SetupCmd:: %s\n", buf);
-
- strcpy (cmdback, "setup");
- for (s = 0; s < len; )
+ if (!strcmp (buf, "skill_info"))
+ send_skill_info (ns, params);
+ else if (!strcmp (buf, "spell_paths"))
+ send_spell_paths (ns, params);
+ else
{
- cmd = &buf[s];
+ // undo tokenisation above and send replyinfo with the request unchanged
+ if (*params)
+ *--params = ' ';
- /* find the next space, and put a null there */
- for (; buf[s] && buf[s] != ' '; s++)
- ;
+ ns->send_packet_printf ("replyinfo %s", buf);
+ }
+}
- buf[s++] = 0;
+void
+ExtCmd (char *buf, int len, player *pl)
+{
+ INVOKE_PLAYER (EXTCMD, pl, ARG_DATA (buf, len));
+}
- while (buf[s] == ' ')
- s++;
+void
+ExtiCmd (char *buf, int len, client *ns)
+{
+ INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
+}
- if (s >= len)
- break;
+//-GPL
- param = &buf[s];
+void
+client::mapinfo_queue_clear ()
+{
+ for (auto (i, mapinfo_queue.begin ()); i != mapinfo_queue.end (); ++i)
+ free (*i);
- for (; buf[s] && buf[s] != ' '; s++)
- ;
+ mapinfo_queue.clear ();
+}
- buf[s++] = 0;
+bool
+client::mapinfo_try (char *buf)
+{
+ char *token = buf;
+ buf += strlen (buf) + 9;
- while (buf[s] == ' ')
- s++;
+ // initial map and its origin
+ maptile *map = pl->viewpoint->map;
+ int mapx = pl->ns->mapx / 2 - pl->viewpoint->x;
+ int mapy = pl->ns->mapy / 2 - pl->viewpoint->y;
+ int max_distance = 8; // limit maximum path length to something generous
- slen = strlen (cmdback);
- safe_strcat (cmdback, " ", &slen, HUGE_BUF);
- safe_strcat (cmdback, cmd, &slen, HUGE_BUF);
- safe_strcat (cmdback, " ", &slen, HUGE_BUF);
+ while (*buf && map && max_distance)
+ {
+ int dir = *buf++ - '1';
- if (!strcmp (cmd, "sound"))
- {
- ns->sound = atoi (param);
- safe_strcat (cmdback, param, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "exp64"))
- {
- ns->exp64 = atoi (param);
- safe_strcat (cmdback, param, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "spellmon"))
- {
- ns->monitor_spells = atoi (param);
- safe_strcat (cmdback, param, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "darkness"))
- {
- ns->darkness = atoi (param);
- safe_strcat (cmdback, param, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "map1cmd"))
- {
- if (atoi (param))
- ns->mapmode = Map1Cmd;
- /* if beyond this size, need to use map1cmd no matter what */
- if (ns->mapx > 11 || ns->mapy > 11)
- ns->mapmode = Map1Cmd;
- safe_strcat (cmdback, ns->mapmode == Map1Cmd ? "1" : "0", &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "map1acmd"))
- {
- if (atoi (param))
- ns->mapmode = Map1aCmd;
- /* if beyond this size, need to use map1acmd no matter what */
- if (ns->mapx > 11 || ns->mapy > 11)
- ns->mapmode = Map1aCmd;
- safe_strcat (cmdback, ns->mapmode == Map1aCmd ? "1" : "0", &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "newmapcmd"))
- {
- ns->newmapcmd = atoi (param);
- safe_strcat (cmdback, param, &slen, HUGE_BUF);
-// } else if (!strcmp(cmd,"plugincmd")) {
-// ns->plugincmd = atoi(param);
-// safe_strcat(cmdback, param, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "mapinfocmd"))
+ if (dir >= 0 && dir <= 3)
{
- ns->mapinfocmd = atoi (param);
- safe_strcat (cmdback, "1", &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "extcmd"))
- {
- ns->extcmd = atoi (param);
- safe_strcat (cmdback, "1", &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "extmap"))
- {
- ns->extmap = atoi (param);
- safe_strcat (cmdback, "1", &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "facecache"))
- {
- ns->facecache = atoi (param);
- safe_strcat (cmdback, param, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "faceset"))
- {
- char tmpbuf[20];
- int q = atoi (param);
+ if (!map->tile_path [dir])
+ map = 0;
+ else if (map->tile_available (dir, false))
+ {
+ maptile *neigh = map->tile_map [dir];
- if (is_valid_faceset (q))
- ns->faceset = q;
- sprintf (tmpbuf, "%d", ns->faceset);
- safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
- /* if the client is using faceset, it knows about image2 command */
- ns->image2 = 1;
- }
- else if (!strcmp (cmd, "itemcmd"))
- {
- /* Version of the item protocol command to use. Currently,
- * only supported versions are 1 and 2. Using a numeric
- * value will make it very easy to extend this in the future.
- */
- char tmpbuf[20];
- int q = atoi (param);
+ switch (dir)
+ {
+ case 0: mapy -= neigh->height; break;
+ case 2: mapy += map ->height; break;
+ case 3: mapx -= neigh->width ; break;
+ case 1: mapx += map ->width ; break;
+ }
- if (q < 1 || q > 2)
- {
- strcpy (tmpbuf, "FALSE");
+ map = neigh;
+ --max_distance;
}
else
- {
- ns->itemcmd = q;
- sprintf (tmpbuf, "%d", ns->itemcmd);
- }
- safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
+ return 0;
}
- else if (!strcmp (cmd, "mapsize"))
- {
- int x, y = 0;
- char tmpbuf[MAX_BUF], *cp;
+ else
+ max_distance = 0;
+ }
- x = atoi (param);
- for (cp = param; *cp != 0; cp++)
- if (*cp == 'x' || *cp == 'X')
- {
- y = atoi (cp + 1);
- break;
- }
- if (x < 9 || y < 9 || x > MAP_CLIENT_X || y > MAP_CLIENT_Y)
- {
- sprintf (tmpbuf, " %dx%d", MAP_CLIENT_X, MAP_CLIENT_Y);
- safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
- }
- else
- {
- ns->mapx = x;
- ns->mapy = y;
- /* better to send back what we are really using and not the
- * param as given to us in case it gets parsed differently.
- */
- sprintf (tmpbuf, "%dx%d", x, y);
- safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
- /* If beyond this size and still using orig map command, need to
- * go to map1cmd.
- */
- if ((x > 11 || y > 11) && ns->mapmode == Map0Cmd)
- ns->mapmode = Map1Cmd;
- }
- }
- else if (!strcmp (cmd, "extendedMapInfos"))
- {
- /* Added by tchize
- * prepare to use the mapextended command
- */
- char tmpbuf[20];
+ if (!max_distance)
+ send_packet_printf ("mapinfo %s error", token);
+ else if (!map || !map->path)
+ send_packet_printf ("mapinfo %s nomap", token);
+ else
+ {
+ int flags = 0;
- ns->ext_mapinfos = (atoi (param));
- sprintf (tmpbuf, "%d", ns->ext_mapinfos);
- safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
- }
- else if (!strcmp (cmd, "extendedTextInfos"))
- {
- /* Added by tchize
- * prepare to use the extended text commands
- * Client toggle this to non zero to get exttext
- */
- char tmpbuf[20];
+ if (map->tile_path[0]) flags |= 1;
+ if (map->tile_path[1]) flags |= 2;
+ if (map->tile_path[2]) flags |= 4;
+ if (map->tile_path[3]) flags |= 8;
- ns->has_readable_type = (atoi (param));
- sprintf (tmpbuf, "%d", ns->has_readable_type);
- safe_strcat (cmdback, tmpbuf, &slen, HUGE_BUF);
- }
- else
- {
- /* Didn't get a setup command we understood -
- * report a failure to the client.
- */
- safe_strcat (cmdback, "FALSE", &slen, HUGE_BUF);
- }
- } /* for processing all the setup commands */
+ send_packet_printf ("mapinfo %s spatial %d %d %d %d %d %s", token, flags, mapx, mapy, map->width, map->height, &map->path);
+ }
- LOG (llevInfo, "SendBack SetupCmd:: %s\n", cmdback);
- ns->send_packet (cmdback);
+ return 1;
}
-/**
- * The client has requested to be added to the game.
- * This is what takes care of it. We tell the client how things worked out.
- * I am not sure if this file is the best place for this function. however,
- * it either has to be here or init_sockets needs to be exported.
- */
void
-AddMeCmd (char *buf, int len, client_socket * ns)
+client::mapinfo_queue_run ()
{
- Settings oldsettings;
-
- oldsettings = settings;
- if (ns->status != Ns_Add || add_player (ns))
- ns->send_packet ("addme_failed");
- else
- ns->send_packet ("addme_success");
+ if (mapinfo_queue.empty () || !pl)
+ return;
- settings = oldsettings;
+ for (int i = 0; i < mapinfo_queue.size (); ++i)
+ if (mapinfo_try (mapinfo_queue [i]))
+ {
+ free (mapinfo_queue [i]);
+ mapinfo_queue.erase (i);
+ }
+ else
+ ++i;
}
-/** Reply to ExtendedInfos command */
void
-ToggleExtendedInfos (char *buf, int len, client_socket * ns)
+MapInfoCmd (char *buf, int len, player *pl)
{
- char cmdback[MAX_BUF];
- char command[50];
- int info, nextinfo;
-
- cmdback[0] = '\0';
- nextinfo = 0;
-
- while (1)
- {
- /* 1. Extract an info */
- info = nextinfo;
-
- while ((info < len) && (buf[info] == ' '))
- info++;
-
- if (info >= len)
- break;
-
- nextinfo = info + 1;
+ // mapinfo tag spatial flags x y w h hash
- while ((nextinfo < len) && (buf[nextinfo] != ' '))
- nextinfo++;
+ char *token = buf;
- if (nextinfo - info >= 49) /*Erroneous info asked */
- continue;
+ if (!(buf = strchr (buf, ' ')))
+ return;
- strncpy (command, &(buf[info]), nextinfo - info);
+ if (!strncmp (buf, " spatial ", 9))
+ {
+ char *copy = strdup (token);
+ copy [buf - token] = 0;
- /* 2. Interpret info */
- if (!strcmp ("smooth", command))
- /* Toggle smoothing */
- ns->EMI_smooth = !ns->EMI_smooth;
+#if 0
+ // this makes only sense when we flush the buffer immediately
+ if (pl->ns->mapinfo_try (copy))
+ free (copy);
else
- /*bad value */;
-
- /*3. Next info */
+#endif
+ pl->ns->mapinfo_queue.push_back (copy);
}
+ else
+ pl->ns->send_packet_printf ("mapinfo %s unsupported", token);
+}
- strcpy (cmdback, "ExtendedInfoSet");
-
- if (ns->EMI_smooth)
- {
- strcat (cmdback, " ");
- strcat (cmdback, "smoothing");
- }
+/** This is the Setup cmd */
+void
+SetUp (char *buf, int len, client * ns)
+{
+ INVOKE_CLIENT (SETUP, ns, ARG_DATA (buf, len));
+}
- ns->send_packet (cmdback);
+/**
+ * The client has requested to be added to the game.
+ * This is what takes care of it. We tell the client how things worked out.
+ * I am not sure if this file is the best place for this function. however,
+ * it either has to be here or init_sockets needs to be exported.
+ */
+void
+AddMeCmd (char *buf, int len, client *ns)
+{
+ INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
}
+//+GPL
+
/*
#define MSG_TYPE_BOOK 1
#define MSG_TYPE_CARD 2
@@ -609,7 +459,7 @@
/** Reply to ExtendedInfos command */
void
-ToggleExtendedText (char *buf, int len, client_socket * ns)
+ToggleExtendedText (char *buf, int len, client * ns)
{
char cmdback[MAX_BUF];
char temp[10];
@@ -624,7 +474,7 @@
/* 1. Extract an info */
info = nextinfo;
- while ((info < len) && (buf[info] == ' '))
+ while ((info < len) && (buf [info] == ' '))
info++;
if (info >= len)
@@ -632,14 +482,15 @@
nextinfo = info + 1;
- while ((nextinfo < len) && (buf[nextinfo] != ' '))
+ while ((nextinfo < len) && (buf [nextinfo] != ' '))
nextinfo++;
if (nextinfo - info >= 49) /*Erroneous info asked */
continue;
- strncpy (command, &(buf[info]), nextinfo - info);
- command[nextinfo - info] = '\0';
+ memcpy (command, buf + info, nextinfo - info);
+ command [nextinfo - info] = 0;
+
/* 2. Interpret info */
i = sscanf (command, "%d", &flag);
@@ -663,107 +514,36 @@
}
/**
- * A lot like the old AskSmooth (in fact, now called by AskSmooth).
- * Basically, it makes no sense to wait for the client to request a
- * a piece of data from us that we know the client wants. So
- * if we know the client wants it, might as well push it to the
- * client.
- */
-static void
-SendSmooth (client_socket * ns, uint16 face)
-{
- uint16 smoothface;
-
- /* If we can't find a face, return and set it so we won't try to send this
- * again.
- */
- if ((!FindSmooth (face, &smoothface)) && (!FindSmooth (smooth_face->number, &smoothface)))
- {
-
- LOG (llevError, "could not findsmooth for %d. Neither default (%s)\n", face, &smooth_face->name);
- ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
- return;
- }
-
- if (!(ns->faces_sent[smoothface] & NS_FACESENT_FACE))
- esrv_send_face (ns, smoothface, 0);
-
- ns->faces_sent[face] |= NS_FACESENT_SMOOTH;
-
- packet sl;
-
- sl << "smooth "
- << uint16 (face)
- << uint16 (smoothface);
-
- ns->send_packet (sl);
-}
-
- /**
- * Tells client the picture it has to use
- * to smooth a picture number given as argument.
- */
-void
-AskSmooth (char *buf, int len, client_socket * ns)
-{
- uint16 facenbr;
-
- facenbr = atoi (buf);
- SendSmooth (ns, facenbr);
-}
-
-/**
* This handles the general commands from the client (ie, north, fire, cast,
* etc.)
*/
void
PlayerCmd (char *buf, int len, player *pl)
{
-
- /* The following should never happen with a proper or honest client.
- * Therefore, the error message doesn't have to be too clear - if
- * someone is playing with a hacked/non working client, this gives them
- * an idea of the problem, but they deserve what they get
- */
- if (pl->state != ST_PLAYING)
- {
- new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "You can not issue commands - state is not ST_PLAYING (%s)", buf);
- return;
- }
/* Check if there is a count. In theory, a zero count could also be
* sent, so check for that also.
*/
if (atoi (buf) || buf[0] == '0')
{
pl->count = atoi ((char *) buf);
+
buf = strchr (buf, ' '); /* advance beyond the numbers */
if (!buf)
- {
-#ifdef ESRV_DEBUG
- LOG (llevDebug, "PlayerCmd: Got count but no command.\n");
-#endif
- return;
- }
+ return;
+
buf++;
}
- /* This should not happen anymore. */
- if (pl->ob->speed_left < -1.0)
- {
- LOG (llevError, "Player has negative time - shouldn't do command.\n");
- }
- /* In c_new.c */
- execute_newserver_command (pl->ob, (char *) buf);
+
+ execute_newserver_command (pl->ob, (char *)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;
-
}
-
/**
* 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
@@ -773,35 +553,23 @@
void
NewPlayerCmd (char *buf, int len, player *pl)
{
- int time, repeat;
- char command[MAX_BUF];
- int pktlen;
-
- if (len < 7)
+ if (len <= 6)
{
- LOG (llevDebug, "Corrupt ncom command <%s> not long enough - discarding\n", buf);
+ LOG (llevDebug, "%s: corrupt ncom command <%s>: not long enough (%d) - discarding\n", pl->ns->host, buf, len);
return;
}
- pktlen = net_uint16 ((uint8 *)buf);
- repeat = net_uint32 ((uint8 *)buf + 2);
+ 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;
- if ((len - 4) >= MAX_BUF)
- len = MAX_BUF - 5;
-
- strncpy ((char *) command, (char *) buf + 6, len - 4);
- command[len - 4] = 0;
+ buf += 6; //len -= 6;
- /* This should not happen anymore. */
- if (pl->ob->speed_left < -1.0)
- LOG (llevError, "Player has negative time - shouldn't do command.\n");
+ execute_newserver_command (pl->ob, buf);
- /* In c_new.c */
- execute_newserver_command (pl->ob, (char *) command);
/* 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
@@ -809,25 +577,35 @@
*/
pl->count = 0;
- if (FABS (pl->ob->speed) < 0.001)
- time = MAX_TIME * 100;
- else
- time = (int) (MAX_TIME / FABS (pl->ob->speed));
+ //TODO: schmorp thinks whatever this calculates, it makes no sense at all
+ int time = pl->ob->has_active_speed ()
+ ? (int) (MAX_TIME / fabs (pl->ob->speed))
+ : MAX_TIME * 100;
/* Send confirmation of command execution now */
-
- packet sl;
- sl << "comc " << uint16 (pktlen) << uint32 (time);
- pl->socket->send_packet (sl);
+ 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, player *pl)
+ReplyCmd (char *buf, int len, client *ns)
{
+ if (ns->state == ST_CUSTOM)
+ {
+ INVOKE_CLIENT (REPLY, ns, ARG_DATA (buf, len));
+ return;
+ }
+
+ if (!ns->pl)
+ return; //TODO: depends on the exact reply we are after
+ //TODO: but right now, we always have a ns->pl
+
+ player *pl = ns->pl;
+
/* This is to synthesize how the data would be stored if it
- * was normally entered. A bit of a hack, and should be cleaned up
+ * was normally entered. A bit of a hack, and should be cleaned up
* once all the X11 code is removed from the server.
*
* We pass 13 to many of the functions because this way they
@@ -838,52 +616,18 @@
/* this avoids any hacking here */
- switch (pl->state)
+ switch (ns->state)
{
- case ST_PLAYING:
- LOG (llevError, "Got reply message with ST_PLAYING input state\n");
- break;
-
- case ST_PLAY_AGAIN:
- /* We can check this for return value (2==quit). Maybe we
- * should, and do something appropriate?
- */
- receive_play_again (pl->ob, buf[0]);
- break;
+ case ST_PLAYING:
+ LOG (llevError, "Got reply message with ST_PLAYING input state\n");
+ break;
- case ST_ROLL_STAT:
- key_roll_stat (pl->ob, buf[0]);
- break;
-
- case ST_CHANGE_CLASS:
-
- key_change_class (pl->ob, buf[0]);
- break;
-
- case ST_CONFIRM_QUIT:
- key_confirm_quit (pl->ob, buf[0]);
- break;
-
- case ST_CONFIGURE:
- LOG (llevError, "In client input handling, but into configure state\n");
- pl->state = ST_PLAYING;
- break;
-
- case ST_GET_NAME:
- receive_player_name (pl->ob, 13);
- break;
-
- case ST_GET_PASSWORD:
- case ST_CONFIRM_PASSWORD:
- receive_player_password (pl->ob, 13);
- break;
-
- case ST_GET_PARTY_PASSWORD: /* Get password for party */
- receive_party_password (pl->ob, 13);
- break;
+ case ST_GET_PARTY_PASSWORD: /* Get password for party */
+ receive_party_password (pl->ob, 13);
+ break;
- default:
- LOG (llevError, "Unknown input state: %d\n", pl->state);
+ default:
+ LOG (llevError, "Unknown input state: %d\n", ns->state);
}
}
@@ -895,11 +639,8 @@
* problem.
*/
void
-VersionCmd (char *buf, int len, client_socket * ns)
+VersionCmd (char *buf, int len, client * ns)
{
- char *cp;
- char version_warning[256];
-
if (!buf)
{
LOG (llevError, "CS: received corrupted version command\n");
@@ -908,74 +649,51 @@
ns->cs_version = atoi (buf);
ns->sc_version = ns->cs_version;
- if (VERSION_CS != ns->cs_version)
- {
-#ifdef ESRV_DEBUG
- LOG (llevDebug, "CS: csversion mismatch (%d,%d)\n", VERSION_CS, ns->cs_version);
-#endif
- }
- cp = strchr (buf + 1, ' ');
+
+ LOG (llevDebug, "connection from client <%s>\n", buf);
+
+ //TODO: should log here just for statistics
+
+ //if (VERSION_CS != ns->cs_version)
+ // unchecked;
+
+ char *cp = strchr (buf + 1, ' ');
if (!cp)
return;
+
ns->sc_version = atoi (cp);
- if (VERSION_SC != ns->sc_version)
- {
-#ifdef ESRV_DEBUG
- LOG (llevDebug, "CS: scversion mismatch (%d,%d)\n", VERSION_SC, ns->sc_version);
-#endif
- }
+
+ //if (VERSION_SC != ns->sc_version)
+ // unchecked;
+
cp = strchr (cp + 1, ' ');
+
if (cp)
{
- LOG (llevDebug, "CS: connection from client of type <%s>, ip %s\n", cp, ns->host);
-
- snprintf (ns->client, sizeof (ns->client), "%s", cp + 1);
+ ns->version = cp + 1;
- /* This is first implementation - i skip all beta DX clients with it
- * Add later stuff here for other clients
- */
-
- /* these are old dxclients */
- /* Version 1024 added support for singular + plural name values -
- * requiing this minimal value reduces complexity of that code, and it
- * has been around for a long time.
- */
if (ns->sc_version < 1026)
- {
- sprintf (version_warning, "drawinfo %d %s", NDI_RED,
+ ns->send_packet_printf ("drawinfo %d %s", NDI_RED,
"**** VERSION WARNING ****\n**** CLIENT IS TOO OLD!! UPDATE THE CLIENT!! ****");
- ns->send_packet (version_warning);
- }
-
}
}
/** sound related functions. */
-
void
-SetSound (char *buf, int len, client_socket * ns)
+SetSound (char *buf, int len, client * ns)
{
ns->sound = atoi (buf);
}
/** client wants the map resent */
-
void
MapRedrawCmd (char *buf, int len, player *pl)
{
-
/* This function is currently disabled; just clearing the map state results in
* display errors. It should clear the cache and send a newmap command.
* Unfortunately this solution does not work because some client versions send
* a mapredraw command after receiving a newmap command.
*/
-#if 0
- /* Okay, this is MAJOR UGLY. but the only way I know how to
- * clear the "cache"
- */
- memset (&pl->socket->lastmap, 0, sizeof (struct Map));
- draw_client_map (pl->ob);
-#endif
}
/**
@@ -985,31 +703,17 @@
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
- * we obviously am 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++)
+ if (3 != sscanf (buf, "%d %d %d", &to, &tag, &nrof))
{
- vals[i] = atoi (buf);
- if (!(buf = strchr (buf, ' ')))
- {
- LOG (llevError, "Incomplete move command: %s\n", buf);
- return;
- }
- buf++;
+ LOG (llevError, "Incomplete move command: %s\n", buf);
+ return;
}
- vals[2] = atoi (buf);
-/* 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]);
+ esrv_move_object (pl->ob, to, tag, nrof);
}
-
-
/******************************************************************************
*
* Start of commands the server sends to the client.
@@ -1021,12 +725,37 @@
* it needs to send something back (vs just printing out a message)
*/
void
-send_query (client_socket * ns, uint8 flags, char *text)
+send_query (client *ns, uint8 flags, const char *text)
{
- char buf[MAX_BUF];
+ ns->send_packet_printf ("query %d %s", flags, text ? text : "");
+}
+
+/**
+ * Get player's current range attack in obuf.
+ */
+static void
+rangetostring (player *pl, char *obuf)
+{
+ dynbuf_text &buf = msg_dynbuf; buf.clear ();
+
+ if (pl->ranged_ob)
+ buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
+
+ if (pl->combat_ob)
+ buf << " Combat" << (pl->ob->current_weapon == pl->combat_ob ? "*" : "") << ": " << pl->combat_ob->name;
+
+#if 0
+ //TODO: remove this when slot system is working, this is only for debugging
+ if (pl->ob->chosen_skill)
+ buf << " Skill*: " << pl->ob->chosen_skill->name;
+#endif
+
+ //TODO: maybe golem should become the current_weapon, quite simply?
+ if (pl->golem)
+ buf << " Golem*: " << pl->golem->name;
- sprintf (buf, "query %d %s", flags, text ? text : "");
- ns->send_packet (buf);
+ buf << '\0';
+ buf.linearise (obuf);
}
#define AddIfInt64(Old,New,Type) if (Old != New) {\
@@ -1044,9 +773,9 @@
sl << uint8 (Type) << uint16 (New); \
}
-#define AddIfFloat(Old,New,Type) if (Old != New) {\
+#define AddIfFloat(Old,New,Type,mult) if (Old != New) {\
Old = New; \
- sl << uint8 (Type) << uint32 (New*FLOAT_MULTI); \
+ sl << uint8 (Type) << uint32 (New*FLOAT_MULTI*mult); \
}
#define AddIfString(Old,New,Type) if (Old == NULL || strcmp(Old,New)) {\
@@ -1066,371 +795,138 @@
char buf[MAX_BUF];
uint16 flags;
- packet sl;
- sl << "stats ";
+ client *ns = pl->ns;
+ if (!ns)
+ return;
- if (pl->ob != NULL)
- {
- AddIfShort (pl->last_stats.hp, pl->ob->stats.hp, CS_STAT_HP);
- AddIfShort (pl->last_stats.maxhp, pl->ob->stats.maxhp, CS_STAT_MAXHP);
- AddIfShort (pl->last_stats.sp, pl->ob->stats.sp, CS_STAT_SP);
- AddIfShort (pl->last_stats.maxsp, pl->ob->stats.maxsp, CS_STAT_MAXSP);
- AddIfShort (pl->last_stats.grace, pl->ob->stats.grace, CS_STAT_GRACE);
- AddIfShort (pl->last_stats.maxgrace, pl->ob->stats.maxgrace, CS_STAT_MAXGRACE);
- AddIfShort (pl->last_stats.Str, pl->ob->stats.Str, CS_STAT_STR);
- AddIfShort (pl->last_stats.Int, pl->ob->stats.Int, CS_STAT_INT);
- AddIfShort (pl->last_stats.Pow, pl->ob->stats.Pow, CS_STAT_POW);
- AddIfShort (pl->last_stats.Wis, pl->ob->stats.Wis, CS_STAT_WIS);
- AddIfShort (pl->last_stats.Dex, pl->ob->stats.Dex, CS_STAT_DEX);
- AddIfShort (pl->last_stats.Con, pl->ob->stats.Con, CS_STAT_CON);
- AddIfShort (pl->last_stats.Cha, pl->ob->stats.Cha, CS_STAT_CHA);
- }
+ object *ob = pl->observe;
+ if (!ob)
+ return;
- if (pl->socket->exp64)
- {
- uint8 s;
+ player *opl = ob->contr ? static_cast(ob->contr) : pl;
+
+ packet sl ("stats");
- for (s = 0; s < NUM_SKILLS; s++)
+ AddIfShort (ns->last_stats.hp, ob->stats.hp, CS_STAT_HP);
+ AddIfShort (ns->last_stats.maxhp, ob->stats.maxhp, CS_STAT_MAXHP);
+ AddIfShort (ns->last_stats.sp, ob->stats.sp, CS_STAT_SP);
+ AddIfShort (ns->last_stats.maxsp, ob->stats.maxsp, CS_STAT_MAXSP);
+ AddIfShort (ns->last_stats.grace, ob->stats.grace, CS_STAT_GRACE);
+ AddIfShort (ns->last_stats.maxgrace, ob->stats.maxgrace, CS_STAT_MAXGRACE);
+ AddIfShort (ns->last_stats.Str, ob->stats.Str, CS_STAT_STR);
+ AddIfShort (ns->last_stats.Dex, ob->stats.Dex, CS_STAT_DEX);
+ AddIfShort (ns->last_stats.Con, ob->stats.Con, CS_STAT_CON);
+ AddIfShort (ns->last_stats.Int, ob->stats.Int, CS_STAT_INT);
+ AddIfShort (ns->last_stats.Wis, ob->stats.Wis, CS_STAT_WIS);
+ AddIfShort (ns->last_stats.Pow, ob->stats.Pow, CS_STAT_POW);
+ AddIfShort (ns->last_stats.Cha, ob->stats.Cha, CS_STAT_CHA);
+
+ for (int s = 0; s < NUM_SKILLS; s++)
+ if (object *skill = opl->last_skill_ob [s])
+ if (skill->stats.exp != ns->last_skill_exp [s])
{
- if (pl->last_skill_ob[s] && pl->last_skill_exp[s] != pl->last_skill_ob[s]->stats.exp)
- {
- /* Always send along the level if exp changes. This is only
- * 1 extra byte, but keeps processing simpler.
- */
- sl << uint8 (s + CS_STAT_SKILLINFO)
- << uint8 (pl->last_skill_ob[s]->level)
- << uint64 (pl->last_skill_ob[s]->stats.exp);
+ ns->last_skill_exp [s] = skill->stats.exp;
- pl->last_skill_exp[s] = pl->last_skill_ob[s]->stats.exp;
- }
+ /* Always send along the level if exp changes. This is only
+ * 1 extra byte, but keeps processing simpler.
+ */
+ sl << uint8 (s + CS_STAT_SKILLINFO)
+ << uint8 (skill->level)
+ << uint64 (skill->stats.exp);
}
- }
- if (pl->socket->exp64)
- { AddIfInt64 (pl->last_stats.exp, pl->ob->stats.exp, CS_STAT_EXP64) }
- else
- { AddIfInt (pl->last_stats.exp, (int) pl->ob->stats.exp, CS_STAT_EXP) }
+ AddIfInt64 (ns->last_stats.exp, ob->stats.exp, CS_STAT_EXP64);
+ AddIfShort (ns->last_level, ob->level, CS_STAT_LEVEL);
+ AddIfShort (ns->last_stats.wc, ob->stats.wc, CS_STAT_WC);
+ AddIfShort (ns->last_stats.ac, ob->stats.ac, CS_STAT_AC);
+ AddIfShort (ns->last_stats.dam, ob->stats.dam, CS_STAT_DAM);
+ AddIfFloat (ns->last_speed, ob->speed, CS_STAT_SPEED, 1.f / TICK);
+ AddIfShort (ns->last_stats.food, ob->stats.food, CS_STAT_FOOD);
+ AddIfFloat (ns->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP, 1.f / TICK);
+ AddIfInt (ns->last_weight_limit, weight_limit[ob->stats.Str], CS_STAT_WEIGHT_LIM);
- AddIfShort (pl->last_level, (char) pl->ob->level, CS_STAT_LEVEL);
- AddIfShort (pl->last_stats.wc, pl->ob->stats.wc, CS_STAT_WC);
- AddIfShort (pl->last_stats.ac, pl->ob->stats.ac, CS_STAT_AC);
- AddIfShort (pl->last_stats.dam, pl->ob->stats.dam, CS_STAT_DAM);
- AddIfFloat (pl->last_speed, pl->ob->speed, CS_STAT_SPEED);
- AddIfShort (pl->last_stats.food, pl->ob->stats.food, CS_STAT_FOOD);
- AddIfFloat (pl->last_weapon_sp, pl->weapon_sp, CS_STAT_WEAP_SP);
- AddIfInt (pl->last_weight_limit, (sint32) weight_limit[pl->ob->stats.Str], CS_STAT_WEIGHT_LIM);
flags = 0;
- if (pl->fire_on)
+ if (opl->fire_on)
flags |= SF_FIREON;
- if (pl->run_on)
+ if (opl->run_on)
flags |= SF_RUNON;
- AddIfShort (pl->last_flags, flags, CS_STAT_FLAGS);
+ AddIfShort (ns->last_flags, flags, CS_STAT_FLAGS);
- if (pl->socket->sc_version < 1025)
- { AddIfShort (pl->last_resist[ATNR_PHYSICAL], pl->ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
+ if (ns->sc_version < 1025)
+ { AddIfShort (ns->last_resist[ATNR_PHYSICAL], ob->resist[ATNR_PHYSICAL], CS_STAT_ARMOUR) }
else
- {
- int i;
-
- for (i = 0; i < NROFATTACKS; i++)
- {
- /* Skip ones we won't send */
- if (atnr_cs_stat[i] == -1)
- continue;
+ for (int i = 0; i < NROFATTACKS; i++)
+ {
+ /* Skip ones we won't send */
+ if (atnr_cs_stat[i] == -1)
+ continue;
- AddIfShort (pl->last_resist[i], pl->ob->resist[i], (char) atnr_cs_stat[i]);
- }
- }
+ AddIfShort (ns->last_resist[i], ob->resist[i], atnr_cs_stat[i]);
+ }
- if (pl->socket->monitor_spells)
+ if (pl->ns->monitor_spells)
{
- AddIfInt (pl->last_path_attuned, pl->ob->path_attuned, CS_STAT_SPELL_ATTUNE);
- AddIfInt (pl->last_path_repelled, pl->ob->path_repelled, CS_STAT_SPELL_REPEL);
- AddIfInt (pl->last_path_denied, pl->ob->path_denied, CS_STAT_SPELL_DENY);
+ AddIfInt (ns->last_path_attuned, ob->path_attuned, CS_STAT_SPELL_ATTUNE);
+ AddIfInt (ns->last_path_repelled, ob->path_repelled, CS_STAT_SPELL_REPEL);
+ AddIfInt (ns->last_path_denied, ob->path_denied, CS_STAT_SPELL_DENY);
}
- rangetostring (pl->ob, buf); /* we want use the new fire & run system in new client */
- AddIfString (pl->socket->stats.range, buf, CS_STAT_RANGE);
- set_title (pl->ob, buf);
- AddIfString (pl->socket->stats.title, buf, CS_STAT_TITLE);
+ rangetostring (opl, buf); /* we want use the new fire & run system in new client */
+ AddIfString (ns->stats.range, buf, CS_STAT_RANGE);
+ set_title (ob, buf);
+ AddIfString (ns->stats.title, buf, CS_STAT_TITLE);
/* Only send it away if we have some actual data */
if (sl.length () > 6)
- pl->socket->send_packet (sl);
+ ns->send_packet (sl);
}
/**
* 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)
{
- pl->last_weight = weight;
+ sint32 weight = pl->ob->client_weight ();
- packet sl;
- sl << "player ";
+ packet sl ("player");
sl << uint32 (pl->ob->count)
<< uint32 (weight)
- << uint32 (pl->ob->face->number)
+ << uint32 (pl->ob->face)
<< data8 (pl->ob->name);
- pl->socket->send_packet (sl);
- SET_FLAG (pl->ob, FLAG_CLIENT_SENT);
+ pl->ns->last_weight = weight;
+ pl->ns->send_packet (sl);
}
-/**
- * Need to send an animation sequence to the client.
- * We will send appropriate face commands to the client if we haven't
- * sent them the face yet (this can become quite costly in terms of
- * how much we are sending - on the other hand, this should only happen
- * when the player logs in and picks stuff up.
- */
-void
-esrv_send_animation (client_socket * ns, short anim_num)
-{
- int i;
-
- /* Do some checking on the anim_num we got. Note that the animations
- * are added in contigous order, so if the number is in the valid
- * range, it must be a valid animation.
- */
- if (anim_num < 0 || anim_num > num_animations)
- {
- LOG (llevError, "esrv_send_anim (%d) out of bounds??\n", anim_num);
- return;
- }
-
- packet sl;
-
- sl << "anim "
- << uint16 (anim_num)
- << uint16 (0); /* flags - not used right now */
-
- /* Build up the list of faces. Also, send any information (ie, the
- * the face itself) down to the client.
- */
- for (i = 0; i < animations[anim_num].num_animations; i++)
- {
- if (!(ns->faces_sent[animations[anim_num].faces[i]] & NS_FACESENT_FACE))
- esrv_send_face (ns, animations[anim_num].faces[i], 0);
- sl << uint16 (animations[anim_num].faces[i]); /* flags - not used right now */
- }
-
- ns->send_packet (sl);
-
- ns->anims_sent[anim_num] = 1;
-}
-
-
/******************************************************************************
*
* Start of map related commands.
*
******************************************************************************/
-/**
- * This adds face_num to a map cell at x,y. If the client doesn't have
- * the face yet, we will also send it.
- */
-static void
-esrv_map_setbelow (client_socket * ns, int x, int y, short face_num, struct Map *newmap)
-{
- if (newmap->cells[x][y].count >= MAP_LAYERS)
- {
- LOG (llevError, "Too many faces in map cell %d %d\n", x, y);
- return;
- abort ();
- }
-
- newmap->cells[x][y].faces[newmap->cells[x][y].count] = face_num;
- newmap->cells[x][y].count++;
-
- if (!(ns->faces_sent[face_num] & NS_FACESENT_FACE))
- esrv_send_face (ns, face_num, 0);
-}
-
-struct LayerCell
-{
- uint16 xy;
- short face;
-};
-
-struct MapLayer
-{
- int count;
- struct LayerCell lcells[MAP_CLIENT_X * MAP_CLIENT_Y];
-};
-
-/** Checkes if map cells have changed */
-static int
-mapcellchanged (client_socket * ns, int i, int j, struct Map *newmap)
-{
- int k;
-
- if (ns->lastmap.cells[i][j].count != newmap->cells[i][j].count)
- return 1;
- for (k = 0; k < newmap->cells[i][j].count; k++)
- {
- if (ns->lastmap.cells[i][j].faces[k] != newmap->cells[i][j].faces[k])
- {
- return 1;
- }
- }
- return 0;
-}
-
-/**
- * Basically, what this does is pack the data into layers.
- * cnum is the client number, cur is the the buffer we put all of
- * this data into. we return the end of the data. layers is
- * how many layers of data we should back.
- */
-static uint8 *
-compactlayer (client_socket * ns, unsigned char *cur, int numlayers, struct Map *newmap)
-{
- int x, y, k;
- int face;
- unsigned char *fcur;
- struct MapLayer layers[MAP_LAYERS];
-
- for (k = 0; k < MAP_LAYERS; k++)
- layers[k].count = 0;
- fcur = cur;
- for (x = 0; x < ns->mapx; x++)
- {
- for (y = 0; y < ns->mapy; y++)
- {
- if (!mapcellchanged (ns, x, y, newmap))
- continue;
- if (newmap->cells[x][y].count == 0)
- {
- *cur = x * ns->mapy + y; /* mark empty space */
- cur++;
- continue;
- }
- for (k = 0; k < newmap->cells[x][y].count; k++)
- {
- layers[k].lcells[layers[k].count].xy = x * ns->mapy + y;
- layers[k].lcells[layers[k].count].face = newmap->cells[x][y].faces[k];
- layers[k].count++;
- }
- }
- }
- /* If no data, return now. */
- if (fcur == cur && layers[0].count == 0)
- return cur;
- *cur = 255; /* mark end of explicitly cleared cells */
- cur++;
- /* First pack by layers. */
- for (k = 0; k < numlayers; k++)
- {
- if (layers[k].count == 0)
- break; /* once a layer is entirely empty, no layer below it can
- have anything in it either */
- /* Pack by entries in thie layer */
- for (x = 0; x < layers[k].count;)
- {
- fcur = cur;
- *cur = layers[k].lcells[x].face >> 8;
- cur++;
- *cur = layers[k].lcells[x].face & 0xFF;
- cur++;
- face = layers[k].lcells[x].face;
- /* Now, we back the redundant data into 1 byte xy pairings */
- for (y = x; y < layers[k].count; y++)
- {
- if (layers[k].lcells[y].face == face)
- {
- *cur = (uint8) layers[k].lcells[y].xy;
- cur++;
- layers[k].lcells[y].face = -1;
- }
- }
- *(cur - 1) = *(cur - 1) | 128; /* mark for end of xy's; 11*11 < 128 */
- /* forward over the now redundant data */
- while (x < layers[k].count && layers[k].lcells[x].face == -1)
- x++;
- }
- *fcur = *fcur | 128; /* mark for end of faces at this layer */
- }
- return cur;
-}
-
/** Clears a map cell */
static void
-map_clearcell (struct MapCell *cell, int face0, int face1, int face2, int count)
+map_clearcell (struct MapCell *cell, int count)
{
- cell->faces[0] = face0;
- cell->faces[1] = face1;
- cell->faces[2] = face2;
- cell->count = count;
- cell->stat_hp = 0;
- cell->flags = 0;
- cell->player = 0;
+ cell->faces[0] = 0;
+ cell->faces[1] = 0;
+ cell->faces[2] = 0;
+ cell->smooth[0] = 0;
+ cell->smooth[1] = 0;
+ cell->smooth[2] = 0;
+ cell->count = count;
+ cell->stat_hp = 0;
+ cell->flags = 0;
+ cell->player = 0;
}
-#define MAX_HEAD_POS MAX(MAX_CLIENT_X, MAX_CLIENT_Y)
#define MAX_LAYERS 3
-/* Using a global really isn't a good approach, but saves the over head of
- * allocating and deallocating such a block of data each time run through,
- * and saves the space of allocating this in the socket object when we only
- * need it for this cycle. If the serve is ever threaded, this needs to be
- * re-examined.
- */
-
-static object *heads[MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS];
-
-/**
- * Returns true if any of the heads for this
- * space is set. Returns false if all are blank - this is used
- * for empty space checking.
- */
-static inline int
-have_head (int ax, int ay)
-{
-
- if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS] ||
- heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 1] || heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + 2])
- return 1;
- return 0;
-}
-
-/**
- * check_head is a bit simplistic version of update_space below.
- * basically, it only checks the that the head on space ax,ay at layer
- * needs to get sent - if so, it adds the data, sending the head
- * if needed, and returning 1. If this no data needs to get
- * sent, it returns zero.
- */
-static int
-check_head (packet &sl, client_socket &ns, int ax, int ay, int layer)
-{
- short face_num;
-
- if (heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer])
- face_num = heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer]->face->number;
- else
- face_num = 0;
-
- if (face_num != ns.lastmap.cells[ax][ay].faces[layer])
- {
- sl << uint16 (face_num);
- if (face_num && !(ns.faces_sent[face_num] & NS_FACESENT_FACE))
- esrv_send_face (&ns, face_num, 0);
-
- heads[(ay * MAX_HEAD_POS + ax) * MAX_LAYERS + layer] = NULL;
- ns.lastmap.cells[ax][ay].faces[layer] = face_num;
- return 1;
- }
-
- return 0; /* No change */
-}
-
/**
* Removes the need to replicate the same code for each layer.
* this returns true if this space is now in fact different than
@@ -1439,9 +935,6 @@
* ns is the socket we are working on - all the info we care
* about is in this socket structure, so now need not pass the
* entire player object.
- * mx and my are map coordinate offsets for map mp
- * sx and sy are the offsets into the socket structure that
- * holds the old values.
* layer is the layer to update, with 2 being the floor and 0 the
* top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ)
* take. Interesting to note that before this function, the map1 function
@@ -1450,53 +943,10 @@
* the case, it seems to make more sense to have these layer values
* actually match.
*/
-
static int
-update_space (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
+update_space (packet &sl, client &ns, mapspace &ms, MapCell &lastcell, int layer)
{
- object *ob, *head;
- uint16 face_num;
- int bx, by, i;
-
- /* If there is a multipart object stored away, treat that as more important.
- * If not, then do the normal processing.
- */
- head = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer];
-
- /* Check to see if this head is part of the set of objects
- * we would normally send for this space. If so, then
- * don't use the head value. We need to do the check
- * here and not when setting up the heads[] value for two reasons -
- * 1) the heads[] values will get used even if the space is not visible.
- * 2) its possible the head is not on the same map as a part, and I'd
- * rather not need to do the map translation overhead.
- * 3) We need to do some extra checking to make sure that we will
- * otherwise send the image as this layer, eg, either it matches
- * the head value, or is not multipart.
- */
- if (head && !head->more)
- {
- for (i = 0; i < MAP_LAYERS; i++)
- {
- ob = GET_MAP_FACE_OBJ (mp, mx, my, i);
- if (!ob)
- continue;
-
- if (ob->head)
- ob = ob->head;
-
- if (ob == head)
- {
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer] = NULL;
- head = NULL;
- break;
- }
- }
- }
-
- ob = head;
- if (!ob)
- ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
+ object *ob = ms.faces_obj [layer];
/* If there is no object for this space, or if the face for the object
* is the blank face, set the face number to zero.
@@ -1504,148 +954,20 @@
* precedence over the other object for this space.
* otherwise, we do special head processing
*/
- if (!ob || ob->face == blank_face)
- face_num = 0;
- else if (head)
- {
- /* if this is a head that had previously been stored */
- face_num = ob->face->number;
- }
- else
- {
- /* if the faces for the different parts of a multipart object
- * are the same, we only want to send the bottom right most
- * portion of the object. That info is in the tail_.. values
- * of the head. Note that for the head itself, ob->head will
- * be null, so we only do this block if we are working on
- * a tail piece.
- */
-
- /* tail_x and tail_y will only be set in the head object. If
- * this is the head object and these are set, we proceed
- * with logic to only send bottom right. Similarly, if
- * this is one of the more parts but the head has those values
- * set, we want to do the processing. There can be cases where
- * the head is not visible but one of its parts is, so we just
- * can always expect that ob->arch->tail_x will be true for all
- * object we may want to display.
- */
- if ((ob->arch->tail_x || ob->arch->tail_y) || (ob->head && (ob->head->arch->tail_x || ob->head->arch->tail_y)))
- {
-
- if (ob->head)
- head = ob->head;
- else
- head = ob;
-
- /* Basically figure out where the offset is from where we are right
- * now. the ob->arch->clone.{x,y} values hold the offset that this current
- * piece is from the head, and the tail is where the tail is from the
- * head. Note that bx and by will equal sx and sy if we are already working
- * on the bottom right corner. If ob is the head, the clone values
- * will be zero, so the right thing will still happen.
- */
- bx = sx + head->arch->tail_x - ob->arch->clone.x;
- by = sy + head->arch->tail_y - ob->arch->clone.y;
-
- /* I don't think this can ever happen, but better to check for it just
- * in case.
- */
- if (bx < sx || by < sy)
- {
- LOG (llevError, "update_space: bx (%d) or by (%d) is less than sx (%d) or sy (%d)\n", bx, by, sx, sy);
- face_num = 0;
- }
- /* single part object, multipart object with non merged faces,
- * of multipart object already at lower right.
- */
- else if (bx == sx && by == sy)
- {
- face_num = ob->face->number;
-
- /* if this face matches one stored away, clear that one away.
- * this code relies on the fact that the map1 commands
- * goes from 2 down to 0.
- */
- for (i = 0; i < MAP_LAYERS; i++)
- if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] &&
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i]->face->number == face_num)
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + i] = NULL;
- }
- else
- {
- /* If this head is stored away, clear it - otherwise,
- * there can be cases where a object is on multiple layers -
- * we only want to send it once.
- */
- face_num = head->face->number;
- for (i = 0; i < MAP_LAYERS; i++)
- if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] &&
- heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i]->face->number == face_num)
- heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = NULL;
-
- /* First, try to put the new head on the same layer. If that is used up,
- * then find another layer.
- */
- if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] == NULL)
- {
- heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + layer] = head;
- }
- else
- for (i = 0; i < MAX_LAYERS; i++)
- {
- if (heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == NULL ||
- heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] == head)
- {
- heads[(by * MAX_HEAD_POS + bx) * MAX_LAYERS + i] = head;
- }
- }
- face_num = 0; /* Don't send this object - we'll send the head later */
- }
- }
- else
- {
- /* In this case, we are already at the lower right or single part object,
- * so nothing special
- */
- face_num = ob->face->number;
-
- /* clear out any head entries that have the same face as this one */
- for (bx = 0; bx < layer; bx++)
- if (heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] &&
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx]->face->number == face_num)
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + bx] = NULL;
- }
- } /* else not already head object or blank face */
-
- /* This is a real hack. Basically, if we have nothing to send for this layer,
- * but there is a head on the next layer, send that instead.
- * Without this, what happens is you can get the case where the player stands
- * on the same space as the head. However, if you have overlapping big objects
- * of the same type, what happens then is it doesn't think it needs to send
- * This tends to make stacking also work/look better.
- */
- if (!face_num && layer > 0 && heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1])
- {
- face_num = heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1]->face->number;
- heads[(sy * MAX_HEAD_POS + sx) * MAX_LAYERS + layer - 1] = NULL;
- }
-
- /* Another hack - because of heads and whatnot, this face may match one
- * we already sent for a lower layer. In that case, don't send
- * this one.
- */
- if (face_num && layer + 1 < MAP_LAYERS && ns.lastmap.cells[sx][sy].faces[layer + 1] == face_num)
- face_num = 0;
+ uint16 face_num = ob && ob->face != blank_face ? ob->face : 0;
/* We've gotten what face we want to use for the object. Now see if
* if it has changed since we last sent it to the client.
*/
- if (ns.lastmap.cells[sx][sy].faces[layer] != face_num)
+ if (lastcell.faces[layer] != face_num)
{
- ns.lastmap.cells[sx][sy].faces[layer] = face_num;
- if (!(ns.faces_sent[face_num] & NS_FACESENT_FACE))
- esrv_send_face (&ns, face_num, 0);
+ lastcell.faces[layer] = face_num;
+
+ if (!ns.faces_sent[face_num])
+ if (ob)
+ ns.send_faces (ob);
+ else
+ ns.send_face (face_num, 10);
sl << uint16 (face_num);
return 1;
@@ -1655,478 +977,289 @@
return 0;
}
-/**
- * This function is mainly a copy of update_space,
- * except it handles update of the smoothing updates,
- * not the face updates.
- * Removes the need to replicate the same code for each layer.
- * this returns true if this smooth is now in fact different
- * than it was.
- * sl is the socklist this data is going into.
- * ns is the socket we are working on - all the info we care
- * about is in this socket structure, so know need to pass the
- * entire player object.
- * mx and my are map coordinate offsets for map mp
- * sx and sy are the offsets into the socket structure that
- * holds the old values.
- * layer is the layer to update, with 2 being the floor and 0 the
- * top layer (this matches what the GET_MAP_FACE and GET_MAP_FACE_OBJ
- * take.
- */
+//-GPL
-static inline int
-update_smooth (packet &sl, client_socket &ns, maptile *mp, int mx, int my, int sx, int sy, int layer)
+// prefetch (and touch) all maps within a specific distancd
+static void
+prefetch_surrounding_maps (maptile *map, int distance)
{
- object *ob;
- int smoothlevel; /* old face_num; */
+ map->touch ();
- ob = GET_MAP_FACE_OBJ (mp, mx, my, layer);
-
- /* If there is no object for this space, or if the face for the object
- * is the blank face, set the smoothlevel to zero.
- */
- if (!ob || ob->face == blank_face || MAP_NOSMOOTH (mp))
- smoothlevel = 0;
- else
- {
- smoothlevel = ob->smoothlevel;
- if (smoothlevel && !(ns.faces_sent[ob->face->number] & NS_FACESENT_SMOOTH))
- SendSmooth (&ns, ob->face->number);
- } /* else not already head object or blank face */
-
- /* We've gotten what face we want to use for the object. Now see if
- * if it has changed since we last sent it to the client.
- */
- if (smoothlevel > 255)
- smoothlevel = 255;
- else if (smoothlevel < 0)
- smoothlevel = 0;
-
- if (ns.lastmap.cells[sx][sy].smooth[layer] != smoothlevel)
- {
- ns.lastmap.cells[sx][sy].smooth[layer] = smoothlevel;
- sl << uint8 (smoothlevel);
- return 1;
- }
-
- /* Nothing changed */
- return 0;
+ if (--distance)
+ for (int dir = 4; --dir; )
+ if (const shstr &path = map->tile_path [dir])
+ if (maptile *&neigh = map->tile_map [dir])
+ prefetch_surrounding_maps (neigh, distance);
+ else
+ neigh = maptile::find_async (path, map);
}
-/**
- * Returns the size of a data for a map square as returned by
- * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
- * available.
- */
-int
-getExtendedMapInfoSize (client_socket * ns)
+// prefetch a generous area around the player
+static void
+prefetch_surrounding_maps (object *op)
{
- int result = 0;
-
- if (ns->ext_mapinfos)
- {
- if (ns->EMI_smooth)
- result += 1; /*One byte for smoothlevel */
- }
- return result;
+ prefetch_surrounding_maps (op->map, 3);
}
-/**
- * This function uses the new map1 protocol command to send the map
- * to the client. It is necessary because the old map command supports
- * a maximum map size of 15x15.
- * This function is much simpler than the old one. This is because
- * the old function optimized to send as few face identifiers as possible,
- * at the expense of sending more coordinate location (coordinates were
- * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
- * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
- * maps no sense. Instead, we actually really only use 12 bits for coordinates,
- * and use the other 4 bits for other informatiion. For full documentation
- * of what we send, see the doc/Protocol file.
- * I will describe internally what we do:
- * the socket->lastmap shows how the map last looked when sent to the client.
- * in the lastmap structure, there is a cells array, which is set to the
- * maximum viewable size (As set in config.h).
- * in the cells, there are faces and a count value.
- * we use the count value to hold the darkness value. If -1, then this space
- * is not viewable.
- * we use faces[0] faces[1] faces[2] to hold what the three layers
- * look like.
- */
-void
-draw_client_map1 (object *pl)
-{
- int x, y, ax, ay, d, startlen, max_x, max_y, oldlen;
- sint16 nx, ny;
- int estartlen, eoldlen;
- uint16 mask, emask;
- uint8 eentrysize;
- uint16 ewhatstart, ewhatflag;
- uint8 extendedinfos;
- maptile *m;
-
- client_socket &socket = *pl->contr->socket;
-
- check_map_change (pl->contr);
+//+GPL
- packet sl;
- packet esl;
-
- sl << (socket.mapmode == Map1Cmd ? "map1 " : "map1a ");
- startlen = sl.length ();
+/**
+ * Draws client map.
+ */
+void
+draw_client_map (player *pl)
+{
+ object *ob = pl->viewpoint;
+ if (!pl->observe->active)
+ return;
- /*Extendedmapinfo structure initialisation */
- if (socket.ext_mapinfos)
- {
- extendedinfos = EMI_NOREDRAW;
+ /* 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 (!ob->map || ob->map->in_memory != MAP_ACTIVE)
+ return;
- if (socket.EMI_smooth)
- extendedinfos |= EMI_SMOOTH;
+ int startlen, oldlen;
- ewhatstart = esl.length ();
- ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
- could need to be taken away */
- eentrysize = getExtendedMapInfoSize (&socket);
- esl << "mapextended "
- << uint8 (extendedinfos)
- << uint8 (eentrysize);
+ check_map_change (pl);
+ prefetch_surrounding_maps (pl->ob);
- estartlen = esl.length ();
- }
- else
+ /* do LOS after calls to update_position */
+ /* unfortunately, we need to udpate los when observing, currently */
+ if (pl->do_los || pl->viewpoint != pl->ob)
{
- /* suppress compiler warnings */
- ewhatstart = 0;
- ewhatflag = 0;
- estartlen = 0;
+ pl->do_los = 0;
+ pl->update_los ();
}
- /* Init data to zero */
- memset (heads, 0, sizeof (object *) * MAX_HEAD_POS * MAX_HEAD_POS * MAX_LAYERS);
-
- /* x,y are the real map locations. ax, ay are viewport relative
- * locations.
- */
- ay = 0;
-
- /* We could do this logic as conditionals in the if statement,
- * but that started to get a bit messy to look at.
+ /**
+ * This function uses the new map1 protocol command to send the map
+ * to the client. It is necessary because the old map command supports
+ * a maximum map size of 15x15.
+ * This function is much simpler than the old one. This is because
+ * the old function optimized to send as few face identifiers as possible,
+ * at the expense of sending more coordinate location (coordinates were
+ * only 1 byte, faces 2 bytes, so this was a worthwhile savings). Since
+ * we need 2 bytes for coordinates and 2 bytes for faces, such a trade off
+ * maps no sense. Instead, we actually really only use 12 bits for coordinates,
+ * and use the other 4 bits for other informatiion. For full documentation
+ * of what we send, see the doc/Protocol file.
+ * I will describe internally what we do:
+ * the ns->lastmap shows how the map last looked when sent to the client.
+ * in the lastmap structure, there is a cells array, which is set to the
+ * maximum viewable size (As set in config.h).
+ * in the cells, there are faces and a count value.
+ * we use the count value to hold the darkness value. If -1, then this space
+ * is not viewable.
+ * we use faces[0] faces[1] faces[2] to hold what the three layers
+ * look like.
*/
- max_x = pl->x + (socket.mapx + 1) / 2;
- max_y = pl->y + (socket.mapy + 1) / 2;
- if (socket.mapmode == Map1aCmd)
- {
- max_x += MAX_HEAD_OFFSET;
- max_y += MAX_HEAD_OFFSET;
- }
+ client &socket = *pl->ns;
- for (y = pl->y - socket.mapy / 2; y < max_y; y++, ay++)
- {
- ax = 0;
- for (x = pl->x - socket.mapx / 2; x < max_x; x++, ax++)
- {
-
- emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
-
- /* If this space is out of the normal viewable area, we only check
- * the heads value ax or ay will only be greater than what
- * the client wants if using the map1a command - this is because
- * if the map1a command is not used, max_x and max_y will be
- * set to lower values.
- */
- if (ax >= socket.mapx || ay >= socket.mapy)
- {
- int i, got_one;
+ packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
- oldlen = sl.length ();
+ startlen = sl.length ();
- sl << uint16 (mask);
+ int hx = socket.mapx / 2;
+ int hy = socket.mapy / 2;
- if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
- if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
- if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
-
- /* If all we are doing is sending 0 (blank) faces, we don't
- * actually need to send that - just the coordinates
- * with no faces tells the client to blank out the
- * space.
- */
- got_one = 0;
- for (i = oldlen + 2; i < sl.length (); i++)
- if (sl[i])
- got_one = 1;
-
- if (got_one && (mask & 0xf))
- sl[oldlen + 1] = mask & 0xff;
- else
- { /*either all faces blank, either no face at all */
- if (mask & 0xf) /*at least 1 face, we know it's blank, only send coordinates */
- sl.reset (oldlen + 2);
- else
- sl.reset (oldlen);
- }
+ ordered_mapwalk_begin (ob, -hx, -hy, hx, hy)
+ int ax = dx + hx;
+ int ay = dy + hy;
+
+ int mask = (ax << 10) | (ay << 4);
+ MapCell &lastcell = socket.lastmap.cells[ax][ay];
+
+ /* If the coordinates are not valid, or it is too dark to see,
+ * we tell the client as such
+ */
+ if (!m)
+ {
+ /* space is out of map. Update space and clear values
+ * if this hasn't already been done. If the space is out
+ * of the map, it shouldn't have a head.
+ */
+ if (lastcell.count != -1)
+ {
+ sl << uint16 (mask);
+ map_clearcell (&lastcell, -1);
+ }
- /*What concerns extendinfos, nothing to be done for now
- * (perhaps effects layer later)
- */
- continue; /* don't do processing below */
- }
+ continue;
+ }
+
+ int d = pl->blocked_los_uc (dx, dy);
- MapCell &lastcell = socket.lastmap.cells[ax][ay];
+ if (d > 3)
+ {
+ /* 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);
- d = pl->contr->blocked_los[ax][ay];
+ /* properly clear a previously sent big face */
+ map_clearcell (&lastcell, -1);
+ }
+ else
+ {
+ /* In this block, the space is visible.
+ */
- /* If the coordinates are not valid, or it is too dark to see,
- * we tell the client as such
- */
- nx = x;
- ny = y;
- m = get_map_from_coord (pl->map, &nx, &ny);
+ /* Rather than try to figure out what everything that we might
+ * need to send is, then form the packet after that,
+ * we presume that we will in fact form a packet, and update
+ * the bits by what we do actually send. If we send nothing,
+ * we just back out sl.length () to the old value, and no harm
+ * is done.
+ * I think this is simpler than doing a bunch of checks to see
+ * what if anything we need to send, setting the bits, then
+ * doing those checks again to add the real data.
+ */
+ oldlen = sl.length ();
- if (!m)
- {
- /* space is out of map. Update space and clear values
- * if this hasn't already been done. If the space is out
- * of the map, it shouldn't have a head
- */
- if (lastcell.count != -1)
- {
- sl << uint16 (mask);
- map_clearcell (&lastcell, 0, 0, 0, -1);
- }
- }
- else if (d > 3)
- {
- int need_send = 0, count;
+ sl << uint16 (mask);
- /* This block deals with spaces that are not visible for whatever
- * reason. Still may need to send the head for this space.
- */
+ unsigned char dummy;
+ unsigned char *last_ext = &dummy;
- oldlen = sl.length ();
+ /* Darkness changed */
+ if (lastcell.count != d)
+ {
+ mask |= 0x8;
- sl << uint16 (mask);
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
+ sl << uint8 (d);
+ }
- if (lastcell.count != -1)
- need_send = 1;
+ lastcell.count = d;
- count = -1;
+ mapspace &ms = m->at (nx, ny);
+ ms.update ();
- if (socket.mapmode == Map1aCmd && have_head (ax, ay))
+ // extmap handling
+ uint8 stat_hp = 0;
+ uint8 stat_width = 0;
+ 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->stats.maxhp > op->stats.hp
+ && op->stats.maxhp > 0
+ && (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)))
{
- /* Now check to see if any heads need to be sent */
-
- if (check_head (sl, socket, ax, ay, 2)) mask |= 0x4;
- if (check_head (sl, socket, ax, ay, 1)) mask |= 0x2;
- if (check_head (sl, socket, ax, ay, 0)) mask |= 0x1;
-
- lastcell.count = count;
+ 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
}
- else
- {
- /* properly clear a previously sent big face */
- if (lastcell.faces[0] != 0 || lastcell.faces[1] != 0 || lastcell.faces[2] != 0
- || lastcell.stat_hp || lastcell.flags || lastcell.player)
- need_send = 1;
- map_clearcell (&lastcell, 0, 0, 0, count);
- }
+ if (expect_false (op->has_dialogue ()))
+ flags |= 1;
- if ((mask & 0xf) || need_send)
- sl[oldlen + 1] = mask & 0xff;
- else
- sl.reset (oldlen);
+ if (expect_false (op->type == PLAYER))
+ player = op == ob ? pl->ob->count
+ : op == pl->ob ? ob->count
+ : op->count;
}
- else
- {
- /* In this block, the space is visible or there are head objects
- * we need to send.
- */
-
- /* Rather than try to figure out what everything that we might
- * need to send is, then form the packet after that,
- * we presume that we will in fact form a packet, and update
- * the bits by what we do actually send. If we send nothing,
- * we just back out sl.length () to the old value, and no harm
- * is done.
- * I think this is simpler than doing a bunch of checks to see
- * what if anything we need to send, setting the bits, then
- * doing those checks again to add the real data.
- */
- oldlen = sl.length ();
- mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
- eoldlen = esl.length ();
- emask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
- sl << uint16 (mask);
-
- if (socket.ext_mapinfos)
- esl << uint16 (emask);
-
- unsigned char dummy;
- unsigned char *last_ext = &dummy;
- /* Darkness changed */
- if (lastcell.count != d && socket.darkness)
- {
- mask |= 0x8;
-
- if (socket.extmap)
- {
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
- sl << uint8 (d);
- }
- else
- sl << uint8 (255 - 64 * d);
- }
-
- lastcell.count = d;
-
- if (socket.extmap)
- {
- uint8 stat_hp = 0;
- uint8 stat_width = 0;
- uint8 flags = 0;
- UUID player = 0;
-
- // send hp information, if applicable
- if (object *op = GET_MAP_FACE_OBJ (m, nx, ny, 0))
- {
- if (op->head || op->invisible)
- ; // do not show
- else if (op->type == PLAYER
- || 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_width = op->arch->tail_x;
- }
- }
-
- if (op->msg && op->msg[0] == '@')
- flags |= 1;
-
- if (op->type == PLAYER && op != pl)
- player = op->count;
- }
-
- if (lastcell.stat_hp != stat_hp)
- {
- lastcell.stat_hp = stat_hp;
-
- mask |= 0x8;
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
-
- sl << uint8 (5) << uint8 (stat_hp);
+ if (expect_false (lastcell.stat_hp != stat_hp))
+ {
+ lastcell.stat_hp = stat_hp;
- if (stat_width > 1)
- {
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
+ mask |= 0x8;
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
- sl << uint8 (6) << uint8 (stat_width);
- }
- }
+ sl << uint8 (5) << uint8 (stat_hp);
- if (lastcell.player != player)
- {
- lastcell.player = player;
+ if (stat_width > 1)
+ {
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
- mask |= 0x8;
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
+ sl << uint8 (6) << uint8 (stat_width);
+ }
+ }
- sl << uint8 (0x47) << uint8 (8) << (uint64)player;
- }
+ if (expect_false (lastcell.player != player))
+ {
+ lastcell.player = player;
- if (lastcell.flags != flags)
- {
- lastcell.flags = flags;
+ mask |= 0x8;
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
- mask |= 0x8;
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
+ sl << uint8 (0x47) << uint8 (4) << (uint32)player;
+ }
- sl << uint8 (8) << uint8 (flags);
- }
- }
+ if (expect_false (lastcell.flags != flags))
+ {
+ lastcell.flags = flags;
- /* Floor face */
- if (update_space (sl, socket, m, nx, ny, ax, ay, 2))
- mask |= 0x4;
-
- if (socket.EMI_smooth)
- if (update_smooth (esl, socket, m, nx, ny, ax, ay, 2))
- emask |= 0x4;
-
- /* Middle face */
- if (update_space (sl, socket, m, nx, ny, ax, ay, 1))
- mask |= 0x2;
-
- if (socket.EMI_smooth)
- if (update_smooth (esl, socket, m, nx, ny, ax, ay, 1))
- emask |= 0x2;
+ mask |= 0x8;
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
- if (nx == pl->x && ny == pl->y && pl->invisible & (pl->invisible < 50 ? 4 : 1))
- {
- if (lastcell.faces[0] != pl->face->number)
- {
- lastcell.faces[0] = pl->face->number;
- mask |= 0x1;
+ sl << uint8 (8) << uint8 (flags);
+ }
- if (!(socket.faces_sent[pl->face->number] & NS_FACESENT_FACE))
- esrv_send_face (&socket, pl->face->number, 0);
+ // faces
- sl << uint16 (pl->face->number);
- }
- }
- else
- {
- /* Top face */
- if (update_space (sl, socket, m, nx, ny, ax, ay, 0))
- mask |= 0x1;
-
- if (socket.EMI_smooth)
- if (update_smooth (esl, socket, m, nx, ny, ax, ay, 0))
- emask |= 0x1;
- }
+ /* Floor face */
+ if (update_space (sl, socket, ms, lastcell, 2))
+ mask |= 0x4;
+
+ /* Middle face */
+ if (update_space (sl, socket, ms, lastcell, 1))
+ mask |= 0x2;
+
+ if (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)
+ {
+ lastcell.faces[0] = ob->face;
- /* Check to see if we are in fact sending anything for this
- * space by checking the mask. If so, update the mask.
- * if not, reset the len to that from before adding the mask
- * value, so we don't send those bits.
- */
- if (mask & 0xf)
- sl[oldlen + 1] = mask & 0xff;
- else
- sl.reset (oldlen);
-
- if (emask & 0xf)
- esl[eoldlen + 1] = emask & 0xff;
- else
- esl.reset (eoldlen);
- } /* else this is a viewable space */
- } /* for x loop */
- } /* for y loop */
+ mask |= 0x1;
+ sl << uint16 (ob->face);
- /* Verify that we in fact do need to send this */
- if (socket.ext_mapinfos)
- {
- if (!(sl.length () > startlen || socket.sent_scroll))
- {
- /* No map data will follow, so don't say the client
- * it doesn't need draw!
- */
- ewhatflag &= (~EMI_NOREDRAW);
- esl[ewhatstart + 1] = ewhatflag & 0xff;
- }
+ socket.send_faces (ob);
+ }
+ }
+ /* Top face */
+ else if (update_space (sl, socket, ms, lastcell, 0))
+ mask |= 0x1;
+
+ /* Check to see if we are in fact sending anything for this
+ * space by checking the mask. If so, update the mask.
+ * if not, reset the len to that from before adding the mask
+ * value, so we don't send those bits.
+ */
+ if (mask & 0xf)
+ sl[oldlen + 1] = mask & 0xff;
+ else
+ sl.reset (oldlen);
+ } /* else this is a viewable space */
+ ordered_mapwalk_end
- if (esl.length () > estartlen)
- socket.send_packet (esl);
- }
+ socket.flush_fx ();
if (sl.length () > startlen || socket.sent_scroll)
{
@@ -2136,136 +1269,16 @@
}
/**
- * Draws client map.
- */
-void
-draw_client_map (object *pl)
-{
- int i, j;
- sint16 ax, ay, nx, ny; /* ax and ay goes from 0 to max-size of arrays */
- New_Face *face, *floor;
- New_Face *floor2;
- int d, mflags;
- struct Map newmap;
- maptile *m, *pm;
-
- if (pl->type != PLAYER)
- {
- LOG (llevError, "draw_client_map called with non player/non eric-server\n");
- return;
- }
-
- pm = pl->map;
-
- /* 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 (pm == NULL || pm->in_memory != MAP_IN_MEMORY)
- return;
-
- memset (&newmap, 0, sizeof (struct Map));
-
- for (j = (pl->y - pl->contr->socket->mapy / 2); j < (pl->y + (pl->contr->socket->mapy + 1) / 2); j++)
- {
- for (i = (pl->x - pl->contr->socket->mapx / 2); i < (pl->x + (pl->contr->socket->mapx + 1) / 2); i++)
- {
- ax = i;
- ay = j;
- m = pm;
- mflags = get_map_flags (m, &m, ax, ay, &ax, &ay);
- if (mflags & P_OUT_OF_MAP)
- continue;
- if (mflags & P_NEED_UPDATE)
- update_position (m, ax, ay);
- /* If a map is visible to the player, we don't want to swap it out
- * just to reload it. This should really call something like
- * swap_map, but this is much more efficient and 'good enough'
- */
- if (mflags & P_NEW_MAP)
- m->timeout = 50;
- }
- }
- /* do LOS after calls to update_position */
- if (pl->contr->do_los)
- {
- update_los (pl);
- pl->contr->do_los = 0;
- }
-
- /* Big maps need a different drawing mechanism to work */
- draw_client_map1 (pl);
-}
-
-
-/*****************************************************************************/
-
-/* GROS: The following one is used to allow a plugin to send a generic cmd to*/
-
-/* a player. Of course, the client need to know the command to be able to */
-
-/* manage it ! */
-
-/*****************************************************************************/
-void
-send_plugin_custom_message (object *pl, char *buf)
-{
- pl->contr->socket->send_packet (buf);
-}
-
-/**
- * This sends the skill number to name mapping. We ignore
- * the params - we always send the same info no matter what.
- */
-void
-send_skill_info (client_socket *ns, char *params)
-{
- packet sl;
- sl << "replyinfo skill_info\n";
-
- for (int i = 1; i < NUM_SKILLS; i++)
- sl.printf ("%d:%s\n", i + CS_STAT_SKILLINFO, &skill_names[i]);
-
- if (sl.length () >= MAXSOCKBUF)
- {
- LOG (llevError, "Buffer overflow in send_skill_info!\n");
- fatal (0);
- }
-
- ns->send_packet (sl);
-}
-
-/**
- * This sends the spell path to name mapping. We ignore
- * the params - we always send the same info no matter what.
- */
-void
-send_spell_paths (client_socket * ns, char *params)
-{
- packet sl;
-
- sl << "replyinfo spell_paths\n";
-
- for (int i = 0; i < NRSPELLPATHS; i++)
- sl.printf ("%d:%s\n", 1 << i, spellpathnames[i]);
-
- if (sl.length () >= MAXSOCKBUF)
- {
- LOG (llevError, "Buffer overflow in send_spell_paths!\n");
- fatal (0);
- }
-
- ns->send_packet (sl);
-}
-
-/**
* This looks for any spells the player may have that have changed their stats.
* it then sends an updspell packet for each spell that has changed in this way
*/
void
esrv_update_spells (player *pl)
{
- if (!pl->socket->monitor_spells)
+ if (!pl->ns)
+ return;
+
+ if (!pl->ns->monitor_spells)
return;
for (object *spell = pl->ob->inv; spell; spell = spell->below)
@@ -2275,21 +1288,21 @@
int flags = 0;
/* check if we need to update it */
- if (spell->last_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
+ if (spell->cached_sp != SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA))
{
- spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+ spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
flags |= UPD_SP_MANA;
}
- if (spell->last_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
+ if (spell->cached_grace != SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE))
{
- spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+ spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
flags |= UPD_SP_GRACE;
}
- if (spell->last_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
+ if (spell->cached_eat != spell->stats.dam + SP_level_dam_adjust (pl->ob, spell))
{
- spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+ spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
flags |= UPD_SP_DAMAGE;
}
@@ -2301,11 +1314,11 @@
<< uint8 (flags)
<< uint32 (spell->count);
- if (flags & UPD_SP_MANA ) sl << uint16 (spell->last_sp);
- if (flags & UPD_SP_GRACE ) sl << uint16 (spell->last_grace);
- if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->last_eat);
+ if (flags & UPD_SP_MANA ) sl << uint16 (spell->cached_sp);
+ if (flags & UPD_SP_GRACE ) sl << uint16 (spell->cached_grace);
+ if (flags & UPD_SP_DAMAGE) sl << uint16 (spell->cached_eat);
- pl->socket->send_packet (sl);
+ pl->ns->send_packet (sl);
}
}
}
@@ -2314,7 +1327,7 @@
void
esrv_remove_spell (player *pl, object *spell)
{
- if (!pl->socket->monitor_spells)
+ if (!pl->ns->monitor_spells)
return;
if (!pl || !spell || spell->env != pl->ob)
@@ -2323,19 +1336,18 @@
return;
}
- packet sl;
+ packet sl ("delspell");
- sl << "delspell "
- << uint32 (spell->count);
+ sl << uint32 (spell->count);
- pl->socket->send_packet (sl);
+ pl->ns->send_packet (sl);
}
/* appends the spell *spell to the Socklist we will send the data to. */
static void
append_spell (player *pl, packet &sl, object *spell)
{
- int len, i, skill = 0;
+ int i, skill = 0;
if (!(spell->name))
{
@@ -2344,31 +1356,34 @@
}
/* store costs and damage in the object struct, to compare to later */
- spell->last_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
- spell->last_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
- spell->last_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
+ spell->cached_sp = SP_level_spellpoint_cost (pl->ob, spell, SPELL_MANA);
+ spell->cached_grace = SP_level_spellpoint_cost (pl->ob, spell, SPELL_GRACE);
+ spell->cached_eat = spell->stats.dam + SP_level_dam_adjust (pl->ob, spell);
/* figure out which skill it uses, if it uses one */
if (spell->skill)
+ if (object *tmp = pl->find_skill (spell->skill))
+ skill = tmp->subtype + CS_STAT_SKILLINFO;
+
+ // spells better have a face
+ if (!spell->face)
{
- for (i = 1; i < NUM_SKILLS; i++)
- if (!strcmp (spell->skill, skill_names[i]))
- {
- skill = i + CS_STAT_SKILLINFO;
- break;
- }
+ LOG (llevError, "%s: spell has no face, but face is mandatory.\n", &spell->name);
+ spell->face = face_find ("burnout.x11", blank_face);
}
+ pl->ns->send_face (spell->face);
+
/* send the current values */
sl << uint32 (spell->count)
<< uint16 (spell->level)
<< uint16 (spell->casting_time)
- << uint16 (spell->last_sp)
- << uint16 (spell->last_grace)
- << uint16 (spell->last_eat)
+ << uint16 (spell->cached_sp)
+ << uint16 (spell->cached_grace)
+ << uint16 (spell->cached_eat)
<< uint8 (skill)
<< uint32 (spell->path_attuned)
- << uint32 (spell->face ? spell->face->number : 0)
+ << uint32 (spell->face)
<< data8 (spell->name)
<< data16 (spell->msg);
}
@@ -2386,16 +1401,14 @@
return;
}
- if (!pl->socket->monitor_spells)
+ if (!pl->ns->monitor_spells)
return;
- packet sl;
-
- sl << "addspell ";
+ packet sl ("addspell");
if (!spell)
{
- for (spell = pl->ob->inv; spell != NULL; spell = spell->below)
+ 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
@@ -2405,17 +1418,18 @@
* 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
* to show add_spell is 26 bytes + 2 strings. However, the overun
* is hundreds of bytes off, so correcting 22 vs 26 doesn't seem
* like it will fix this
*/
- if (spell->type != SPELL)
- continue;
-
- if (sl.length () >= (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
+ if (sl.length () > (MAXSOCKBUF - (26 + strlen (spell->name) + (spell->msg ? strlen (spell->msg) : 0))))
{
- pl->socket->send_packet (sl);
+ pl->ns->flush_fx ();
+ pl->ns->send_packet (sl);
sl.reset ();
sl << "addspell ";
@@ -2432,13 +1446,16 @@
else
append_spell (pl, sl, spell);
- if (sl.length () >= MAXSOCKBUF)
+ if (sl.length () > MAXSOCKBUF)
{
LOG (llevError, "Buffer overflow in esrv_add_spells!\n");
fatal (0);
}
/* finally, we can send the packet */
- pl->socket->send_packet (sl);
+ pl->ns->flush_fx ();
+ pl->ns->send_packet (sl);
}
+//-GPL
+