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.24 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.33 by root, Fri Jan 12 01:29:13 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client/server logic. 27 * Client/server logic.
27 * 28 *
28 * \date 2003-12-02 29 * \date 2003-12-02
29 * 30 *
30 * This containes item logic for client/server. It doesn't contain 31 * This contains 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#include <global.h> 36#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
37#include <sproto.h> 38#include <sproto.h>
38 39
39/** 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 */
40#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
41 182
42/******************************************************************************* 183/*******************************************************************************
43 * 184 *
44 * Functions related to sending object data to the client. 185 * Functions related to sending object data to the client.
45 * 186 *
… …
184 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
185 326
186 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
187} 328}
188 329
189
190/** 330/**
191 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
192 * 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
193 * because object ordering would otherwise be inconsistent. 333 * because object ordering would otherwise be inconsistent.
194 */ 334 */
195void 335void
196esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
197{ 337{
198 object *tmp, *last;
199 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
200 char buf[MAX_BUF]; 339 char buf[MAX_BUF];
201 340
202 if (!pl->contr->socket->update_look) 341 if (!pl->contr->ns->update_look)
203 { 342 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
205 return; 344 return;
206 } 345 }
207 else 346 else
208 pl->contr->socket->update_look = 0; 347 pl->contr->ns->update_look = 0;
209 348
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (pl, FLAG_REMOVED)
211 || !pl->map 350 || !pl->map
212 || pl->map->in_memory != MAP_IN_MEMORY 351 || pl->map->in_memory != MAP_IN_MEMORY
213 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (pl->map, pl->x, pl->y))
214 return; 353 return;
215 354
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 355 pl->contr->ns->send_packet ("delinv 0");
217 ;
218 356
219 packet sl; 357 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 358 sl.printf ("item%d ", pl->contr->ns->itemcmd);
224 359
225 sl << uint32 (0); 360 sl << uint32 (0);
226 361
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 363 esrv_send_face (pl->contr->ns, empty_face->number, 0);
229 364
230 if (pl->contr->socket->look_position) 365 if (pl->contr->ns->look_position)
231 { 366 {
232 char buf[80]; 367 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); 368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
234 369
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
236 << uint32 (0) 371 << uint32 (0)
237 << sint32 (-1) 372 << sint32 (-1)
238 << uint32 (empty_face->number) 373 << uint32 (empty_face->number)
239 << data8 (buf) 374 << data8 (buf)
240 << uint16 (0) 375 << uint16 (0)
241 << uint8 (0) 376 << uint8 (0)
242 << uint32 (0); 377 << uint32 (0);
243 378
244 if (pl->contr->socket->itemcmd == 2) 379 if (pl->contr->ns->itemcmd == 2)
245 sl << uint16 (0); 380 sl << uint16 (0);
246 } 381 }
247 382
383 object *tmp = pl->ms ().top;
248 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
249 { 385 {
250 object *head; 386 object *head;
251 387
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
253 { 389 {
254 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
256 last = last->below; 392 last = last->below;
257 } 393 }
258 394
259 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
260 { 396 {
261 if (++start_look < pl->contr->socket->look_position) 397 if (++start_look < pl->contr->ns->look_position)
262 continue; 398 continue;
263 399
264 end_look++; 400 end_look++;
265 401
266 if (end_look > NUM_LOOK_OBJECTS) 402 if (end_look > FLOORBOX_PAGESIZE)
267 { 403 {
268 /* What we basically do is make a 'fake' object - when the user applies it, 404 /* 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. 405 * we notice the special tag the object has, and act accordingly.
270 */ 406 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) 407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
272 << uint32 (0) 408 << uint32 (0)
273 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number) 410 << uint32 (empty_face->number)
275 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
276 << uint16 (0) 412 << uint16 (0)
277 << uint8 (0) 413 << uint8 (0)
278 << uint32 (0); 414 << uint32 (0);
279 415
280 if (pl->contr->socket->itemcmd == 2) 416 if (pl->contr->ns->itemcmd == 2)
281 sl << uint16 (0); 417 sl << uint16 (0);
282 418
283 break; 419 break;
284 } 420 }
285 421
286 if (tmp->head) 422 if (tmp->head)
287 head = tmp->head; 423 head = tmp->head;
288 else 424 else
289 head = tmp; 425 head = tmp;
290 426
291 add_object_to_socklist (*pl->contr->socket, sl, head); 427 add_object_to_socklist (*pl->contr->ns, sl, head);
292 got_one++; 428 got_one++;
293 429
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 { 431 {
296 pl->contr->socket->send_packet (sl); 432 pl->contr->ns->send_packet (sl);
297 433
298 sl.reset (); 434 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd); 435 sl.printf ("item%d ", pl->contr->ns->itemcmd);
300 sl << uint32 (0); 436 sl << uint32 (0);
301 got_one = 0; 437 got_one = 0;
302 } 438 }
303 } 439 }
304 } 440 }
305 441
306 if (got_one) 442 if (got_one)
307 pl->contr->socket->send_packet (sl); 443 pl->contr->ns->send_packet (sl);
308 444
309} 445}
310 446
311/** 447/**
312 * Sends whole inventory. 448 * Sends whole inventory.
313 */ 449 */
314void 450void
315esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
316{ 452{
317 object *tmp; 453 if (!pl->contr->ns)//D
454 return;
455
318 int got_one = 0; 456 int got_one = 0;
319 457
458 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
459
320 packet sl; 460 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); 461 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 462
328 sl << uint32 (op->count); 463 sl << uint32 (op->count);
329 464
330 for (tmp = op->inv; tmp; tmp = tmp->below) 465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 466 {
332 object *head; 467 object *head;
333 468
334 if (tmp->head) 469 if (tmp->head)
335 head = tmp->head; 470 head = tmp->head;
336 else 471 else
337 head = tmp; 472 head = tmp;
338 473
339 if (LOOK_OBJ (head)) 474 if (head->client_visible ())
340 { 475 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 476 add_object_to_socklist (*pl->contr->ns, sl, head);
342 477
343 got_one++; 478 got_one++;
344 479
345 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
348 */ 483 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
350 { 485 {
351 pl->contr->socket->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
352 487
353 sl.reset (); 488 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 490 sl << uint32 (op->count);
356 got_one = 0; 491 got_one = 0;
357 } 492 }
358 } /* If LOOK_OBJ() */ 493 }
359 } 494 }
360 495
361 if (got_one) 496 if (got_one)
362 pl->contr->socket->send_packet (sl); 497 pl->contr->ns->send_packet (sl);
363} 498}
364 499
365/** 500/**
366 * Updates object *op for player *pl. 501 * Updates object *op for player *pl.
367 * 502 *
… …
374esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
375{ 510{
376 /* If we have a request to send the player item, skip a few checks. */ 511 /* If we have a request to send the player item, skip a few checks. */
377 if (op != pl) 512 if (op != pl)
378 { 513 {
379 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
380 return; 515 return;
381 /* we remove the check for op->env, because in theory, the object 516 /* we remove the check for op->env, because in theory, the object
382 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
383 * order. 518 * order.
384 */ 519 */
385 } 520 }
386 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
388 { 527 {
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 528 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
390 * this is happening - we can set a breakpoint here in the debugger 529 * this is happening - we can set a breakpoint here in the debugger
391 * and track back the call. 530 * and track back the call.
392 */ 531 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 532 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 } 533 }
395 534
396 packet sl; 535 packet sl ("upditem");
397 536
398 sl << "upditem "
399 << uint8 (flags); 537 sl << uint8 (flags);
400 538
401 if (op->head) 539 if (op->head)
402 op = op->head; 540 op = op->head;
403 541
404 sl << uint32 (op->count); 542 sl << uint32 (op->count);
… …
414 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
415 553
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417 555
418 if (pl == op) 556 if (pl == op)
419 op->contr->last_weight = weight; 557 ns->last_weight = weight;
420 } 558 }
421 559
422 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
423 { 561 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 563 esrv_send_face (ns, op->face->number, 0);
426 564
427 sl << uint32 (op->face->number); 565 sl << uint32 (op->face->number);
428 } 566 }
429 567
430 if (flags & UPD_NAME) 568 if (flags & UPD_NAME)
… …
484 } 622 }
485 623
486 if (flags & UPD_NROF) 624 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 625 sl << uint32 (op->nrof);
488 626
489 pl->contr->socket->send_packet (sl); 627 pl->contr->ns->send_packet (sl);
490} 628}
491 629
492/** 630/**
493 * Sends item's info to player. 631 * Sends item's info to player.
494 */ 632 */
… …
497{ 635{
498 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
499 if (op != pl) 637 if (op != pl)
500 { 638 {
501 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
502 if (!LOOK_OBJ (op)) 640 if (!op->client_visible ())
503 return; 641 return;
642
504 /* if the item is on the ground, mark that the look needs to 643 /* if the item is on the ground, mark that the look needs to
505 * be updated. 644 * be updated.
506 */ 645 */
507 if (!op->env) 646 if (!op->env)
508 { 647 {
509 pl->contr->socket->update_look = 1; 648 pl->contr->ns->floorbox_update ();
510 return; 649 return;
511 } 650 }
512 } 651 }
513 652
514 packet sl; 653 packet sl;
515 654
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 655 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 656
518 if (op->head) 657 if (op->head)
519 op = op->head; 658 op = op->head;
520 659
521 sl << uint32 (op->env ? op->env->count : 0); 660 sl << uint32 (op->env ? op->env->count : 0);
522 661
523 add_object_to_socklist (*pl->contr->socket, sl, op); 662 add_object_to_socklist (*pl->contr->ns, sl, op);
524 663
525 pl->contr->socket->send_packet (sl); 664 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT); 665 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 666}
528 667
529/** 668/**
530 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
… …
532 */ 671 */
533 672
534void 673void
535esrv_del_item (player *pl, int tag) 674esrv_del_item (player *pl, int tag)
536{ 675{
537 packet sl; 676 packet sl ("delitem");
538 677
539 sl << "delitem "
540 << uint32 (tag); 678 sl << uint32 (tag);
541 679
542 pl->socket->send_packet (sl); 680 pl->ns->send_packet (sl);
543} 681}
544 682
545 683
546/******************************************************************************* 684/*******************************************************************************
547 * 685 *
… …
568 else if (op->type == CONTAINER && pl->container == op) 706 else if (op->type == CONTAINER && pl->container == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 707 for (tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 708 if (tmp->count == count)
571 return tmp; 709 return tmp;
572 710
573 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 711 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
574 if (op->head && op->head->count == count) 712 if (op->head && op->head->count == count)
575 return op; 713 return op;
576 else if (op->count == count) 714 else if (op->count == count)
577 return op; 715 return op;
578 else if (op->type == CONTAINER && pl->container == op) 716 else if (op->type == CONTAINER && pl->container == op)
… …
618 return; 756 return;
619 757
620 /* If the high bit is set, player applied a pseudo object. */ 758 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 759 if (tag & 0x80000000)
622 { 760 {
623 pl->socket->look_position = tag & 0x7fffffff; 761 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 762 pl->ns->floorbox_update ();
625 return; 763 return;
626 } 764 }
627 765
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 766 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 767
… …
634 } 772 }
635 773
636 player_apply (pl->ob, op, 0, 0); 774 player_apply (pl->ob, op, 0, 0);
637} 775}
638 776
639/** Client wants to apply some object. Lets do so. */ 777/** Client wants to lock some object. Lets do so. */
640void 778void
641LockItem (char *data, int len, player *pl) 779LockItem (char *data, int len, player *pl)
642{ 780{
643 int flag = data[0]; 781 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 782 tag_t tag = net_uint32 ((uint8 *)data + 1);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 794 SET_FLAG (op, FLAG_INV_LOCKED);
657 795
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 796 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 797}
660 798
661/** Client wants to apply some object. Lets do so. */ 799/** Client wants to mark some object. Lets do so. */
662void 800void
663MarkItem (char *data, int len, player *pl) 801MarkItem (char *data, int len, player *pl)
664{ 802{
665 tag_t tag = net_uint32 ((uint8 *)data); 803 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 804 object *op = esrv_get_ob_from_count (pl->ob, tag);
… …
697 835
698 m = get_map_from_coord (op->map, &x, &y); 836 m = get_map_from_coord (op->map, &x, &y);
699 if (!m) 837 if (!m)
700 return; 838 return;
701 839
702 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 840 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
703 841
704 for (; tmp != NULL; tmp = tmp->below) 842 for (; tmp != NULL; tmp = tmp->below)
705 { 843 {
706 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 844 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
707 continue; 845 continue;
… …
754 { 892 {
755 return; 893 return;
756 } 894 }
757 dy = atoi (cp); 895 dy = atoi (cp);
758 896
759 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 897 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
760 return; 898 return;
761 899
762 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 900 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
763 return; 901 return;
764 902
765 look_at (pl->ob, dx, dy); 903 look_at (pl->ob, dx, dy);
766} 904}
767 905

Diff Legend

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