--- deliantra/server/socket/item.C 2006/12/14 20:39:54 1.20 +++ deliantra/server/socket/item.C 2006/12/19 05:12:52 1.25 @@ -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)) @@ -116,7 +115,7 @@ * animation of face to the client. */ static void -add_object_to_socklist (client_socket &ns, packet &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) { @@ -231,14 +229,15 @@ if (pl->contr->socket->look_position) { + char buf[80]; + snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); + sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) << 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); @@ -272,11 +271,9 @@ sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) << 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); @@ -303,7 +300,7 @@ sl << uint32 (0); got_one = 0; } - } /* If LOOK_OBJ() */ + } } if (got_one) @@ -363,7 +360,6 @@ if (got_one) pl->contr->socket->send_packet (sl); - } /** @@ -510,7 +506,7 @@ */ if (!op->env) { - pl->contr->socket->update_look = 1; + pl->contr->socket->floorbox_update (); return; } } @@ -528,7 +524,6 @@ pl->contr->socket->send_packet (sl); SET_FLAG (op, FLAG_CLIENT_SENT); - } /** @@ -576,7 +571,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; @@ -585,7 +580,7 @@ if (tmp->count == count) return tmp; - return NULL; + return 0; } @@ -610,7 +605,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) { @@ -626,7 +621,7 @@ if (tag & 0x80000000) { pl->socket->look_position = tag & 0x7fffffff; - pl->socket->update_look = 1; + pl->socket->floorbox_update (); return; } @@ -643,10 +638,10 @@ /** Client wants to apply 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) @@ -665,9 +660,9 @@ /** Client wants to apply 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) @@ -804,9 +799,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) @@ -833,8 +827,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); }