--- deliantra/server/socket/request.C 2008/12/23 06:58:24 1.143
+++ deliantra/server/socket/request.C 2009/11/06 12:49:19 1.156
@@ -5,22 +5,25 @@
* 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 GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
+ * 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 GNU General Public License
- * along with this program. If not, see .
+ * 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
*/
+//+GPL
+
/**
* \file
* Client handling.
@@ -65,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 */ ,
@@ -143,7 +146,7 @@
send_map_info (player *pl)
{
client &socket = *pl->ns;
- object *ob = pl->observe;
+ object *ob = pl->viewpoint;
if (socket.mapinfocmd)
{
@@ -170,7 +173,7 @@
check_map_change (player *pl)
{
client &socket = *pl->ns;
- object *ob = pl->observe;
+ object *ob = pl->viewpoint;
region *reg = ob->region ();
if (socket.current_region != reg)
@@ -210,13 +213,8 @@
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.floorbox_reset ();
- }
+ socket_map_scroll (&socket, ob->x - socket.current_x, ob->y - socket.current_y);
+ socket.floorbox_reset ();
}
socket.current_x = ob->x;
@@ -243,11 +241,7 @@
break;
}
- if (!strcmp (buf, "image_info"))
- send_image_info (ns, params);
- else if (!strcmp (buf, "image_sums"))
- send_image_sums (ns, params);
- else if (!strcmp (buf, "skill_info"))
+ if (!strcmp (buf, "skill_info"))
send_skill_info (ns, params);
else if (!strcmp (buf, "spell_paths"))
send_spell_paths (ns, params);
@@ -273,6 +267,8 @@
INVOKE_CLIENT (EXTICMD, ns, ARG_DATA (buf, len));
}
+//-GPL
+
void
client::mapinfo_queue_clear ()
{
@@ -289,9 +285,9 @@
buf += strlen (buf) + 9;
// initial map and its origin
- maptile *map = pl->observe->map;
- int mapx = pl->ns->mapx / 2 - pl->observe->x;
- int mapy = pl->ns->mapy / 2 - pl->observe->y;
+ 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
while (*buf && map && max_distance)
@@ -406,58 +402,7 @@
INVOKE_CLIENT (ADDME, ns, ARG_DATA (buf, len));
}
-/** Reply to ExtendedInfos command */
-void
-ToggleExtendedInfos (char *buf, int len, client * ns)
-{
- 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;
-
- while ((nextinfo < len) && (buf[nextinfo] != ' '))
- nextinfo++;
-
- if (nextinfo - info >= 49) /*Erroneous info asked */
- continue;
-
- strncpy (command, &(buf[info]), nextinfo - info);
-
- /* 2. Interpret info */
- if (!strcmp ("smooth", command))
- /* Toggle smoothing */
- ns->EMI_smooth = !ns->EMI_smooth;
- else
- /*bad value */;
-
- /*3. Next info */
- }
-
- strcpy (cmdback, "ExtendedInfoSet");
-
- if (ns->EMI_smooth)
- {
- strcat (cmdback, " ");
- strcat (cmdback, "smoothing");
- }
-
- ns->send_packet (cmdback);
-}
+//+GPL
/*
#define MSG_TYPE_BOOK 1
@@ -484,7 +429,7 @@
/* 1. Extract an info */
info = nextinfo;
- while ((info < len) && (buf[info] == ' '))
+ while ((info < len) && (buf [info] == ' '))
info++;
if (info >= len)
@@ -492,14 +437,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);
@@ -543,7 +489,7 @@
buf++;
}
- 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
@@ -745,7 +691,7 @@
static void
rangetostring (player *pl, char *obuf)
{
- dynbuf_text buf;
+ dynbuf_text &buf = msg_dynbuf; buf.clear ();
if (pl->ranged_ob)
buf << " Range" << (pl->ob->current_weapon == pl->ranged_ob ? "*" : "") << ": " << pl->ranged_ob->name;
@@ -986,30 +932,13 @@
return 0;
}
-/**
- * Returns the size of a data for a map square as returned by
- * mapextended. There are CLIENTMAPX*CLIENTMAPY*LAYERS entries
- * available.
- */
-int
-getExtendedMapInfoSize (client * ns)
-{
- int result = 0;
-
- if (ns->ext_mapinfos)
- {
- if (ns->EMI_smooth)
- result += 1; /*One byte for smoothlevel */
- }
-
- return result;
-}
+//-GPL
// prefetch (and touch) all maps within a specific distancd
static void
prefetch_surrounding_maps (maptile *map, int distance)
{
- map->last_access = runtime;
+ map->touch ();
if (--distance)
for (int dir = 4; --dir; )
@@ -1027,14 +956,16 @@
prefetch_surrounding_maps (op->map, 3);
}
+//+GPL
+
/**
* Draws client map.
*/
void
draw_client_map (player *pl)
{
- object *ob = pl->observe;
- if (!ob->active)
+ object *ob = pl->viewpoint;
+ if (!pl->observe->active)
return;
/* If player is just joining the game, he isn't here yet, so the map
@@ -1045,17 +976,13 @@
return;
int startlen, oldlen;
- int estartlen, eoldlen;
- uint8 eentrysize;
- uint16 ewhatstart, ewhatflag;
- uint8 extendedinfos;
check_map_change (pl);
prefetch_surrounding_maps (pl->ob);
/* do LOS after calls to update_position */
/* unfortunately, we need to udpate los when observing, currently */
- if (pl->do_los || pl->observe != pl->ob)
+ if (pl->do_los || pl->viewpoint != pl->ob)
{
pl->do_los = 0;
pl->update_los ();
@@ -1087,318 +1014,208 @@
client &socket = *pl->ns;
packet sl (socket.mapmode == Map1Cmd ? "map1" : "map1a");
- packet esl;
startlen = sl.length ();
- /*Extendedmapinfo structure initialisation */
- if (socket.ext_mapinfos)
- {
- extendedinfos = EMI_NOREDRAW;
-
- if (socket.EMI_smooth)
- extendedinfos |= EMI_SMOOTH;
-
- ewhatstart = esl.length ();
- ewhatflag = extendedinfos; /*The EMI_NOREDRAW bit
- could need to be taken away */
- eentrysize = getExtendedMapInfoSize (&socket);
- esl << "mapextended "
- << uint8 (extendedinfos)
- << uint8 (eentrysize);
-
- estartlen = esl.length ();
- }
-
- /* We could do this logic as conditionals in the if statement,
- * but that started to get a bit messy to look at.
- */
int hx = socket.mapx / 2;
int hy = socket.mapy / 2;
- for (int dx = -hx; dx <= hx; dx++)
- {
- sint16 nx, ny;
- maptile *m = 0;
-
- for (int dy = -hy; dy <= hy; dy++)
- {
- // check to see if we can simply go one down quickly
- if (m && ++ny >= m->height)
- m = 0;
-
- // no, so do it the slow way
- if (!m)
- {
- nx = ob->x + dx; ny = ob->y + dy; m = ob->map;
-
- if (xy_normalise (m, nx, ny))
- m->touch ();
- else
- m = 0;
- }
+ 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);
+ }
- int ax = dx + hx;
- int ay = dy + hy;
+ continue;
+ }
+
+ int d = pl->blocked_los_uc (dx, dy);
- int emask, mask;
- emask = mask = (ax & 0x3f) << 10 | (ay & 0x3f) << 4;
+ 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);
- MapCell &lastcell = socket.lastmap.cells[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
- */
- if (!m)
+ /* 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 ();
+
+ sl << uint16 (mask);
+
+ unsigned char dummy;
+ unsigned char *last_ext = &dummy;
+
+ /* Darkness changed */
+ if (lastcell.count != d)
+ {
+ mask |= 0x8;
+
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
+ sl << uint8 (d);
+ }
+
+ lastcell.count = d;
+
+ mapspace &ms = m->at (nx, ny);
+ ms.update ();
+
+ // 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)
{
- /* 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)
+ 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)))
{
- sl << uint16 (mask);
- 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
}
- continue;
- }
-
- int d = pl->blocked_los_uc (dx, dy);
+ if (expect_false (op->has_dialogue ()))
+ flags |= 1;
- if (d > 3)
- {
- int need_send = 0, count;
-
- /* This block deals with spaces that are not visible for whatever
- * reason. Still may need to send the head for this space.
- */
-
- oldlen = sl.length ();
-
- sl << uint16 (mask);
-
- if (lastcell.count != -1)
- need_send = 1;
-
- count = -1;
-
- if (lastcell.faces[0] || lastcell.faces[1] || lastcell.faces[2]
- || lastcell.stat_hp || lastcell.flags || lastcell.player)
- need_send = 1;
-
- /* properly clear a previously sent big face */
- map_clearcell (&lastcell, count);
-
- 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.
- */
-
- /* 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 ();
- eoldlen = esl.length ();
-
- sl << uint16 (mask);
- 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);
- }
+ if (expect_false (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 (stat_width > 1)
+ {
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
+
+ sl << uint8 (6) << uint8 (stat_width);
+ }
+ }
+
+ if (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))
+ {
+ lastcell.flags = flags;
+
+ mask |= 0x8;
+ *last_ext |= 0x80;
+ last_ext = &sl[sl.length ()];
+
+ sl << uint8 (8) << uint8 (flags);
+ }
+
+ // faces
+
+ /* 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;
- lastcell.count = d;
-
- mapspace &ms = m->at (nx, ny);
- ms.update ();
-
- if (socket.extmap)
- {
- 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)))
- {
- 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 (op->has_dialogue ())
- flags |= 1;
-
- if (op->type == PLAYER)
- player = op == ob ? pl->ob->count
- : op == pl->ob ? ob->count
- : 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 (stat_width > 1)
- {
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
-
- sl << uint8 (6) << uint8 (stat_width);
- }
- }
-
- if (lastcell.player != player)
- {
- lastcell.player = player;
-
- mask |= 0x8;
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
-
- sl << uint8 (0x47) << uint8 (4) << (uint32)player;
- }
-
- if (lastcell.flags != flags)
- {
- lastcell.flags = flags;
-
- mask |= 0x8;
- *last_ext |= 0x80;
- last_ext = &sl[sl.length ()];
-
- sl << uint8 (8) << uint8 (flags);
- }
- }
-
- /* 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 (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;
-
- mask |= 0x1;
- sl << uint16 (ob->face);
-
- socket.send_faces (ob);
- }
- }
- /* Top face */
- else if (update_space (sl, socket, ms, lastcell, 0))
mask |= 0x1;
+ sl << uint16 (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 (socket.ext_mapinfos)
- esl << uint16 (emask);
-
- if (socket.EMI_smooth)
- {
- for (int layer = 2+1; 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 smoothlevel to zero.
- int smoothlevel = ob && ob->face != blank_face ? ob->smoothlevel : 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 (lastcell.smooth[layer] != smoothlevel)
- {
- lastcell.smooth[layer] = smoothlevel;
- esl << uint8 (smoothlevel);
- emask |= 1 << layer;
- }
- }
-
- if (emask & 0xf)
- esl[eoldlen + 1] = emask & 0xff;
- else
- esl.reset (eoldlen);
- }
- } /* else this is a viewable space */
- } /* for x loop */
- } /* for y loop */
+ 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
socket.flush_fx ();
- /* 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;
- }
-
- if (esl.length () > estartlen)
- socket.send_packet (esl);
- }
-
if (sl.length () > startlen || socket.sent_scroll)
{
socket.send_packet (sl);
@@ -1651,3 +1468,5 @@
pl->ns->send_packet (sl);
}
+//-GPL
+