ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.20 by root, Thu Dec 14 20:39:54 2006 UTC vs.
Revision 1.23 by root, Fri Dec 15 19:59:20 2006 UTC

… …
33 */ 33 */
34 34
35 35
36#include <global.h> 36#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 37#include <object.h> /* LOOK_OBJ */
38#include <newclient.h>
39#include <newserver.h>
40#include <sproto.h> 38#include <sproto.h>
41 39
42/** This is the maximum number of bytes we expect any one item to take up */ 40/** This is the maximum number of bytes we expect any one item to take up */
43#define MAXITEMLEN 300 41#define MAXITEMLEN 300
44 42
… …
114/* Used in the send_look to put object head into packet 112/* Used in the send_look to put object head into packet
115 * sl for socket ns. Need socket to know if we need to send 113 * sl for socket ns. Need socket to know if we need to send
116 * animation of face to the client. 114 * animation of face to the client.
117 */ 115 */
118static void 116static void
119add_object_to_socklist (client_socket &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
120{ 118{
121 int flags, len, anim_speed; 119 int flags, len, anim_speed;
122 char item_n[MAX_BUF]; 120 char item_n[MAX_BUF];
123 const char *item_p; 121 const char *item_p;
124 122
… …
229 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))
230 esrv_send_face (pl->contr->socket, empty_face->number, 0); 228 esrv_send_face (pl->contr->socket, empty_face->number, 0);
231 229
232 if (pl->contr->socket->look_position) 230 if (pl->contr->socket->look_position)
233 { 231 {
232 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
234
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))
235 << uint32 (0) 236 << uint32 (0)
236 << sint32 (-1) 237 << sint32 (-1)
237 << uint32 (empty_face->number); 238 << uint32 (empty_face->number)
238 239 << data8 (buf)
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241 sl << uint16 (0) 240 << uint16 (0)
242 << uint8 (0) 241 << uint8 (0)
243 << uint32 (0); 242 << uint32 (0);
244 243
245 if (pl->contr->socket->itemcmd == 2) 244 if (pl->contr->socket->itemcmd == 2)
246 sl << uint16 (0); 245 sl << uint16 (0);
… …
270 * we notice the special tag the object has, and act accordingly. 269 * we notice the special tag the object has, and act accordingly.
271 */ 270 */
272 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) 271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
273 << uint32 (0) 272 << uint32 (0)
274 << uint32 ((uint32) - 1) 273 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number); 274 << uint32 (empty_face->number)
276 275 << data8 ("Apply this to see next group of items")
277 sl.printf ("Click here to see next group of items");
278
279 sl << uint16 (0) 276 << uint16 (0)
280 << uint8 (0) 277 << uint8 (0)
281 << uint32 (0); 278 << uint32 (0);
282 279
283 if (pl->contr->socket->itemcmd == 2) 280 if (pl->contr->socket->itemcmd == 2)
284 sl << uint16 (0); 281 sl << uint16 (0);
… …
641 player_apply (pl->ob, op, 0, 0); 638 player_apply (pl->ob, op, 0, 0);
642} 639}
643 640
644/** Client wants to apply some object. Lets do so. */ 641/** Client wants to apply some object. Lets do so. */
645void 642void
646LockItem (uint8 *data, int len, player *pl) 643LockItem (char *data, int len, player *pl)
647{ 644{
648 int flag = data[0]; 645 int flag = data[0];
649 tag_t tag = net_uint32 (data + 1); 646 tag_t tag = net_uint32 ((uint8 *)data + 1);
650 object *op = esrv_get_ob_from_count (pl->ob, tag); 647 object *op = esrv_get_ob_from_count (pl->ob, tag);
651 648
652 if (!op) 649 if (!op)
653 { 650 {
654 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 651 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
663 esrv_update_item (UPD_FLAGS, pl->ob, op); 660 esrv_update_item (UPD_FLAGS, pl->ob, op);
664} 661}
665 662
666/** Client wants to apply some object. Lets do so. */ 663/** Client wants to apply some object. Lets do so. */
667void 664void
668MarkItem (uint8 * data, int len, player *pl) 665MarkItem (char *data, int len, player *pl)
669{ 666{
670 tag_t tag = net_uint32 (data); 667 tag_t tag = net_uint32 ((uint8 *)data);
671 object *op = esrv_get_ob_from_count (pl->ob, tag); 668 object *op = esrv_get_ob_from_count (pl->ob, tag);
672 669
673 if (!op) 670 if (!op)
674 { 671 {
675 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 672 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines