--- deliantra/server/socket/item.C 2006/09/10 13:43:33 1.5
+++ deliantra/server/socket/item.C 2008/12/08 15:55:00 1.74
@@ -1,48 +1,39 @@
-
/*
- * static char *rcsid_item_c =
- * "$Id: item.C,v 1.5 2006/09/10 13:43:33 root Exp $";
+ * This file is part of Deliantra, the Roguelike Realtime MMORPG.
+ *
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
+ * Copyright (©) 1992,2007 Frank Tore Johansen
+ *
+ * Deliantra is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * 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 .
+ *
+ * The authors can be reached via e-mail to
*/
-/*
- CrossFire, A Multiplayer game for X-windows
-
- Copyright (C) 2002 Mark Wedel & Crossfire Development Team
- 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.
-
- The author can be reached via e-mail to crossfire-devel@real-time.com
-*/
-
/**
* \file
* Client/server logic.
*
* \date 2003-12-02
*
- * This containes item logic for client/server. It doesn't contain
+ * This contains item logic for client/server. It doesn't contain
* the actual commands that send the data, but does contain
* the logic for what items should be sent.
*/
-
#include
-#include /* LOOK_OBJ */
-#include
-#include
+#include
#include
/** This is the maximum number of bytes we expect any one item to take up */
@@ -55,29 +46,8 @@
******************************************************************************/
/**
- * Adds string to socklist.
- *
- * This is a simple function that we use a lot here. It basically
- * adds the specified buffer into the socklist, but prepends a
- * single byte in length. If the data is longer than that byte, it is
- * truncated approprately.
- */
-inline void
-add_stringlen_to_sockbuf (const char *buf, SockList * sl)
-{
- int len;
-
- len = strlen (buf);
- if (len > 255)
- len = 255;
- SockList_AddChar (sl, (char) len);
- strncpy ((char *) sl->buf + sl->len, buf, len);
- sl->len += len;
-}
-
-/**
* This is a similar to query_name, but returns flags
- * to be sended to client.
+ * to be sent to client.
*/
unsigned int
query_flags (object *op)
@@ -85,39 +55,38 @@
unsigned int flags = 0;
if (QUERY_FLAG (op, FLAG_APPLIED))
- {
- switch (op->type)
- {
- case BOW:
- case WAND:
- case ROD:
- case HORN:
- flags = a_readied;
- break;
- case WEAPON:
- flags = a_wielded;
- break;
- case SKILL:
- case ARMOUR:
- case HELMET:
- case SHIELD:
- case RING:
- case BOOTS:
- case GLOVES:
- case AMULET:
- case GIRDLE:
- case BRACERS:
- case CLOAK:
- flags = a_worn;
- break;
- case CONTAINER:
- flags = a_active;
- break;
- default:
- flags = a_applied;
- break;
- }
- }
+ switch (op->type)
+ {
+ case BOW:
+ case WAND:
+ case ROD:
+ case HORN:
+ flags = a_readied;
+ break;
+ case WEAPON:
+ flags = a_wielded;
+ break;
+ case SKILL:
+ case ARMOUR:
+ case HELMET:
+ case SHIELD:
+ case RING:
+ case BOOTS:
+ case GLOVES:
+ case AMULET:
+ case GIRDLE:
+ case BRACERS:
+ case CLOAK:
+ flags = a_worn;
+ break;
+ case CONTAINER:
+ flags = a_active;
+ break;
+ default:
+ flags = a_applied;
+ break;
+ }
+
if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
flags |= F_OPEN;
@@ -128,6 +97,7 @@
else if (QUERY_FLAG (op, FLAG_CURSED))
flags |= F_CURSED;
}
+
if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
flags |= F_MAGIC;
if (QUERY_FLAG (op, FLAG_UNPAID))
@@ -138,31 +108,32 @@
return flags;
}
-/* Used in the send_look to put object head into SockList
+/* Used in the send_look to put object head into packet
* sl for socket ns. Need socket to know if we need to send
* animation of face to the client.
*/
static void
-add_object_to_socklist (NewSocket * ns, SockList * sl, object *head)
+add_object_to_socklist (client &ns, packet &sl, object *head)
{
- int flags, len, anim_speed;
char item_n[MAX_BUF];
const char *item_p;
- flags = query_flags (head);
+ int flags = query_flags (head);
if (QUERY_FLAG (head, FLAG_NO_PICK))
flags |= F_NOPICK;
- if (!(ns->faces_sent[head->face->number] & NS_FACESENT_FACE))
- esrv_send_face (ns, head->face->number, 0);
+ ns.send_face (head->face, -50);
+ ns.flush_fx ();
+
+ if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
+ ns.send_animation (head->animation_id);
- if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns->anims_sent[head->animation_id])
- esrv_send_animation (ns, head->animation_id);
+ sl << uint32 (head->count)
+ << uint32 (flags)
+ << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
+ << uint32 (head->face);
- SockList_AddInt (sl, head->count);
- SockList_AddInt (sl, flags);
- SockList_AddInt (sl, QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head));
- SockList_AddInt (sl, head->face->number);
+ int len;
if (!head->custom_name)
{
@@ -178,151 +149,169 @@
len = strlen (item_n);
item_p = head->custom_name;
}
+
strncpy (item_n + len + 1, item_p, 127);
item_n[254] = 0;
len += strlen (item_n + 1 + len) + 1;
- SockList_AddChar (sl, (char) len);
- memcpy (sl->buf + sl->len, item_n, len);
- sl->len += len;
-
- SockList_AddShort (sl, head->animation_id);
- anim_speed = 0;
- if (QUERY_FLAG (head, FLAG_ANIMATE))
- {
- if (head->anim_speed)
- anim_speed = head->anim_speed;
- else
- {
- if (FABS (head->speed) < 0.001)
- anim_speed = 255;
- else if (FABS (head->speed) >= 1.0)
- anim_speed = 1;
- else
- anim_speed = (int) (1.0 / FABS (head->speed));
- }
- if (anim_speed > 255)
- anim_speed = 255;
- }
- SockList_AddChar (sl, (char) anim_speed);
- SockList_AddInt (sl, head->nrof);
- if (ns->itemcmd == 2)
- SockList_AddShort (sl, head->client_type);
+ sl << data8 (item_n, len)
+ << uint16 (head->animation_id);
+
+ int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
+ : head->anim_speed ? clamp (head->anim_speed, 1, 255)
+ : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
+
+ sl << uint8 (anim_speed)
+ << uint32 (head->nrof);
+
+ if (ns.itemcmd == 2)
+ sl << uint16 (head->client_type);
+}
+
+static faceidx
+need_face_now (player *pl, const char *name)
+{
+ faceidx face = face_find (name, empty_face);
+
+ pl->ns->send_face (face, -50);
+ pl->ns->flush_fx ();
- SET_FLAG (head, FLAG_CLIENT_SENT);
+ return face;
}
+#define FINGER_UP "finger_up.x11"
+#define FINGER_DOWN "finger_down.x11"
/**
- * Send the look window. Don't need to do animations here
- * This sends all the faces to the client, not just updates. This is
- * because object ordering would otherwise be inconsistent
+ * Send the look window. Don't need to do animations here
+ * This sends all the faces to the client, not just updates. This is
+ * because object ordering would otherwise be inconsistent.
*/
-
void
-esrv_draw_look (object *pl)
+esrv_draw_look (player *pl)
{
- object *tmp, *last;
- int got_one = 0, start_look = 0, end_look = 0;
- SockList sl;
- char buf[MAX_BUF];
+ object *ob = pl->ob;
- if (!pl->contr->socket.update_look)
+ if (!pl->ns->update_look)
{
- LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
+ LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
return;
}
- else
- {
- pl->contr->socket.update_look = 0;
- }
- if (QUERY_FLAG (pl, FLAG_REMOVED) || pl->map == NULL || pl->map->in_memory != MAP_IN_MEMORY || out_of_map (pl->map, pl->x, pl->y))
+ pl->ns->update_look = 0;
+
+ if (QUERY_FLAG (ob, FLAG_REMOVED)
+ || !ob->map
+ || ob->map->in_memory != MAP_ACTIVE
+ || out_of_map (ob->map, ob->x, ob->y))
return;
- for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above);
+ pl->ns->send_packet ("delinv 0");
+
+ packet sl;
+ sl.printf ("item%d ", pl->ns->itemcmd);
- sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
+ sl << uint32 (0);
- Write_String_To_Socket (&pl->contr->socket, "delinv 0", strlen ("delinv 0"));
- sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);
- sl.len = strlen ((char *) sl.buf);
+ int start_pos = pl->ns->look_position;
+ bool dirty = false;
- SockList_AddInt (&sl, 0);
+ mapspace &ms = ob->ms ();
- if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE))
- esrv_send_face (&pl->contr->socket, empty_face->number, 0);
+ // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
+ // start from the top
+ object *items [FLOORBOX_PAGESIZE];
+ int item_idx = 0, item_cnt = 0;
+ int pos = 0;
- if (pl->contr->socket.look_position)
+ // find our items by walking down
+ object *item = ms.top;
+
+ for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
{
- SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS));
- SockList_AddInt (&sl, 0);
- SockList_AddInt (&sl, (uint32) - 1);
- SockList_AddInt (&sl, empty_face->number);
- sprintf (buf, "Click here to see %d previous items", NUM_LOOK_OBJECTS);
- add_stringlen_to_sockbuf (buf, &sl);
- SockList_AddShort (&sl, 0);
- SockList_AddChar (&sl, 0);
- SockList_AddInt (&sl, 0);
- if (pl->contr->socket.itemcmd == 2)
- SockList_AddShort (&sl, 0);
+ if (!item->client_visible ())
+ continue;
+
+ if (++pos < start_pos)
+ continue;
+
+ // record item
+ items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
+ item_cnt++;
+
+ // stop at first floor
+ if (item->flag [FLAG_IS_FLOOR])
+ {
+ // we are finished, don't append "next group of items"
+ // by setting item to ms.bot it becomes zero which is checked after the while loop
+ item = ms.bot;
+ }
}
- for (last = NULL; tmp != last; tmp = tmp->below)
+ // see if there are more if we cared - we ignore invisible objects
+ if (item)
{
- object *head;
+ /* What we basically do is make a 'fake' object - when the user applies it,
+ * we notice the special tag the object has, and act accordingly.
+ */
+ sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
+ << uint32 (0)
+ << uint32 ((uint32) - 1)
+ << uint32 (need_face_now (pl, FINGER_DOWN))
+ << data8 ("Apply this to see the items below")
+ << uint16 (0)
+ << uint8 (0)
+ << uint32 (0);
+
+ if (pl->ns->itemcmd == 2)
+ sl << uint16 (0);
+
+ dirty = true;
+ }
- if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
+ // now send out all items in the ring buffer in reverse order
+ while (item_cnt)
+ {
+ --item_cnt;
+ item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
+ object *item = items [item_idx];
+
+ add_object_to_socklist (*pl->ns, sl, item->head_ ());
+
+ dirty = true;
+
+ // if packet got too large, send it and begin a new one
+ if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
{
- last = tmp->below; /* assumes double floor mode */
- if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
- last = last->below;
+ pl->ns->send_packet (sl);
+
+ sl.reset ();
+ sl.printf ("item%d ", pl->ns->itemcmd);
+ sl << uint32 (0);
+
+ dirty = false;
}
- if (LOOK_OBJ (tmp))
- {
- if (++start_look < pl->contr->socket.look_position)
- continue;
- end_look++;
- if (end_look > NUM_LOOK_OBJECTS)
- {
- /* What we basically do is make a 'fake' object - when the user applies it,
- * we notice the special tag the object has, and act accordingly.
- */
- SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS));
- SockList_AddInt (&sl, 0);
- SockList_AddInt (&sl, (uint32) - 1);
- SockList_AddInt (&sl, empty_face->number);
- sprintf (buf, "Click here to see next group of items");
- add_stringlen_to_sockbuf (buf, &sl);
- SockList_AddShort (&sl, 0);
- SockList_AddChar (&sl, 0);
- SockList_AddInt (&sl, 0);
- if (pl->contr->socket.itemcmd == 2)
- SockList_AddShort (&sl, 0);
- break;
- }
- if (tmp->head)
- head = tmp->head;
- else
- head = tmp;
+ }
+
+ if (start_pos)
+ {
+ sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
+ << uint32 (0)
+ << sint32 (-1)
+ << uint32 (need_face_now (pl, FINGER_UP))
+ << data8 ("Apply this to see the items higher up")
+ << uint16 (0)
+ << uint8 (0)
+ << uint32 (0);
- add_object_to_socklist (&pl->contr->socket, &sl, head);
- got_one++;
+ if (pl->ns->itemcmd == 2)
+ sl << uint16 (0);
- if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))
- {
- Send_With_Handling (&pl->contr->socket, &sl);
- sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);
- sl.len = strlen ((char *) sl.buf);
- SockList_AddInt (&sl, 0);
- got_one = 0;
- }
- } /* If LOOK_OBJ() */
+ dirty = true;
}
- if (got_one)
- Send_With_Handling (&pl->contr->socket, &sl);
- free (sl.buf);
+ if (dirty)
+ pl->ns->send_packet (sl);
}
/**
@@ -331,22 +320,19 @@
void
esrv_send_inventory (object *pl, object *op)
{
- object *tmp;
- int got_one = 0;
- SockList sl;
+ if (!pl->contr->ns)//D
+ return;
- sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
+ int got_one = 0;
- sprintf ((char *) sl.buf, "delinv %d", op->count);
- sl.len = strlen ((char *) sl.buf);
- Send_With_Handling (&pl->contr->socket, &sl);
+ pl->contr->ns->send_packet_printf ("delinv %d", op->count);
- sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);
- sl.len = strlen ((char *) sl.buf);
+ packet sl;
+ sl.printf ("item%d ", pl->contr->ns->itemcmd);
- SockList_AddInt (&sl, op->count);
+ sl << uint32 (op->count);
- for (tmp = op->inv; tmp; tmp = tmp->below)
+ for (object *tmp = op->inv; tmp; tmp = tmp->below)
{
object *head;
@@ -355,9 +341,9 @@
else
head = tmp;
- if (LOOK_OBJ (head))
+ if (head->client_visible ())
{
- add_object_to_socklist (&pl->contr->socket, &sl, head);
+ add_object_to_socklist (*pl->contr->ns, sl, head);
got_one++;
@@ -365,19 +351,20 @@
* items (especially with some of the bags out there) to
* overflow the buffer. IF so, send multiple item commands.
*/
- if (sl.len >= (MAXSOCKBUF - MAXITEMLEN))
+ if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
{
- Send_With_Handling (&pl->contr->socket, &sl);
- sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);
- sl.len = strlen ((char *) sl.buf);
- SockList_AddInt (&sl, op->count);
+ pl->contr->ns->send_packet (sl);
+
+ sl.reset ();
+ sl.printf ("item%d ", pl->contr->ns->itemcmd);
+ sl << uint32 (op->count);
got_one = 0;
}
- } /* If LOOK_OBJ() */
+ }
}
+
if (got_one)
- Send_With_Handling (&pl->contr->socket, &sl);
- free (sl.buf);
+ pl->contr->ns->send_packet (sl);
}
/**
@@ -387,65 +374,48 @@
* to the client (as defined in newclient.h - might as well use the
* same value both places.
*/
-
void
esrv_update_item (int flags, object *pl, object *op)
{
- SockList sl;
-
/* If we have a request to send the player item, skip a few checks. */
- if (op != pl)
- {
- if (!LOOK_OBJ (op))
- return;
- /* we remove the check for op->env, because in theory, the object
- * is hopefully in the same place, so the client should preserve
- * order.
- */
- }
- if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
- {
- /* FLAG_CLIENT_SENT is debug only. We are using it to see where
- * this is happening - we can set a breakpoint here in the debugger
- * and track back the call.
- */
- LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
- }
- sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
+ if (op != pl && !op->client_visible ())
+ return;
- strcpy ((char *) sl.buf, "upditem ");
- sl.len = strlen ((char *) sl.buf);
+ client *ns = pl->contr->ns;
+ if (!ns)
+ return;
+
+ packet sl ("upditem");
- SockList_AddChar (&sl, (char) flags);
+ sl << uint8 (flags);
- if (op->head)
- op = op->head;
+ op = op->head_ ();
- SockList_AddInt (&sl, op->count);
+ sl << uint32 (op->count);
if (flags & UPD_LOCATION)
- SockList_AddInt (&sl, op->env ? op->env->count : 0);
+ sl << uint32 (op->env ? op->env->count : 0);
if (flags & UPD_FLAGS)
- SockList_AddInt (&sl, query_flags (op));
+ sl << uint32 (query_flags (op));
if (flags & UPD_WEIGHT)
{
- sint32 weight = WEIGHT (op);
+ sint32 weight = op->client_weight ();
- SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
- if (pl == op)
- {
- op->contr->last_weight = weight;
- }
+ if (op == pl)
+ ns->last_weight = weight;
+
+ sl << uint32 (weight);
}
if (flags & UPD_FACE)
{
- if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE))
- esrv_send_face (&pl->contr->socket, op->face->number, 0);
- SockList_AddInt (&sl, op->face->number);
+ ns->send_face (op->face, -50);
+ ns->flush_fx ();
+ sl << uint32 (op->face);
}
+
if (flags & UPD_NAME)
{
int len;
@@ -470,12 +440,12 @@
strncpy (item_n + len + 1, item_p, 127);
item_n[254] = 0;
len += strlen (item_n + 1 + len) + 1;
- SockList_AddChar (&sl, (char) len);
- memcpy (sl.buf + sl.len, item_n, len);
- sl.len += len;
+
+ sl << data8 (item_n, len);
}
+
if (flags & UPD_ANIM)
- SockList_AddShort (&sl, op->animation_id);
+ sl << uint16 (op->animation_id);
if (flags & UPD_ANIMSPEED)
{
@@ -487,23 +457,25 @@
anim_speed = op->anim_speed;
else
{
- if (FABS (op->speed) < 0.001)
+ if (fabs (op->speed) < 0.001)
anim_speed = 255;
- else if (FABS (op->speed) >= 1.0)
+ else if (fabs (op->speed) >= 1.0)
anim_speed = 1;
else
- anim_speed = (int) (1.0 / FABS (op->speed));
+ anim_speed = (int) (1.0 / fabs (op->speed));
}
+
if (anim_speed > 255)
anim_speed = 255;
}
- SockList_AddChar (&sl, (char) anim_speed);
+
+ sl << uint8 (anim_speed);
}
+
if (flags & UPD_NROF)
- SockList_AddInt (&sl, op->nrof);
+ sl << uint32 (op->nrof);
- Send_With_Handling (&pl->contr->socket, &sl);
- free (sl.buf);
+ pl->contr->ns->send_packet (sl);
}
/**
@@ -512,59 +484,40 @@
void
esrv_send_item (object *pl, object *op)
{
- SockList sl;
+ if (!pl->contr->ns)
+ return;
- /* If this is not the player object, do some more checks */
- if (op != pl)
- {
- /* We only send 'visibile' objects to the client */
- if (!LOOK_OBJ (op))
- return;
- /* if the item is on the ground, mark that the look needs to
- * be updated.
- */
- if (!op->env)
- {
- pl->contr->socket.update_look = 1;
- return;
- }
- }
+ /* We only send 'visible' objects to the client, and sometimes the player */
+ if (!op->client_visible () && op->type != PLAYER)
+ return;
- sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
+ packet sl;
- sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd);
- sl.len = strlen ((char *) sl.buf);
+ sl.printf ("item%d ", pl->contr->ns->itemcmd);
- if (op->head)
- op = op->head;
+ op = op->head_ ();
- SockList_AddInt (&sl, op->env ? op->env->count : 0);
+ sl << uint32 (op->env ? op->env->count : 0);
- add_object_to_socklist (&pl->contr->socket, &sl, op);
+ add_object_to_socklist (*pl->contr->ns, sl, op);
- Send_With_Handling (&pl->contr->socket, &sl);
- SET_FLAG (op, FLAG_CLIENT_SENT);
- free (sl.buf);
+ pl->contr->ns->send_packet (sl);
}
/**
- * Tells the client to delete an item. Uses the item
- * command with a -1 location.
+ * Tells the client to delete an item.
*/
-
void
esrv_del_item (player *pl, int tag)
{
- SockList sl;
+ if (!pl->ns)
+ return;
- sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
+ packet sl ("delitem");
- strcpy ((char *) sl.buf, "delitem ");
- sl.len = strlen ((char *) sl.buf);
- SockList_AddInt (&sl, tag);
+ sl << uint32 (tag);
- Send_With_Handling (&pl->socket, &sl);
- free (sl.buf);
+ pl->ns->send_packet (sl);
}
@@ -578,42 +531,53 @@
* Takes a player and object count (tag) and returns the actual object
* pointer, or null if it can't be found.
*/
-
object *
esrv_get_ob_from_count (object *pl, tag_t count)
{
- object *op, *tmp;
-
if (pl->count == count)
return pl;
- for (op = pl->inv; op; op = op->below)
+ for (object *op = pl->inv; op; op = op->below)
if (op->count == count)
return op;
else if (op->type == CONTAINER && pl->container == op)
- for (tmp = op->inv; tmp; tmp = tmp->below)
+ for (object *tmp = op->inv; tmp; tmp = tmp->below)
if (tmp->count == count)
return tmp;
- for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
- if (op->head != NULL && op->head->count == count)
+ for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
+ if (op->head && op->head->count == count)
return op;
else if (op->count == count)
return op;
else if (op->type == CONTAINER && pl->container == op)
- for (tmp = op->inv; tmp; tmp = tmp->below)
+ for (object *tmp = op->inv; tmp; tmp = tmp->below)
if (tmp->count == count)
return tmp;
- return NULL;
-}
+#if 0
+ /* If the high bit is set, player examined a pseudo object. */
+ if (count & 0x80000000)
+ return 0;
+#endif
+ return 0;
+}
/** Client wants to examine some object. So lets do so. */
void
ExamineCmd (char *buf, int len, player *pl)
{
- long tag = atoi (buf);
+ tag_t tag = atoi (buf);
+
+ /* If the high bit is set, player applied a pseudo object. */
+ if (tag & 0x80000000)
+ {
+ pl->ns->look_position = tag & 0x7fffffff;
+ pl->ns->floorbox_update ();
+ return;
+ }
+
object *op = esrv_get_ob_from_count (pl->ob, tag);
if (!op)
@@ -621,178 +585,168 @@
LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
return;
}
+
examine (pl->ob, op);
}
-/** Client wants to apply some object. Lets do so. */
+/** Client wants to examine some object. So lets do so. */
void
-ApplyCmd (char *buf, int len, player *pl)
+ExCmd (char *buf, int len, player *pl)
{
- uint32 tag = atoi (buf);
- object *op = esrv_get_ob_from_count (pl->ob, tag);
+ tag_t tag = atoi (buf);
- /* sort of a hack, but if the player saves and the player then manually
- * applies a savebed (or otherwise tries to do stuff), we run into trouble.
- */
- if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
- return;
+ if (object *op = esrv_get_ob_from_count (pl->ob, tag))
+ {
+ std::string s = op->describe (pl->ob);
+
+ packet sl ("ex");
+ sl << ber32 (tag)
+ << data (*pl->expand_cfpod (s.c_str ()));
+
+ pl->ns->send_packet (sl);
+ }
+}
+
+/** Client wants to apply some object. Lets do so. */
+void
+ApplyCmd (char *buf, int len, player *pl)
+{
+ tag_t tag = atoi (buf);
/* If the high bit is set, player applied a pseudo object. */
if (tag & 0x80000000)
{
- pl->socket.look_position = tag & 0x7fffffff;
- pl->socket.update_look = 1;
+ pl->ns->look_position = tag & 0x7fffffff;
+ pl->ns->floorbox_update ();
return;
}
+ object *op = esrv_get_ob_from_count (pl->ob, tag);
+
if (!op)
{
LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
return;
}
+
player_apply (pl->ob, op, 0, 0);
}
-/** Client wants to apply some object. Lets do so. */
+/** Client wants to lock some object. Lets do so. */
void
-LockItem (uint8 * data, int len, player *pl)
+LockItem (char *data, int len, player *pl)
{
- int flag, tag;
- object *op;
-
- flag = data[0];
- tag = GetInt_String (data + 1);
- op = esrv_get_ob_from_count (pl->ob, tag);
+ int flag = data[0];
+ tag_t tag = net_uint32 ((uint8 *)data + 1);
+ object *op = esrv_get_ob_from_count (pl->ob, tag);
if (!op)
{
- new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
+ pl->failmsg ("Could not find object to lock/unlock");
return;
}
+
if (!flag)
CLEAR_FLAG (op, FLAG_INV_LOCKED);
else
SET_FLAG (op, FLAG_INV_LOCKED);
+
esrv_update_item (UPD_FLAGS, pl->ob, op);
}
-/** Client wants to apply some object. Lets do so. */
+/** Client wants to mark some object. Lets do so. */
void
-MarkItem (uint8 * data, int len, player *pl)
+MarkItem (char *data, int len, player *pl)
{
- int tag;
- object *op;
+ tag_t tag = net_uint32 ((uint8 *)data);
+ object *op = esrv_get_ob_from_count (pl->ob, tag);
- tag = GetInt_String (data);
- op = esrv_get_ob_from_count (pl->ob, tag);
if (!op)
{
- new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
+ pl->failmsg ("Could not find object to mark");
return;
}
+
pl->mark = op;
- pl->mark_count = op->count;
- new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));
+ pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
}
-
/**
* look_at prints items on the specified square.
*
* [ removed EARTHWALL check and added check for containers inventory.
* Tero.Haatanen@lut.fi ]
*/
-void
-look_at (object *op, int dx, int dy)
+static void
+look_at (player *pl, int dx, int dy)
{
- object *tmp;
- int flag = 0;
- sint16 x, y;
- mapstruct *m;
-
- x = op->x + dx;
- y = op->y + dy;
+ dynbuf_text buf;
+ object *ob = pl->ob;
- if (out_of_map (op->map, x, y))
+ if (!pl->observe->map)
return;
- m = get_map_from_coord (op->map, &x, &y);
- if (!m)
- return;
+ mapxy pos (pl->observe);
+ pos.move (dx, dy);
- for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
+ if (pos.normalise ())
+ for (object *tmp = pos->top; tmp; tmp = tmp->below)
+ {
+ if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
+ continue;
+
+ if (QUERY_FLAG (ob, FLAG_WIZ))
+ buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
+ else
+ buf.printf (" - %s.\n", query_name (tmp));
+
+ object *head = tmp->head_ ();
+
+ if (head->inv)
+ if ((head->type != CONTAINER && head->type != FLESH)
+ || QUERY_FLAG (ob, FLAG_WIZ))
+ buf << head->query_inventory (ob, " ");
+
+ if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
+ break;
+ }
- for (; tmp != NULL; tmp = tmp->below)
- {
- if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
- continue;
-
- if (!flag)
- {
- if (dx || dy)
- new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
- else
- {
- clear_win_info (op);
- new_draw_info (NDI_UNIQUE, 0, op, "You see:");
- }
- flag = 1;
- }
-
- if (QUERY_FLAG (op, FLAG_WIZ))
- new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
- else
- new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
-
- if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
- (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
- inventory (op, tmp->head == NULL ? tmp : tmp->head);
-
- if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
- break;
- }
-
- if (!flag)
- {
- if (dx || dy)
- new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
- else
- new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
- }
+ if (buf.empty ())
+ pl->failmsg ("You see nothing there.");
+ else
+ pl->infobox (MSG_CHANNEL ("lookat"), buf);
}
-
-
/** Client wants to look at some object. Lets do so. */
void
LookAt (char *buf, int len, player *pl)
{
- int dx, dy;
char *cp;
- dx = atoi (buf);
+ int dx = atoi (buf);
if (!(cp = strchr (buf, ' ')))
- {
- return;
- }
- dy = atoi (cp);
-
- if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2)
return;
- if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2])
- return;
+ int dy = atoi (cp);
+
+ if (player *opl = pl->observe->contr)
+ if (client *ns = opl->ns)
+ {
+ if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
+ return;
- look_at (pl->ob, dx, dy);
+ if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2] >= LOS_MAX)
+ return;
+ }
+
+ look_at (pl, dx, dy);
}
/** Move an object to a new location */
void
esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
{
- object *op, *env;
-
- op = esrv_get_ob_from_count (pl, tag);
+ object *op = esrv_get_ob_from_count (pl, tag);
if (!op)
{
LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
@@ -801,33 +755,29 @@
if (!to)
{ /* drop it to the ground */
-
-/* LOG(llevDebug, "Drop it on the ground.\n");*/
-
if (op->map && !op->env)
- {
+ return;
-/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
- return;
- }
/* If it is an active container, then we should drop all objects
* in the container and not the container itself.
*/
if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
{
- object *current, *next;
+ int cnt = MAX_ITEM_PER_DROP;
- for (current = op->inv; current != NULL; current = next)
+ for (object *current = op->inv; current && cnt--; )
{
- next = current->below;
+ object *next = current->below;
drop_object (pl, current, 0);
+ current = next;
}
- esrv_update_item (UPD_WEIGHT, pl, op);
+
+ if (cnt <= 0)
+ op->failmsg ("Only dropped some items, can't drop that many items at once.");
}
else
- {
- drop_object (pl, op, nrof);
- }
+ drop_object (pl, op, nrof);
+
return;
}
else if (to == pl->count)
@@ -840,19 +790,22 @@
pick_up (pl, op);
return;
}
- env = esrv_get_ob_from_count (pl, to);
+
+ object *env = esrv_get_ob_from_count (pl, to);
if (!env)
{
LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
return;
}
+
/* put_object_in_sack presumes that necessary sanity checking
* has already been done (eg, it can be picked up and fits in
* in a sack, so check for those things. We should also check
* an make sure env is in fact a container for that matter.
*/
- if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
- {
- put_object_in_sack (pl, env, op, nrof);
- }
+ if (env->type == CONTAINER
+ && can_pick (pl, op)
+ && sack_can_hold (pl, env, op, nrof))
+ put_object_in_sack (pl, env, op, nrof);
}
+