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.23 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.29 by root, Thu Dec 21 23:37:06 2006 UTC

… …
30 * This containes item logic for client/server. It doesn't contain 30 * This containes item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 32 * the logic for what items should be sent.
33 */ 33 */
34 34
35
36#include <global.h> 35#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 36#include <object.h> /* LOOK_OBJ */
38#include <sproto.h> 37#include <sproto.h>
39 38
40/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
41#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41
42#if 0
43tag_t
44client_container::tag () const
45{
46 switch (type)
47 {
48 case CC_INVENTORY:
49 return ns->pl->count;
50 case CC_MAPSPACE:
51 return 0;
52 case CC_CONTAINER:
53 return env->count;
54 }
55
56 abort ();
57}
58
59void
60client_container::clear ()
61{
62 switch (type)
63 {
64 case CC_INVENTORY:
65 abort ();
66
67 case CC_MAPSPACE:
68 case CC_CONTAINER:
69 ns->send_packet_printf ("delinv %d", tag ());
70 break;
71 }
72
73 for (iterator i = begin (); i != end (); ++i)
74 i->op->seen_by = 0;
75
76 vector< refitem, slice_allocator<refitem> >::clear ();
77}
78
79inline iterator
80client_container::merge_item (iterator i, object *op)
81{
82 if (i != end () && i->op == op)
83 return ++i;
84
85 if (op->seen_by)
86 return; // seen by another entity already
87
88 op->seen_by = this;
89
90 refitem ref;
91 ref.op = op;
92
93 return insert (i, ref);
94}
95
96void
97client_container::update (int offset)
98{
99 iterator i = begin ();
100
101 switch (type)
102 {
103 case CC_INVENTORY:
104 case CC_CONTAINER:
105 {
106 object *env = type == CC_INVENTORY
107 ? ns->pl->ob
108 : this->env;
109
110 // pass 1, erase all objects no longer in container
111 for (iterator j = begin (); j != end (); ++j)
112 if (j->op->env != env)
113 {
114 j->op->seen_by = 0;
115 erase (j);
116 }
117
118 // pass 2 merge items
119 for (object *op = env->inv; op; op = op->below)
120 {
121 if (--offset < 0)
122 i = merge_item (i, op);
123 else if (offset < -FLOORBOX_PAGESIZE)
124 break;
125 }
126 }
127 break;
128
129 case CC_MAPSPACE:
130 {
131 // pass 1, erase all objects no longer on space
132 for (iterator j = begin (); j != end (); ++j)
133 if (j->op->x != x || j->op->y != y || j->op->map != map)
134 {
135 j->op->seen_by = 0;
136 erase (j);
137 }
138
139 // pass 2 merge items
140 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
141 {
142 if (--offset < 0)
143 i = merge_item (i, op);
144 else if (offset < -FLOORBOX_PAGESIZE)
145 break;
146 }
147 }
148 break;
149 }
150
151 // pass 3, erase all extra items
152 for (iterator j = i; j != end (); ++j)
153 j->op->seen_by = 0;
154
155 if (i != end ())
156 erase (i, end ());
157}
158
159void
160client_container::set_mapspace (maptile *map, int x, int y)
161{
162 if (type == CC_MAPSPACE
163 && this->map == map
164 && this->x == x
165 && this->y == y)
166 return;
167
168 clear ();
169
170 type = CC_MAPSPACE;
171 this->map = map;
172 this->x = x;
173 this->y = y;
174}
175
176void
177client_container::set_container (object *env)
178{
179}
180#endif
42 181
43/******************************************************************************* 182/*******************************************************************************
44 * 183 *
45 * Functions related to sending object data to the client. 184 * Functions related to sending object data to the client.
46 * 185 *
47 ******************************************************************************/ 186 ******************************************************************************/
48 187
49/** 188/**
50 * This is a similar to query_name, but returns flags 189 * This is a similar to query_name, but returns flags
51 * to be sended to client. 190 * to be sent to client.
52 */ 191 */
53unsigned int 192unsigned int
54query_flags (object *op) 193query_flags (object *op)
55{ 194{
56 unsigned int flags = 0; 195 unsigned int flags = 0;
57 196
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 197 if (QUERY_FLAG (op, FLAG_APPLIED))
59 { 198 {
60 switch (op->type) 199 switch (op->type)
61 { 200 {
62 case BOW: 201 case BOW:
63 case WAND: 202 case WAND:
64 case ROD: 203 case ROD:
65 case HORN: 204 case HORN:
66 flags = a_readied; 205 flags = a_readied;
67 break; 206 break;
68 case WEAPON: 207 case WEAPON:
69 flags = a_wielded; 208 flags = a_wielded;
70 break; 209 break;
71 case SKILL: 210 case SKILL:
72 case ARMOUR: 211 case ARMOUR:
73 case HELMET: 212 case HELMET:
74 case SHIELD: 213 case SHIELD:
75 case RING: 214 case RING:
76 case BOOTS: 215 case BOOTS:
77 case GLOVES: 216 case GLOVES:
78 case AMULET: 217 case AMULET:
79 case GIRDLE: 218 case GIRDLE:
80 case BRACERS: 219 case BRACERS:
81 case CLOAK: 220 case CLOAK:
82 flags = a_worn; 221 flags = a_worn;
83 break; 222 break;
84 case CONTAINER: 223 case CONTAINER:
85 flags = a_active; 224 flags = a_active;
86 break; 225 break;
87 default: 226 default:
88 flags = a_applied; 227 flags = a_applied;
89 break; 228 break;
90 } 229 }
91 } 230 }
231
92 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 232 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
93 flags |= F_OPEN; 233 flags |= F_OPEN;
94 234
95 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 235 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
96 { 236 {
97 if (QUERY_FLAG (op, FLAG_DAMNED)) 237 if (QUERY_FLAG (op, FLAG_DAMNED))
98 flags |= F_DAMNED; 238 flags |= F_DAMNED;
99 else if (QUERY_FLAG (op, FLAG_CURSED)) 239 else if (QUERY_FLAG (op, FLAG_CURSED))
100 flags |= F_CURSED; 240 flags |= F_CURSED;
101 } 241 }
242
102 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 243 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
103 flags |= F_MAGIC; 244 flags |= F_MAGIC;
104 if (QUERY_FLAG (op, FLAG_UNPAID)) 245 if (QUERY_FLAG (op, FLAG_UNPAID))
105 flags |= F_UNPAID; 246 flags |= F_UNPAID;
106 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 247 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
185 SET_FLAG (head, FLAG_CLIENT_SENT); 326 SET_FLAG (head, FLAG_CLIENT_SENT);
186} 327}
187 328
188 329
189/** 330/**
190 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
191 * This sends all the faces to the client, not just updates. This is 332 * This sends all the faces to the client, not just updates. This is
192 * because object ordering would otherwise be inconsistent 333 * because object ordering would otherwise be inconsistent.
193 */ 334 */
194
195void 335void
196esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
197{ 337{
198 object *tmp, *last; 338 object *tmp, *last;
199 int got_one = 0, start_look = 0, end_look = 0; 339 int got_one = 0, start_look = 0, end_look = 0;
200 char buf[MAX_BUF]; 340 char buf[MAX_BUF];
201 341
202 if (!pl->contr->socket->update_look) 342 if (!pl->contr->ns->update_look)
203 { 343 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
205 return; 345 return;
206 } 346 }
207 else 347 else
208 pl->contr->socket->update_look = 0; 348 pl->contr->ns->update_look = 0;
209 349
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (pl, FLAG_REMOVED)
211 || !pl->map 351 || !pl->map
212 || pl->map->in_memory != MAP_IN_MEMORY 352 || pl->map->in_memory != MAP_IN_MEMORY
213 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (pl->map, pl->x, pl->y))
214 return; 354 return;
215 355
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 356 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
217 ; 357 ;
218 358
359 pl->contr->ns->send_packet ("delinv 0");
360
219 packet sl; 361 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 362 sl.printf ("item%d ", pl->contr->ns->itemcmd);
224 363
225 sl << uint32 (0); 364 sl << uint32 (0);
226 365
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 366 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 367 esrv_send_face (pl->contr->ns, empty_face->number, 0);
229 368
230 if (pl->contr->socket->look_position) 369 if (pl->contr->ns->look_position)
231 { 370 {
232 char buf[80]; 371 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); 372 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
234 373
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 374 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
236 << uint32 (0) 375 << uint32 (0)
237 << sint32 (-1) 376 << sint32 (-1)
238 << uint32 (empty_face->number) 377 << uint32 (empty_face->number)
239 << data8 (buf) 378 << data8 (buf)
240 << uint16 (0) 379 << uint16 (0)
241 << uint8 (0) 380 << uint8 (0)
242 << uint32 (0); 381 << uint32 (0);
243 382
244 if (pl->contr->socket->itemcmd == 2) 383 if (pl->contr->ns->itemcmd == 2)
245 sl << uint16 (0); 384 sl << uint16 (0);
246 } 385 }
247 386
248 for (last = NULL; tmp != last; tmp = tmp->below) 387 for (last = NULL; tmp != last; tmp = tmp->below)
249 { 388 {
… …
256 last = last->below; 395 last = last->below;
257 } 396 }
258 397
259 if (LOOK_OBJ (tmp)) 398 if (LOOK_OBJ (tmp))
260 { 399 {
261 if (++start_look < pl->contr->socket->look_position) 400 if (++start_look < pl->contr->ns->look_position)
262 continue; 401 continue;
263 402
264 end_look++; 403 end_look++;
265 404
266 if (end_look > NUM_LOOK_OBJECTS) 405 if (end_look > FLOORBOX_PAGESIZE)
267 { 406 {
268 /* What we basically do is make a 'fake' object - when the user applies it, 407 /* What we basically do is make a 'fake' object - when the user applies it,
269 * we notice the special tag the object has, and act accordingly. 408 * we notice the special tag the object has, and act accordingly.
270 */ 409 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) 410 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
272 << uint32 (0) 411 << uint32 (0)
273 << uint32 ((uint32) - 1) 412 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number) 413 << uint32 (empty_face->number)
275 << data8 ("Apply this to see next group of items") 414 << data8 ("Apply this to see next group of items")
276 << uint16 (0) 415 << uint16 (0)
277 << uint8 (0) 416 << uint8 (0)
278 << uint32 (0); 417 << uint32 (0);
279 418
280 if (pl->contr->socket->itemcmd == 2) 419 if (pl->contr->ns->itemcmd == 2)
281 sl << uint16 (0); 420 sl << uint16 (0);
282 421
283 break; 422 break;
284 } 423 }
285 424
286 if (tmp->head) 425 if (tmp->head)
287 head = tmp->head; 426 head = tmp->head;
288 else 427 else
289 head = tmp; 428 head = tmp;
290 429
291 add_object_to_socklist (*pl->contr->socket, sl, head); 430 add_object_to_socklist (*pl->contr->ns, sl, head);
292 got_one++; 431 got_one++;
293 432
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 433 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 { 434 {
296 pl->contr->socket->send_packet (sl); 435 pl->contr->ns->send_packet (sl);
297 436
298 sl.reset (); 437 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd); 438 sl.printf ("item%d ", pl->contr->ns->itemcmd);
300 sl << uint32 (0); 439 sl << uint32 (0);
301 got_one = 0; 440 got_one = 0;
302 } 441 }
303 } /* If LOOK_OBJ() */ 442 }
304 } 443 }
305 444
306 if (got_one) 445 if (got_one)
307 pl->contr->socket->send_packet (sl); 446 pl->contr->ns->send_packet (sl);
308 447
309} 448}
310 449
311/** 450/**
312 * Sends whole inventory. 451 * Sends whole inventory.
… …
315esrv_send_inventory (object *pl, object *op) 454esrv_send_inventory (object *pl, object *op)
316{ 455{
317 object *tmp; 456 object *tmp;
318 int got_one = 0; 457 int got_one = 0;
319 458
459
460 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
461
320 packet sl; 462 packet sl;
321
322 sl.printf ("delinv %d", op->count);
323 pl->contr->socket->send_packet (sl);
324
325 sl.reset ();
326 sl.printf ("item%d ", pl->contr->socket->itemcmd); 463 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 464
328 sl << uint32 (op->count); 465 sl << uint32 (op->count);
329 466
330 for (tmp = op->inv; tmp; tmp = tmp->below) 467 for (tmp = op->inv; tmp; tmp = tmp->below)
331 { 468 {
… …
336 else 473 else
337 head = tmp; 474 head = tmp;
338 475
339 if (LOOK_OBJ (head)) 476 if (LOOK_OBJ (head))
340 { 477 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 478 add_object_to_socklist (*pl->contr->ns, sl, head);
342 479
343 got_one++; 480 got_one++;
344 481
345 /* IT is possible for players to accumulate a huge amount of 482 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 483 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 484 * overflow the buffer. IF so, send multiple item commands.
348 */ 485 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 486 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
350 { 487 {
351 pl->contr->socket->send_packet (sl); 488 pl->contr->ns->send_packet (sl);
352 489
353 sl.reset (); 490 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 491 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 492 sl << uint32 (op->count);
356 got_one = 0; 493 got_one = 0;
357 } 494 }
358 } /* If LOOK_OBJ() */ 495 } /* If LOOK_OBJ() */
359 } 496 }
360 497
361 if (got_one) 498 if (got_one)
362 pl->contr->socket->send_packet (sl); 499 pl->contr->ns->send_packet (sl);
363
364} 500}
365 501
366/** 502/**
367 * Updates object *op for player *pl. 503 * Updates object *op for player *pl.
368 * 504 *
… …
392 * and track back the call. 528 * and track back the call.
393 */ 529 */
394 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 530 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
395 } 531 }
396 532
397 packet sl; 533 packet sl ("upditem");
398 534
399 sl << "upditem "
400 << uint8 (flags); 535 sl << uint8 (flags);
401 536
402 if (op->head) 537 if (op->head)
403 op = op->head; 538 op = op->head;
404 539
405 sl << uint32 (op->count); 540 sl << uint32 (op->count);
… …
420 op->contr->last_weight = weight; 555 op->contr->last_weight = weight;
421 } 556 }
422 557
423 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
424 { 559 {
425 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
426 esrv_send_face (pl->contr->socket, op->face->number, 0); 561 esrv_send_face (pl->contr->ns, op->face->number, 0);
427 562
428 sl << uint32 (op->face->number); 563 sl << uint32 (op->face->number);
429 } 564 }
430 565
431 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
… …
485 } 620 }
486 621
487 if (flags & UPD_NROF) 622 if (flags & UPD_NROF)
488 sl << uint32 (op->nrof); 623 sl << uint32 (op->nrof);
489 624
490 pl->contr->socket->send_packet (sl); 625 pl->contr->ns->send_packet (sl);
491} 626}
492 627
493/** 628/**
494 * Sends item's info to player. 629 * Sends item's info to player.
495 */ 630 */
… …
505 /* if the item is on the ground, mark that the look needs to 640 /* if the item is on the ground, mark that the look needs to
506 * be updated. 641 * be updated.
507 */ 642 */
508 if (!op->env) 643 if (!op->env)
509 { 644 {
510 pl->contr->socket->update_look = 1; 645 pl->contr->ns->floorbox_update ();
511 return; 646 return;
512 } 647 }
513 } 648 }
514 649
515 packet sl; 650 packet sl;
516 651
517 sl.printf ("item%d ", pl->contr->socket->itemcmd); 652 sl.printf ("item%d ", pl->contr->ns->itemcmd);
518 653
519 if (op->head) 654 if (op->head)
520 op = op->head; 655 op = op->head;
521 656
522 sl << uint32 (op->env ? op->env->count : 0); 657 sl << uint32 (op->env ? op->env->count : 0);
523 658
524 add_object_to_socklist (*pl->contr->socket, sl, op); 659 add_object_to_socklist (*pl->contr->ns, sl, op);
525 660
526 pl->contr->socket->send_packet (sl); 661 pl->contr->ns->send_packet (sl);
527 SET_FLAG (op, FLAG_CLIENT_SENT); 662 SET_FLAG (op, FLAG_CLIENT_SENT);
528
529} 663}
530 664
531/** 665/**
532 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
533 * command with a -1 location. 667 * command with a -1 location.
534 */ 668 */
535 669
536void 670void
537esrv_del_item (player *pl, int tag) 671esrv_del_item (player *pl, int tag)
538{ 672{
539 packet sl; 673 packet sl ("delitem");
540 674
541 sl << "delitem "
542 << uint32 (tag); 675 sl << uint32 (tag);
543 676
544 pl->socket->send_packet (sl); 677 pl->ns->send_packet (sl);
545} 678}
546 679
547 680
548/******************************************************************************* 681/*******************************************************************************
549 * 682 *
… …
570 else if (op->type == CONTAINER && pl->container == op) 703 else if (op->type == CONTAINER && pl->container == op)
571 for (tmp = op->inv; tmp; tmp = tmp->below) 704 for (tmp = op->inv; tmp; tmp = tmp->below)
572 if (tmp->count == count) 705 if (tmp->count == count)
573 return tmp; 706 return tmp;
574 707
575 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
576 if (op->head != NULL && op->head->count == count) 709 if (op->head && op->head->count == count)
577 return op; 710 return op;
578 else if (op->count == count) 711 else if (op->count == count)
579 return op; 712 return op;
580 else if (op->type == CONTAINER && pl->container == op) 713 else if (op->type == CONTAINER && pl->container == op)
581 for (tmp = op->inv; tmp; tmp = tmp->below) 714 for (tmp = op->inv; tmp; tmp = tmp->below)
582 if (tmp->count == count) 715 if (tmp->count == count)
583 return tmp; 716 return tmp;
584 717
585 return NULL; 718 return 0;
586} 719}
587 720
588 721
589/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
590void 723void
… …
605 } 738 }
606 739
607 examine (pl->ob, op); 740 examine (pl->ob, op);
608} 741}
609 742
610/** Client wants to apply some object. Lets do so. */ 743/** Client wants to apply some object. Lets do so. */
611void 744void
612ApplyCmd (char *buf, int len, player *pl) 745ApplyCmd (char *buf, int len, player *pl)
613{ 746{
614 tag_t tag = atoi (buf); 747 tag_t tag = atoi (buf);
615 748
… …
620 return; 753 return;
621 754
622 /* If the high bit is set, player applied a pseudo object. */ 755 /* If the high bit is set, player applied a pseudo object. */
623 if (tag & 0x80000000) 756 if (tag & 0x80000000)
624 { 757 {
625 pl->socket->look_position = tag & 0x7fffffff; 758 pl->ns->look_position = tag & 0x7fffffff;
626 pl->socket->update_look = 1; 759 pl->ns->floorbox_update ();
627 return; 760 return;
628 } 761 }
629 762
630 object *op = esrv_get_ob_from_count (pl->ob, tag); 763 object *op = esrv_get_ob_from_count (pl->ob, tag);
631 764
… …
636 } 769 }
637 770
638 player_apply (pl->ob, op, 0, 0); 771 player_apply (pl->ob, op, 0, 0);
639} 772}
640 773
641/** Client wants to apply some object. Lets do so. */ 774/** Client wants to lock some object. Lets do so. */
642void 775void
643LockItem (char *data, int len, player *pl) 776LockItem (char *data, int len, player *pl)
644{ 777{
645 int flag = data[0]; 778 int flag = data[0];
646 tag_t tag = net_uint32 ((uint8 *)data + 1); 779 tag_t tag = net_uint32 ((uint8 *)data + 1);
… …
658 SET_FLAG (op, FLAG_INV_LOCKED); 791 SET_FLAG (op, FLAG_INV_LOCKED);
659 792
660 esrv_update_item (UPD_FLAGS, pl->ob, op); 793 esrv_update_item (UPD_FLAGS, pl->ob, op);
661} 794}
662 795
663/** Client wants to apply some object. Lets do so. */ 796/** Client wants to mark some object. Lets do so. */
664void 797void
665MarkItem (char *data, int len, player *pl) 798MarkItem (char *data, int len, player *pl)
666{ 799{
667 tag_t tag = net_uint32 ((uint8 *)data); 800 tag_t tag = net_uint32 ((uint8 *)data);
668 object *op = esrv_get_ob_from_count (pl->ob, tag); 801 object *op = esrv_get_ob_from_count (pl->ob, tag);
… …
699 832
700 m = get_map_from_coord (op->map, &x, &y); 833 m = get_map_from_coord (op->map, &x, &y);
701 if (!m) 834 if (!m)
702 return; 835 return;
703 836
704 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
705 838
706 for (; tmp != NULL; tmp = tmp->below) 839 for (; tmp != NULL; tmp = tmp->below)
707 { 840 {
708 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
709 continue; 842 continue;
… …
756 { 889 {
757 return; 890 return;
758 } 891 }
759 dy = atoi (cp); 892 dy = atoi (cp);
760 893
761 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
762 return; 895 return;
763 896
764 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
765 return; 898 return;
766 899
767 look_at (pl->ob, dx, dy); 900 look_at (pl->ob, dx, dy);
768} 901}
769 902
… …
799 } 932 }
800 933
801 esrv_update_item (UPD_WEIGHT, pl, op); 934 esrv_update_item (UPD_WEIGHT, pl, op);
802 } 935 }
803 else 936 else
804 {
805 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
806 } 938
807 return; 939 return;
808 } 940 }
809 else if (to == pl->count) 941 else if (to == pl->count)
810 { /* pick it up to the inventory */ 942 { /* pick it up to the inventory */
811 /* return if player has already picked it up */ 943 /* return if player has already picked it up */
… …
828 * has already been done (eg, it can be picked up and fits in 960 * has already been done (eg, it can be picked up and fits in
829 * in a sack, so check for those things. We should also check 961 * in a sack, so check for those things. We should also check
830 * an make sure env is in fact a container for that matter. 962 * an make sure env is in fact a container for that matter.
831 */ 963 */
832 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
833 {
834 put_object_in_sack (pl, env, op, nrof); 965 put_object_in_sack (pl, env, op, nrof);
835 }
836} 966}
837 967

Diff Legend

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