--- deliantra/server/socket/item.C 2006/12/14 01:12:35 1.15 +++ deliantra/server/socket/item.C 2006/12/20 01:19:11 1.27 @@ -32,11 +32,8 @@ * the logic for what items should be sent. */ - #include #include /* LOOK_OBJ */ -#include -#include #include /** This is the maximum number of bytes we expect any one item to take up */ @@ -50,7 +47,7 @@ /** * 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) @@ -61,36 +58,37 @@ { 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; + 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; @@ -101,6 +99,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)) @@ -111,12 +110,12 @@ 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]; @@ -189,11 +188,10 @@ /** - * 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) { @@ -201,13 +199,13 @@ int got_one = 0, start_look = 0, end_look = 0; char buf[MAX_BUF]; - if (!pl->contr->socket.update_look) + if (!pl->contr->socket->update_look) { LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); return; } else - pl->contr->socket.update_look = 0; + pl->contr->socket->update_look = 0; if (QUERY_FLAG (pl, FLAG_REMOVED) || !pl->map @@ -218,31 +216,31 @@ for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) ; - SockList sl (MAXSOCKBUF); - - pl->contr->socket.send_packet ("delinv 0"); + pl->contr->socket->send_packet ("delinv 0"); - sl.printf ("item%d ", pl->contr->socket.itemcmd); + packet sl; + sl.printf ("item%d ", pl->contr->socket->itemcmd); sl << uint32 (0); - if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) - esrv_send_face (&pl->contr->socket, empty_face->number, 0); + if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) + esrv_send_face (pl->contr->socket, empty_face->number, 0); - if (pl->contr->socket.look_position) + if (pl->contr->socket->look_position) { - sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) + char buf[80]; + snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); + + sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) << uint32 (0) << sint32 (-1) - << uint32 (empty_face->number); - - sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS); - - sl << uint16 (0) + << uint32 (empty_face->number) + << data8 (buf) + << uint16 (0) << uint8 (0) << uint32 (0); - if (pl->contr->socket.itemcmd == 2) + if (pl->contr->socket->itemcmd == 2) sl << uint16 (0); } @@ -259,28 +257,26 @@ if (LOOK_OBJ (tmp)) { - if (++start_look < pl->contr->socket.look_position) + if (++start_look < pl->contr->socket->look_position) continue; end_look++; - if (end_look > NUM_LOOK_OBJECTS) + if (end_look > FLOORBOX_PAGESIZE) { /* 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 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)) + sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) << uint32 (0) << uint32 ((uint32) - 1) - << uint32 (empty_face->number); - - sl.printf ("Click here to see next group of items"); - - sl << uint16 (0) + << uint32 (empty_face->number) + << data8 ("Apply this to see next group of items") + << uint16 (0) << uint8 (0) << uint32 (0); - if (pl->contr->socket.itemcmd == 2) + if (pl->contr->socket->itemcmd == 2) sl << uint16 (0); break; @@ -291,25 +287,24 @@ else head = tmp; - add_object_to_socklist (pl->contr->socket, sl, head); + add_object_to_socklist (*pl->contr->socket, sl, head); got_one++; - if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) + if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) { - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet (sl); sl.reset (); - sl.printf ("item%d ", pl->contr->socket.itemcmd); + sl.printf ("item%d ", pl->contr->socket->itemcmd); sl << uint32 (0); got_one = 0; } - } /* If LOOK_OBJ() */ + } } if (got_one) - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet (sl); - sl.free (); } /** @@ -321,13 +316,11 @@ object *tmp; int got_one = 0; - SockList sl (MAXSOCKBUF); - sl.printf ("delinv %d", op->count); - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet_printf ("delinv %d", op->count); - sl.reset (); - sl.printf ("item%d ", pl->contr->socket.itemcmd); + packet sl; + sl.printf ("item%d ", pl->contr->socket->itemcmd); sl << uint32 (op->count); @@ -342,7 +335,7 @@ if (LOOK_OBJ (head)) { - add_object_to_socklist (pl->contr->socket, sl, head); + add_object_to_socklist (*pl->contr->socket, sl, head); got_one++; @@ -350,11 +343,12 @@ * 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); + pl->contr->socket->send_packet (sl); + + sl.reset (); + sl.printf ("item%d ", pl->contr->socket->itemcmd); sl << uint32 (op->count); got_one = 0; } @@ -362,9 +356,7 @@ } if (got_one) - Send_With_Handling (&pl->contr->socket, &sl); - - sl.free (); + pl->contr->socket->send_packet (sl); } /** @@ -398,10 +390,9 @@ LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); } - SockList sl (MAXSOCKBUF); + packet sl ("upditem"); - sl << "upditem " - << uint8 (flags); + sl << uint8 (flags); if (op->head) op = op->head; @@ -426,8 +417,8 @@ 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); + if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) + esrv_send_face (pl->contr->socket, op->face->number, 0); sl << uint32 (op->face->number); } @@ -491,8 +482,7 @@ if (flags & UPD_NROF) sl << uint32 (op->nrof); - Send_With_Handling (&pl->contr->socket, &sl); - sl.free (); + pl->contr->socket->send_packet (sl); } /** @@ -512,26 +502,24 @@ */ if (!op->env) { - pl->contr->socket.update_look = 1; + pl->contr->socket->floorbox_update (); return; } } - SockList sl (MAXSOCKBUF); + packet sl; - sl.printf ("item%d ", pl->contr->socket.itemcmd); + sl.printf ("item%d ", pl->contr->socket->itemcmd); if (op->head) op = op->head; sl << uint32 (op->env ? op->env->count : 0); - add_object_to_socklist (pl->contr->socket, sl, op); + add_object_to_socklist (*pl->contr->socket, sl, op); - Send_With_Handling (&pl->contr->socket, &sl); + pl->contr->socket->send_packet (sl); SET_FLAG (op, FLAG_CLIENT_SENT); - - sl.free (); } /** @@ -542,13 +530,11 @@ void esrv_del_item (player *pl, int tag) { - SockList sl (MAXSOCKBUF); + packet sl ("delitem"); - sl << "delitem " - << uint32 (tag); + sl << uint32 (tag); - Send_With_Handling (&pl->socket, &sl); - sl.free (); + pl->socket->send_packet (sl); } @@ -580,7 +566,7 @@ 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) + if (op->head && op->head->count == count) return op; else if (op->count == count) return op; @@ -589,7 +575,7 @@ if (tmp->count == count) return tmp; - return NULL; + return 0; } @@ -614,7 +600,7 @@ examine (pl->ob, op); } -/** Client wants to apply some object. Lets do so. */ +/** Client wants to apply some object. Lets do so. */ void ApplyCmd (char *buf, int len, player *pl) { @@ -629,8 +615,8 @@ /* 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->socket->look_position = tag & 0x7fffffff; + pl->socket->floorbox_update (); return; } @@ -645,12 +631,12 @@ 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 = data[0]; - tag_t tag = net_uint32 (data + 1); + tag_t tag = net_uint32 ((uint8 *)data + 1); object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) @@ -667,11 +653,11 @@ 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) { - tag_t tag = net_uint32 (data); + tag_t tag = net_uint32 ((uint8 *)data); object *op = esrv_get_ob_from_count (pl->ob, tag); if (!op) @@ -765,10 +751,10 @@ } dy = atoi (cp); - if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) + 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]) + if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) return; look_at (pl->ob, dx, dy); @@ -808,9 +794,8 @@ esrv_update_item (UPD_WEIGHT, pl, op); } else - { - drop_object (pl, op, nrof); - } + drop_object (pl, op, nrof); + return; } else if (to == pl->count) @@ -837,8 +822,6 @@ * 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); - } + put_object_in_sack (pl, env, op, nrof); }