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.13 by root, Thu Dec 14 00:13:26 2006 UTC vs.
Revision 1.31 by root, Mon Jan 8 18:18:36 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 CrossFire, A Multiplayer game for X-windows
3 3
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 Copyright (C) 1992 Frank Tore Johansen
6 7
7 This program is free software; you can redistribute it and/or modify 8 This program is free software; you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 it under the terms of the GNU General Public License as published by
… …
30 * This containes item logic for client/server. It doesn't contain 31 * This containes item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 32 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 33 * the logic for what items should be sent.
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
42
43#if 0
44tag_t
45client_container::tag () const
46{
47 switch (type)
48 {
49 case CC_INVENTORY:
50 return ns->pl->count;
51 case CC_MAPSPACE:
52 return 0;
53 case CC_CONTAINER:
54 return env->count;
55 }
56
57 abort ();
58}
59
60void
61client_container::clear ()
62{
63 switch (type)
64 {
65 case CC_INVENTORY:
66 abort ();
67
68 case CC_MAPSPACE:
69 case CC_CONTAINER:
70 ns->send_packet_printf ("delinv %d", tag ());
71 break;
72 }
73
74 for (iterator i = begin (); i != end (); ++i)
75 i->op->seen_by = 0;
76
77 vector< refitem, slice_allocator<refitem> >::clear ();
78}
79
80inline iterator
81client_container::merge_item (iterator i, object *op)
82{
83 if (i != end () && i->op == op)
84 return ++i;
85
86 if (op->seen_by)
87 return; // seen by another entity already
88
89 op->seen_by = this;
90
91 refitem ref;
92 ref.op = op;
93
94 return insert (i, ref);
95}
96
97void
98client_container::update (int offset)
99{
100 iterator i = begin ();
101
102 switch (type)
103 {
104 case CC_INVENTORY:
105 case CC_CONTAINER:
106 {
107 object *env = type == CC_INVENTORY
108 ? ns->pl->ob
109 : this->env;
110
111 // pass 1, erase all objects no longer in container
112 for (iterator j = begin (); j != end (); ++j)
113 if (j->op->env != env)
114 {
115 j->op->seen_by = 0;
116 erase (j);
117 }
118
119 // pass 2 merge items
120 for (object *op = env->inv; op; op = op->below)
121 {
122 if (--offset < 0)
123 i = merge_item (i, op);
124 else if (offset < -FLOORBOX_PAGESIZE)
125 break;
126 }
127 }
128 break;
129
130 case CC_MAPSPACE:
131 {
132 // pass 1, erase all objects no longer on space
133 for (iterator j = begin (); j != end (); ++j)
134 if (j->op->x != x || j->op->y != y || j->op->map != map)
135 {
136 j->op->seen_by = 0;
137 erase (j);
138 }
139
140 // pass 2 merge items
141 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
142 {
143 if (--offset < 0)
144 i = merge_item (i, op);
145 else if (offset < -FLOORBOX_PAGESIZE)
146 break;
147 }
148 }
149 break;
150 }
151
152 // pass 3, erase all extra items
153 for (iterator j = i; j != end (); ++j)
154 j->op->seen_by = 0;
155
156 if (i != end ())
157 erase (i, end ());
158}
159
160void
161client_container::set_mapspace (maptile *map, int x, int y)
162{
163 if (type == CC_MAPSPACE
164 && this->map == map
165 && this->x == x
166 && this->y == y)
167 return;
168
169 clear ();
170
171 type = CC_MAPSPACE;
172 this->map = map;
173 this->x = x;
174 this->y = y;
175}
176
177void
178client_container::set_container (object *env)
179{
180}
181#endif
44 182
45/******************************************************************************* 183/*******************************************************************************
46 * 184 *
47 * Functions related to sending object data to the client. 185 * Functions related to sending object data to the client.
48 * 186 *
49 ******************************************************************************/ 187 ******************************************************************************/
50 188
51/** 189/**
52 * Adds string to socklist.
53 *
54 * This is a simple function that we use a lot here. It basically
55 * adds the specified buffer into the socklist, but prepends a
56 * single byte in length. If the data is longer than that byte, it is
57 * truncated approprately.
58 */
59inline void
60add_stringlen_to_sockbuf (const char *buf, SockList * sl)
61{
62 int len;
63
64 len = strlen (buf);
65 if (len > 255)
66 len = 255;
67 SockList_AddChar (sl, (char) len);
68 strncpy ((char *) sl->buf + sl->len, buf, len);
69 sl->len += len;
70}
71
72/**
73 * This is a similar to query_name, but returns flags 190 * This is a similar to query_name, but returns flags
74 * to be sended to client. 191 * to be sent to client.
75 */ 192 */
76unsigned int 193unsigned int
77query_flags (object *op) 194query_flags (object *op)
78{ 195{
79 unsigned int flags = 0; 196 unsigned int flags = 0;
80 197
81 if (QUERY_FLAG (op, FLAG_APPLIED)) 198 if (QUERY_FLAG (op, FLAG_APPLIED))
82 { 199 {
83 switch (op->type) 200 switch (op->type)
84 { 201 {
85 case BOW: 202 case BOW:
86 case WAND: 203 case WAND:
87 case ROD: 204 case ROD:
88 case HORN: 205 case HORN:
89 flags = a_readied; 206 flags = a_readied;
90 break; 207 break;
91 case WEAPON: 208 case WEAPON:
92 flags = a_wielded; 209 flags = a_wielded;
93 break; 210 break;
94 case SKILL: 211 case SKILL:
95 case ARMOUR: 212 case ARMOUR:
96 case HELMET: 213 case HELMET:
97 case SHIELD: 214 case SHIELD:
98 case RING: 215 case RING:
99 case BOOTS: 216 case BOOTS:
100 case GLOVES: 217 case GLOVES:
101 case AMULET: 218 case AMULET:
102 case GIRDLE: 219 case GIRDLE:
103 case BRACERS: 220 case BRACERS:
104 case CLOAK: 221 case CLOAK:
105 flags = a_worn; 222 flags = a_worn;
106 break; 223 break;
107 case CONTAINER: 224 case CONTAINER:
108 flags = a_active; 225 flags = a_active;
109 break; 226 break;
110 default: 227 default:
111 flags = a_applied; 228 flags = a_applied;
112 break; 229 break;
113 } 230 }
114 } 231 }
232
115 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
116 flags |= F_OPEN; 234 flags |= F_OPEN;
117 235
118 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
119 { 237 {
120 if (QUERY_FLAG (op, FLAG_DAMNED)) 238 if (QUERY_FLAG (op, FLAG_DAMNED))
121 flags |= F_DAMNED; 239 flags |= F_DAMNED;
122 else if (QUERY_FLAG (op, FLAG_CURSED)) 240 else if (QUERY_FLAG (op, FLAG_CURSED))
123 flags |= F_CURSED; 241 flags |= F_CURSED;
124 } 242 }
243
125 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 244 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
126 flags |= F_MAGIC; 245 flags |= F_MAGIC;
127 if (QUERY_FLAG (op, FLAG_UNPAID)) 246 if (QUERY_FLAG (op, FLAG_UNPAID))
128 flags |= F_UNPAID; 247 flags |= F_UNPAID;
129 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 248 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
130 flags |= F_LOCKED; 249 flags |= F_LOCKED;
131 250
132 return flags; 251 return flags;
133} 252}
134 253
135/* Used in the send_look to put object head into SockList 254/* Used in the send_look to put object head into packet
136 * sl for socket ns. Need socket to know if we need to send 255 * sl for socket ns. Need socket to know if we need to send
137 * animation of face to the client. 256 * animation of face to the client.
138 */ 257 */
139static void 258static void
140add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 259add_object_to_socklist (client &ns, packet &sl, object *head)
141{ 260{
142 int flags, len, anim_speed; 261 int flags, len, anim_speed;
143 char item_n[MAX_BUF]; 262 char item_n[MAX_BUF];
144 const char *item_p; 263 const char *item_p;
145 264
… …
208 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
209} 328}
210 329
211 330
212/** 331/**
213 * Send the look window. Don't need to do animations here 332 * Send the look window. Don't need to do animations here
214 * This sends all the faces to the client, not just updates. This is 333 * This sends all the faces to the client, not just updates. This is
215 * because object ordering would otherwise be inconsistent 334 * because object ordering would otherwise be inconsistent.
216 */ 335 */
217
218void 336void
219esrv_draw_look (object *pl) 337esrv_draw_look (object *pl)
220{ 338{
221 object *tmp, *last; 339 object *tmp, *last;
222 int got_one = 0, start_look = 0, end_look = 0; 340 int got_one = 0, start_look = 0, end_look = 0;
223 char buf[MAX_BUF]; 341 char buf[MAX_BUF];
224 342
225 if (!pl->contr->socket.update_look) 343 if (!pl->contr->ns->update_look)
226 { 344 {
227 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 345 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
228 return; 346 return;
229 } 347 }
230 else 348 else
231 pl->contr->socket.update_look = 0; 349 pl->contr->ns->update_look = 0;
232 350
233 if (QUERY_FLAG (pl, FLAG_REMOVED) 351 if (QUERY_FLAG (pl, FLAG_REMOVED)
234 || !pl->map 352 || !pl->map
235 || pl->map->in_memory != MAP_IN_MEMORY 353 || pl->map->in_memory != MAP_IN_MEMORY
236 || out_of_map (pl->map, pl->x, pl->y)) 354 || out_of_map (pl->map, pl->x, pl->y))
237 return; 355 return;
238 356
239 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above); 357 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
358 ;
240 359
241 SockList sl (MAXSOCKBUF); 360 pl->contr->ns->send_packet ("delinv 0");
242 361
243 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1); 362 packet sl;
244
245 sl.printf ("item%d ", pl->contr->socket.itemcmd); 363 sl.printf ("item%d ", pl->contr->ns->itemcmd);
246 364
247 sl << uint32 (0); 365 sl << uint32 (0);
248 366
249 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
250 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 368 esrv_send_face (pl->contr->ns, empty_face->number, 0);
251 369
252 if (pl->contr->socket.look_position) 370 if (pl->contr->ns->look_position)
253 { 371 {
372 char buf[80];
373 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
374
254 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
255 << uint32 (0) 376 << uint32 (0)
256 << sint32 (-1) 377 << sint32 (-1)
257 << uint32 (empty_face->number); 378 << uint32 (empty_face->number)
258 379 << data8 (buf)
259 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261 sl << uint16 (0) 380 << uint16 (0)
262 << uint8 (0) 381 << uint8 (0)
263 << uint32 (0); 382 << uint32 (0);
264 383
265 if (pl->contr->socket.itemcmd == 2) 384 if (pl->contr->ns->itemcmd == 2)
266 sl << uint16 (0); 385 sl << uint16 (0);
267 } 386 }
268 387
269 for (last = NULL; tmp != last; tmp = tmp->below) 388 for (last = NULL; tmp != last; tmp = tmp->below)
270 { 389 {
… …
277 last = last->below; 396 last = last->below;
278 } 397 }
279 398
280 if (LOOK_OBJ (tmp)) 399 if (LOOK_OBJ (tmp))
281 { 400 {
282 if (++start_look < pl->contr->socket.look_position) 401 if (++start_look < pl->contr->ns->look_position)
283 continue; 402 continue;
284 403
285 end_look++; 404 end_look++;
286 405
287 if (end_look > NUM_LOOK_OBJECTS) 406 if (end_look > FLOORBOX_PAGESIZE)
288 { 407 {
289 /* What we basically do is make a 'fake' object - when the user applies it, 408 /* What we basically do is make a 'fake' object - when the user applies it,
290 * we notice the special tag the object has, and act accordingly. 409 * we notice the special tag the object has, and act accordingly.
291 */ 410 */
292 SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); 411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
293 SockList_AddInt (&sl, 0); 412 << uint32 (0)
294 SockList_AddInt (&sl, (uint32) - 1); 413 << uint32 ((uint32) - 1)
295 SockList_AddInt (&sl, empty_face->number); 414 << uint32 (empty_face->number)
296 sprintf (buf, "Click here to see next group of items"); 415 << data8 ("Apply this to see next group of items")
297 add_stringlen_to_sockbuf (buf, &sl); 416 << uint16 (0)
298 SockList_AddShort (&sl, 0); 417 << uint8 (0)
299 SockList_AddChar (&sl, 0); 418 << uint32 (0);
300 SockList_AddInt (&sl, 0); 419
301 if (pl->contr->socket.itemcmd == 2) 420 if (pl->contr->ns->itemcmd == 2)
302 SockList_AddShort (&sl, 0); 421 sl << uint16 (0);
422
303 break; 423 break;
304 } 424 }
425
305 if (tmp->head) 426 if (tmp->head)
306 head = tmp->head; 427 head = tmp->head;
307 else 428 else
308 head = tmp; 429 head = tmp;
309 430
310 add_object_to_socklist (pl->contr->socket, sl, head); 431 add_object_to_socklist (*pl->contr->ns, sl, head);
311 got_one++; 432 got_one++;
312 433
313 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 434 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
314 { 435 {
315 Send_With_Handling (&pl->contr->socket, &sl); 436 pl->contr->ns->send_packet (sl);
437
438 sl.reset ();
316 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 439 sl.printf ("item%d ", pl->contr->ns->itemcmd);
317 sl.len = strlen ((char *) sl.buf); 440 sl << uint32 (0);
318 SockList_AddInt (&sl, 0);
319 got_one = 0; 441 got_one = 0;
320 } 442 }
321 } /* If LOOK_OBJ() */ 443 }
322 } 444 }
323 445
324 if (got_one) 446 if (got_one)
325 Send_With_Handling (&pl->contr->socket, &sl); 447 pl->contr->ns->send_packet (sl);
326 448
327 sl.free ();
328} 449}
329 450
330/** 451/**
331 * Sends whole inventory. 452 * Sends whole inventory.
332 */ 453 */
333void 454void
334esrv_send_inventory (object *pl, object *op) 455esrv_send_inventory (object *pl, object *op)
335{ 456{
336 object *tmp; 457 object *tmp;
337 int got_one = 0; 458 int got_one = 0;
338 SockList sl;
339 459
340 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
341 460
342 sprintf ((char *) sl.buf, "delinv %d", op->count); 461 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
343 sl.len = strlen ((char *) sl.buf);
344 Send_With_Handling (&pl->contr->socket, &sl);
345 462
463 packet sl;
346 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 464 sl.printf ("item%d ", pl->contr->ns->itemcmd);
347 sl.len = strlen ((char *) sl.buf);
348 465
349 SockList_AddInt (&sl, op->count); 466 sl << uint32 (op->count);
350 467
351 for (tmp = op->inv; tmp; tmp = tmp->below) 468 for (tmp = op->inv; tmp; tmp = tmp->below)
352 { 469 {
353 object *head; 470 object *head;
354 471
… …
357 else 474 else
358 head = tmp; 475 head = tmp;
359 476
360 if (LOOK_OBJ (head)) 477 if (LOOK_OBJ (head))
361 { 478 {
362 add_object_to_socklist (pl->contr->socket, sl, head); 479 add_object_to_socklist (*pl->contr->ns, sl, head);
363 480
364 got_one++; 481 got_one++;
365 482
366 /* IT is possible for players to accumulate a huge amount of 483 /* IT is possible for players to accumulate a huge amount of
367 * items (especially with some of the bags out there) to 484 * items (especially with some of the bags out there) to
368 * overflow the buffer. IF so, send multiple item commands. 485 * overflow the buffer. IF so, send multiple item commands.
369 */ 486 */
370 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 487 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
371 { 488 {
372 Send_With_Handling (&pl->contr->socket, &sl); 489 pl->contr->ns->send_packet (sl);
490
491 sl.reset ();
373 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 492 sl.printf ("item%d ", pl->contr->ns->itemcmd);
374 sl.len = strlen ((char *) sl.buf); 493 sl << uint32 (op->count);
375 SockList_AddInt (&sl, op->count);
376 got_one = 0; 494 got_one = 0;
377 } 495 }
378 } /* If LOOK_OBJ() */ 496 } /* If LOOK_OBJ() */
379 } 497 }
498
380 if (got_one) 499 if (got_one)
381 Send_With_Handling (&pl->contr->socket, &sl); 500 pl->contr->ns->send_packet (sl);
382 sl.free ();
383} 501}
384 502
385/** 503/**
386 * Updates object *op for player *pl. 504 * Updates object *op for player *pl.
387 * 505 *
… …
391 */ 509 */
392 510
393void 511void
394esrv_update_item (int flags, object *pl, object *op) 512esrv_update_item (int flags, object *pl, object *op)
395{ 513{
396 SockList sl;
397
398 /* If we have a request to send the player item, skip a few checks. */ 514 /* If we have a request to send the player item, skip a few checks. */
399 if (op != pl) 515 if (op != pl)
400 { 516 {
401 if (!LOOK_OBJ (op)) 517 if (!LOOK_OBJ (op))
402 return; 518 return;
… …
404 * is hopefully in the same place, so the client should preserve 520 * is hopefully in the same place, so the client should preserve
405 * order. 521 * order.
406 */ 522 */
407 } 523 }
408 524
525 client *ns = pl->contr->ns;
526 if (!ns)
527 return;
528
409 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 529 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
410 { 530 {
411 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 531 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
412 * this is happening - we can set a breakpoint here in the debugger 532 * this is happening - we can set a breakpoint here in the debugger
413 * and track back the call. 533 * and track back the call.
414 */ 534 */
415 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 535 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
416 } 536 }
417 537
418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 538 packet sl ("upditem");
419 539
420 strcpy ((char *) sl.buf, "upditem "); 540 sl << uint8 (flags);
421 sl.len = strlen ((char *) sl.buf);
422
423 SockList_AddChar (&sl, (char) flags);
424 541
425 if (op->head) 542 if (op->head)
426 op = op->head; 543 op = op->head;
427 544
428 SockList_AddInt (&sl, op->count); 545 sl << uint32 (op->count);
429 546
430 if (flags & UPD_LOCATION) 547 if (flags & UPD_LOCATION)
431 SockList_AddInt (&sl, op->env ? op->env->count : 0); 548 sl << uint32 (op->env ? op->env->count : 0);
432 549
433 if (flags & UPD_FLAGS) 550 if (flags & UPD_FLAGS)
434 SockList_AddInt (&sl, query_flags (op)); 551 sl << uint32 (query_flags (op));
435 552
436 if (flags & UPD_WEIGHT) 553 if (flags & UPD_WEIGHT)
437 { 554 {
438 sint32 weight = WEIGHT (op); 555 sint32 weight = WEIGHT (op);
439 556
440 SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 557 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
558
441 if (pl == op) 559 if (pl == op)
442 {
443 op->contr->last_weight = weight; 560 ns->last_weight = weight;
444 }
445 } 561 }
446 562
447 if (flags & UPD_FACE) 563 if (flags & UPD_FACE)
448 { 564 {
449 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 565 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
450 esrv_send_face (&pl->contr->socket, op->face->number, 0); 566 esrv_send_face (ns, op->face->number, 0);
451 SockList_AddInt (&sl, op->face->number); 567
568 sl << uint32 (op->face->number);
452 } 569 }
453 570
454 if (flags & UPD_NAME) 571 if (flags & UPD_NAME)
455 { 572 {
456 int len; 573 int len;
… …
473 } 590 }
474 591
475 strncpy (item_n + len + 1, item_p, 127); 592 strncpy (item_n + len + 1, item_p, 127);
476 item_n[254] = 0; 593 item_n[254] = 0;
477 len += strlen (item_n + 1 + len) + 1; 594 len += strlen (item_n + 1 + len) + 1;
478 SockList_AddChar (&sl, (char) len); 595
479 memcpy (sl.buf + sl.len, item_n, len); 596 sl << data8 (item_n, len);
480 sl.len += len;
481 } 597 }
482 598
483 if (flags & UPD_ANIM) 599 if (flags & UPD_ANIM)
484 SockList_AddShort (&sl, op->animation_id); 600 sl << uint16 (op->animation_id);
485 601
486 if (flags & UPD_ANIMSPEED) 602 if (flags & UPD_ANIMSPEED)
487 { 603 {
488 int anim_speed = 0; 604 int anim_speed = 0;
489 605
… …
498 else if (FABS (op->speed) >= 1.0) 614 else if (FABS (op->speed) >= 1.0)
499 anim_speed = 1; 615 anim_speed = 1;
500 else 616 else
501 anim_speed = (int) (1.0 / FABS (op->speed)); 617 anim_speed = (int) (1.0 / FABS (op->speed));
502 } 618 }
619
503 if (anim_speed > 255) 620 if (anim_speed > 255)
504 anim_speed = 255; 621 anim_speed = 255;
505 } 622 }
506 SockList_AddChar (&sl, (char) anim_speed); 623
624 sl << uint8 (anim_speed);
507 } 625 }
626
508 if (flags & UPD_NROF) 627 if (flags & UPD_NROF)
509 SockList_AddInt (&sl, op->nrof); 628 sl << uint32 (op->nrof);
510 629
511 Send_With_Handling (&pl->contr->socket, &sl); 630 pl->contr->ns->send_packet (sl);
512 sl.free ();
513} 631}
514 632
515/** 633/**
516 * Sends item's info to player. 634 * Sends item's info to player.
517 */ 635 */
518void 636void
519esrv_send_item (object *pl, object *op) 637esrv_send_item (object *pl, object *op)
520{ 638{
521 SockList sl;
522
523 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
524 if (op != pl) 640 if (op != pl)
525 { 641 {
526 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visibile' objects to the client */
527 if (!LOOK_OBJ (op)) 643 if (!LOOK_OBJ (op))
… …
529 /* if the item is on the ground, mark that the look needs to 645 /* if the item is on the ground, mark that the look needs to
530 * be updated. 646 * be updated.
531 */ 647 */
532 if (!op->env) 648 if (!op->env)
533 { 649 {
534 pl->contr->socket.update_look = 1; 650 pl->contr->ns->floorbox_update ();
535 return; 651 return;
536 } 652 }
537 } 653 }
538 654
539 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 655 packet sl;
540 656
541 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 657 sl.printf ("item%d ", pl->contr->ns->itemcmd);
542 sl.len = strlen ((char *) sl.buf);
543 658
544 if (op->head) 659 if (op->head)
545 op = op->head; 660 op = op->head;
546 661
547 SockList_AddInt (&sl, op->env ? op->env->count : 0); 662 sl << uint32 (op->env ? op->env->count : 0);
548 663
549 add_object_to_socklist (pl->contr->socket, sl, op); 664 add_object_to_socklist (*pl->contr->ns, sl, op);
550 665
551 Send_With_Handling (&pl->contr->socket, &sl); 666 pl->contr->ns->send_packet (sl);
552 SET_FLAG (op, FLAG_CLIENT_SENT); 667 SET_FLAG (op, FLAG_CLIENT_SENT);
553
554 sl.free ();
555} 668}
556 669
557/** 670/**
558 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
559 * command with a -1 location. 672 * command with a -1 location.
560 */ 673 */
561 674
562void 675void
563esrv_del_item (player *pl, int tag) 676esrv_del_item (player *pl, int tag)
564{ 677{
565 SockList sl; 678 packet sl ("delitem");
566 679
567 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 680 sl << uint32 (tag);
568 681
569 strcpy ((char *) sl.buf, "delitem "); 682 pl->ns->send_packet (sl);
570 sl.len = strlen ((char *) sl.buf);
571 SockList_AddInt (&sl, tag);
572
573 Send_With_Handling (&pl->socket, &sl);
574 sl.free ();
575} 683}
576 684
577 685
578/******************************************************************************* 686/*******************************************************************************
579 * 687 *
… …
600 else if (op->type == CONTAINER && pl->container == op) 708 else if (op->type == CONTAINER && pl->container == op)
601 for (tmp = op->inv; tmp; tmp = tmp->below) 709 for (tmp = op->inv; tmp; tmp = tmp->below)
602 if (tmp->count == count) 710 if (tmp->count == count)
603 return tmp; 711 return tmp;
604 712
605 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 713 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
606 if (op->head != NULL && op->head->count == count) 714 if (op->head && op->head->count == count)
607 return op; 715 return op;
608 else if (op->count == count) 716 else if (op->count == count)
609 return op; 717 return op;
610 else if (op->type == CONTAINER && pl->container == op) 718 else if (op->type == CONTAINER && pl->container == op)
611 for (tmp = op->inv; tmp; tmp = tmp->below) 719 for (tmp = op->inv; tmp; tmp = tmp->below)
612 if (tmp->count == count) 720 if (tmp->count == count)
613 return tmp; 721 return tmp;
614 722
615 return NULL; 723 return 0;
616} 724}
617 725
618 726
619/** Client wants to examine some object. So lets do so. */ 727/** Client wants to examine some object. So lets do so. */
620void 728void
… …
635 } 743 }
636 744
637 examine (pl->ob, op); 745 examine (pl->ob, op);
638} 746}
639 747
640/** Client wants to apply some object. Lets do so. */ 748/** Client wants to apply some object. Lets do so. */
641void 749void
642ApplyCmd (char *buf, int len, player *pl) 750ApplyCmd (char *buf, int len, player *pl)
643{ 751{
644 tag_t tag = atoi (buf); 752 tag_t tag = atoi (buf);
645 753
… …
650 return; 758 return;
651 759
652 /* If the high bit is set, player applied a pseudo object. */ 760 /* If the high bit is set, player applied a pseudo object. */
653 if (tag & 0x80000000) 761 if (tag & 0x80000000)
654 { 762 {
655 pl->socket.look_position = tag & 0x7fffffff; 763 pl->ns->look_position = tag & 0x7fffffff;
656 pl->socket.update_look = 1; 764 pl->ns->floorbox_update ();
657 return; 765 return;
658 } 766 }
659 767
660 object *op = esrv_get_ob_from_count (pl->ob, tag); 768 object *op = esrv_get_ob_from_count (pl->ob, tag);
661 769
… …
666 } 774 }
667 775
668 player_apply (pl->ob, op, 0, 0); 776 player_apply (pl->ob, op, 0, 0);
669} 777}
670 778
671/** Client wants to apply some object. Lets do so. */ 779/** Client wants to lock some object. Lets do so. */
672void 780void
673LockItem (uint8 *data, int len, player *pl) 781LockItem (char *data, int len, player *pl)
674{ 782{
675 int flag = data[0]; 783 int flag = data[0];
676 tag_t tag = net_uint32 (data + 1); 784 tag_t tag = net_uint32 ((uint8 *)data + 1);
677 object *op = esrv_get_ob_from_count (pl->ob, tag); 785 object *op = esrv_get_ob_from_count (pl->ob, tag);
678 786
679 if (!op) 787 if (!op)
680 { 788 {
681 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 789 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
688 SET_FLAG (op, FLAG_INV_LOCKED); 796 SET_FLAG (op, FLAG_INV_LOCKED);
689 797
690 esrv_update_item (UPD_FLAGS, pl->ob, op); 798 esrv_update_item (UPD_FLAGS, pl->ob, op);
691} 799}
692 800
693/** Client wants to apply some object. Lets do so. */ 801/** Client wants to mark some object. Lets do so. */
694void 802void
695MarkItem (uint8 * data, int len, player *pl) 803MarkItem (char *data, int len, player *pl)
696{ 804{
697 tag_t tag = net_uint32 (data); 805 tag_t tag = net_uint32 ((uint8 *)data);
698 object *op = esrv_get_ob_from_count (pl->ob, tag); 806 object *op = esrv_get_ob_from_count (pl->ob, tag);
699 807
700 if (!op) 808 if (!op)
701 { 809 {
702 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 810 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
729 837
730 m = get_map_from_coord (op->map, &x, &y); 838 m = get_map_from_coord (op->map, &x, &y);
731 if (!m) 839 if (!m)
732 return; 840 return;
733 841
734 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 842 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
735 843
736 for (; tmp != NULL; tmp = tmp->below) 844 for (; tmp != NULL; tmp = tmp->below)
737 { 845 {
738 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 846 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
739 continue; 847 continue;
… …
786 { 894 {
787 return; 895 return;
788 } 896 }
789 dy = atoi (cp); 897 dy = atoi (cp);
790 898
791 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 899 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
792 return; 900 return;
793 901
794 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 902 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
795 return; 903 return;
796 904
797 look_at (pl->ob, dx, dy); 905 look_at (pl->ob, dx, dy);
798} 906}
799 907
… …
810 return; 918 return;
811 } 919 }
812 920
813 if (!to) 921 if (!to)
814 { /* drop it to the ground */ 922 { /* drop it to the ground */
815
816/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818 if (op->map && !op->env) 923 if (op->map && !op->env)
819 {
820
821/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822 return; 924 return;
823 } 925
824 /* If it is an active container, then we should drop all objects 926 /* If it is an active container, then we should drop all objects
825 * in the container and not the container itself. 927 * in the container and not the container itself.
826 */ 928 */
827 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 929 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828 { 930 {
… …
831 for (current = op->inv; current != NULL; current = next) 933 for (current = op->inv; current != NULL; current = next)
832 { 934 {
833 next = current->below; 935 next = current->below;
834 drop_object (pl, current, 0); 936 drop_object (pl, current, 0);
835 } 937 }
938
836 esrv_update_item (UPD_WEIGHT, pl, op); 939 esrv_update_item (UPD_WEIGHT, pl, op);
837 } 940 }
838 else 941 else
839 {
840 drop_object (pl, op, nrof); 942 drop_object (pl, op, nrof);
841 } 943
842 return; 944 return;
843 } 945 }
844 else if (to == pl->count) 946 else if (to == pl->count)
845 { /* pick it up to the inventory */ 947 { /* pick it up to the inventory */
846 /* return if player has already picked it up */ 948 /* return if player has already picked it up */
… …
849 951
850 pl->contr->count = nrof; 952 pl->contr->count = nrof;
851 pick_up (pl, op); 953 pick_up (pl, op);
852 return; 954 return;
853 } 955 }
956
854 env = esrv_get_ob_from_count (pl, to); 957 env = esrv_get_ob_from_count (pl, to);
855 if (!env) 958 if (!env)
856 { 959 {
857 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 960 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858 return; 961 return;
859 } 962 }
963
860 /* put_object_in_sack presumes that necessary sanity checking 964 /* put_object_in_sack presumes that necessary sanity checking
861 * has already been done (eg, it can be picked up and fits in 965 * has already been done (eg, it can be picked up and fits in
862 * in a sack, so check for those things. We should also check 966 * in a sack, so check for those things. We should also check
863 * an make sure env is in fact a container for that matter. 967 * an make sure env is in fact a container for that matter.
864 */ 968 */
865 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 969 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
866 {
867 put_object_in_sack (pl, env, op, nrof); 970 put_object_in_sack (pl, env, op, nrof);
868 }
869} 971}
972

Diff Legend

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