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.27 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.39 by root, Mon Feb 26 20:36:15 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 *
… …
163 { 304 {
164 if (head->anim_speed) 305 if (head->anim_speed)
165 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
166 else 307 else
167 { 308 {
168 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
169 anim_speed = 255; 310 anim_speed = 255;
170 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
171 anim_speed = 1; 312 anim_speed = 1;
172 else 313 else
173 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
174 } 315 }
175 316
176 if (anim_speed > 255) 317 if (anim_speed > 255)
177 anim_speed = 255; 318 anim_speed = 255;
178 } 319 }
… …
183 if (ns.itemcmd == 2) 324 if (ns.itemcmd == 2)
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
189 329
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 (player %s)\n", &pl->name);
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)
217 ;
218
219 pl->contr->socket->send_packet ("delinv 0"); 355 pl->contr->ns->send_packet ("delinv 0");
220 356
221 packet sl; 357 packet sl;
222 sl.printf ("item%d ", pl->contr->socket->itemcmd); 358 sl.printf ("item%d ", pl->contr->ns->itemcmd);
223 359
224 sl << uint32 (0); 360 sl << uint32 (0);
225 361
226 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))
227 esrv_send_face (pl->contr->socket, empty_face->number, 0); 363 esrv_send_face (pl->contr->ns, empty_face->number, 0);
228 364
229 if (pl->contr->socket->look_position) 365 if (pl->contr->ns->look_position)
230 { 366 {
231 char buf[80]; 367 char buf[80];
232 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
233 369
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
235 << uint32 (0) 371 << uint32 (0)
236 << sint32 (-1) 372 << sint32 (-1)
237 << uint32 (empty_face->number) 373 << uint32 (empty_face->number)
238 << data8 (buf) 374 << data8 (buf)
239 << uint16 (0) 375 << uint16 (0)
240 << uint8 (0) 376 << uint8 (0)
241 << uint32 (0); 377 << uint32 (0);
242 378
243 if (pl->contr->socket->itemcmd == 2) 379 if (pl->contr->ns->itemcmd == 2)
244 sl << uint16 (0); 380 sl << uint16 (0);
245 } 381 }
246 382
383 object *tmp = pl->ms ().top;
247 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
248 { 385 {
249 object *head; 386 object *head;
250 387
251 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
252 { 389 {
253 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
254 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
255 last = last->below; 392 last = last->below;
256 } 393 }
257 394
258 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
259 { 396 {
260 if (++start_look < pl->contr->socket->look_position) 397 if (++start_look < pl->contr->ns->look_position)
261 continue; 398 continue;
262 399
263 end_look++; 400 end_look++;
264 401
265 if (end_look > FLOORBOX_PAGESIZE) 402 if (end_look > FLOORBOX_PAGESIZE)
266 { 403 {
267 /* 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,
268 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
269 */ 406 */
270 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) 407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
271 << uint32 (0) 408 << uint32 (0)
272 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
273 << uint32 (empty_face->number) 410 << uint32 (empty_face->number)
274 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
275 << uint16 (0) 412 << uint16 (0)
276 << uint8 (0) 413 << uint8 (0)
277 << uint32 (0); 414 << uint32 (0);
278 415
279 if (pl->contr->socket->itemcmd == 2) 416 if (pl->contr->ns->itemcmd == 2)
280 sl << uint16 (0); 417 sl << uint16 (0);
281 418
282 break; 419 break;
283 } 420 }
284 421
285 if (tmp->head) 422 if (tmp->head)
286 head = tmp->head; 423 head = tmp->head;
287 else 424 else
288 head = tmp; 425 head = tmp;
289 426
290 add_object_to_socklist (*pl->contr->socket, sl, head); 427 add_object_to_socklist (*pl->contr->ns, sl, head);
291 got_one++; 428 got_one++;
292 429
293 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
294 { 431 {
295 pl->contr->socket->send_packet (sl); 432 pl->contr->ns->send_packet (sl);
296 433
297 sl.reset (); 434 sl.reset ();
298 sl.printf ("item%d ", pl->contr->socket->itemcmd); 435 sl.printf ("item%d ", pl->contr->ns->itemcmd);
299 sl << uint32 (0); 436 sl << uint32 (0);
300 got_one = 0; 437 got_one = 0;
301 } 438 }
302 } 439 }
303 } 440 }
304 441
305 if (got_one) 442 if (got_one)
306 pl->contr->socket->send_packet (sl); 443 pl->contr->ns->send_packet (sl);
307 444
308} 445}
309 446
310/** 447/**
311 * Sends whole inventory. 448 * Sends whole inventory.
312 */ 449 */
313void 450void
314esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
315{ 452{
316 object *tmp; 453 if (!pl->contr->ns)//D
454 return;
455
317 int got_one = 0; 456 int got_one = 0;
318 457
319
320 pl->contr->socket->send_packet_printf ("delinv %d", op->count); 458 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
321 459
322 packet sl; 460 packet sl;
323 sl.printf ("item%d ", pl->contr->socket->itemcmd); 461 sl.printf ("item%d ", pl->contr->ns->itemcmd);
324 462
325 sl << uint32 (op->count); 463 sl << uint32 (op->count);
326 464
327 for (tmp = op->inv; tmp; tmp = tmp->below) 465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
328 { 466 {
329 object *head; 467 object *head;
330 468
331 if (tmp->head) 469 if (tmp->head)
332 head = tmp->head; 470 head = tmp->head;
333 else 471 else
334 head = tmp; 472 head = tmp;
335 473
336 if (LOOK_OBJ (head)) 474 if (head->client_visible ())
337 { 475 {
338 add_object_to_socklist (*pl->contr->socket, sl, head); 476 add_object_to_socklist (*pl->contr->ns, sl, head);
339 477
340 got_one++; 478 got_one++;
341 479
342 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
343 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
344 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
345 */ 483 */
346 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
347 { 485 {
348 pl->contr->socket->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
349 487
350 sl.reset (); 488 sl.reset ();
351 sl.printf ("item%d ", pl->contr->socket->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
352 sl << uint32 (op->count); 490 sl << uint32 (op->count);
353 got_one = 0; 491 got_one = 0;
354 } 492 }
355 } /* If LOOK_OBJ() */ 493 }
356 } 494 }
357 495
358 if (got_one) 496 if (got_one)
359 pl->contr->socket->send_packet (sl); 497 pl->contr->ns->send_packet (sl);
360} 498}
361 499
362/** 500/**
363 * Updates object *op for player *pl. 501 * Updates object *op for player *pl.
364 * 502 *
365 * flags is a list of values to update 503 * flags is a list of values to update
366 * to the client (as defined in newclient.h - might as well use the 504 * to the client (as defined in newclient.h - might as well use the
367 * same value both places. 505 * same value both places.
368 */ 506 */
369
370void 507void
371esrv_update_item (int flags, object *pl, object *op) 508esrv_update_item (int flags, object *pl, object *op)
372{ 509{
373 /* If we have a request to send the player item, skip a few checks. */ 510 /* If we have a request to send the player item, skip a few checks. */
374 if (op != pl) 511 if (op != pl)
375 { 512 {
376 if (!LOOK_OBJ (op)) 513 if (!op->client_visible ())
377 return; 514 return;
378 /* we remove the check for op->env, because in theory, the object 515 /* we remove the check for op->env, because in theory, the object
379 * is hopefully in the same place, so the client should preserve 516 * is hopefully in the same place, so the client should preserve
380 * order. 517 * order.
381 */ 518 */
382 } 519 }
383 520
521 client *ns = pl->contr->ns;
522 if (!ns)
523 return;
524
384 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
385 { 526 {
386 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
387 * this is happening - we can set a breakpoint here in the debugger 528 * this is happening - we can set a breakpoint here in the debugger
388 * and track back the call. 529 * and track back the call.
… …
410 sint32 weight = WEIGHT (op); 551 sint32 weight = WEIGHT (op);
411 552
412 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
413 554
414 if (pl == op) 555 if (pl == op)
415 op->contr->last_weight = weight; 556 ns->last_weight = weight;
416 } 557 }
417 558
418 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
419 { 560 {
420 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 561 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
421 esrv_send_face (pl->contr->socket, op->face->number, 0); 562 esrv_send_face (ns, op->face->number, 0);
422 563
423 sl << uint32 (op->face->number); 564 sl << uint32 (op->face->number);
424 } 565 }
425 566
426 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
… …
462 { 603 {
463 if (op->anim_speed) 604 if (op->anim_speed)
464 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
465 else 606 else
466 { 607 {
467 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
468 anim_speed = 255; 609 anim_speed = 255;
469 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
470 anim_speed = 1; 611 anim_speed = 1;
471 else 612 else
472 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
473 } 614 }
474 615
475 if (anim_speed > 255) 616 if (anim_speed > 255)
476 anim_speed = 255; 617 anim_speed = 255;
477 } 618 }
… …
480 } 621 }
481 622
482 if (flags & UPD_NROF) 623 if (flags & UPD_NROF)
483 sl << uint32 (op->nrof); 624 sl << uint32 (op->nrof);
484 625
485 pl->contr->socket->send_packet (sl); 626 pl->contr->ns->send_packet (sl);
486} 627}
487 628
488/** 629/**
489 * Sends item's info to player. 630 * Sends item's info to player.
490 */ 631 */
491void 632void
492esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
493{ 634{
635 if (!pl->contr->ns)
636 return;
637
494 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
495 if (op != pl) 639 if (op != pl)
496 { 640 {
497 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
498 if (!LOOK_OBJ (op)) 642 if (!op->client_visible ())
499 return; 643 return;
644
500 /* 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
501 * be updated. 646 * be updated.
502 */ 647 */
503 if (!op->env) 648 if (!op->env)
504 { 649 {
505 pl->contr->socket->floorbox_update (); 650 pl->contr->ns->floorbox_update ();
506 return; 651 return;
507 } 652 }
508 } 653 }
509 654
510 packet sl; 655 packet sl;
511 656
512 sl.printf ("item%d ", pl->contr->socket->itemcmd); 657 sl.printf ("item%d ", pl->contr->ns->itemcmd);
513 658
514 if (op->head) 659 if (op->head)
515 op = op->head; 660 op = op->head;
516 661
517 sl << uint32 (op->env ? op->env->count : 0); 662 sl << uint32 (op->env ? op->env->count : 0);
518 663
519 add_object_to_socklist (*pl->contr->socket, sl, op); 664 add_object_to_socklist (*pl->contr->ns, sl, op);
520 665
521 pl->contr->socket->send_packet (sl); 666 pl->contr->ns->send_packet (sl);
522 SET_FLAG (op, FLAG_CLIENT_SENT); 667 SET_FLAG (op, FLAG_CLIENT_SENT);
523} 668}
524 669
525/** 670/**
526 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
527 * command with a -1 location. 672 * command with a -1 location.
528 */ 673 */
529
530void 674void
531esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
532{ 676{
677 if (!pl->ns)
678 return;
679
533 packet sl ("delitem"); 680 packet sl ("delitem");
534 681
535 sl << uint32 (tag); 682 sl << uint32 (tag);
536 683
537 pl->socket->send_packet (sl); 684 pl->ns->send_packet (sl);
538} 685}
539 686
540 687
541/******************************************************************************* 688/*******************************************************************************
542 * 689 *
… …
563 else if (op->type == CONTAINER && pl->container == op) 710 else if (op->type == CONTAINER && pl->container == op)
564 for (tmp = op->inv; tmp; tmp = tmp->below) 711 for (tmp = op->inv; tmp; tmp = tmp->below)
565 if (tmp->count == count) 712 if (tmp->count == count)
566 return tmp; 713 return tmp;
567 714
568 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 715 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
569 if (op->head && op->head->count == count) 716 if (op->head && op->head->count == count)
570 return op; 717 return op;
571 else if (op->count == count) 718 else if (op->count == count)
572 return op; 719 return op;
573 else if (op->type == CONTAINER && pl->container == op) 720 else if (op->type == CONTAINER && pl->container == op)
… …
613 return; 760 return;
614 761
615 /* If the high bit is set, player applied a pseudo object. */ 762 /* If the high bit is set, player applied a pseudo object. */
616 if (tag & 0x80000000) 763 if (tag & 0x80000000)
617 { 764 {
618 pl->socket->look_position = tag & 0x7fffffff; 765 pl->ns->look_position = tag & 0x7fffffff;
619 pl->socket->floorbox_update (); 766 pl->ns->floorbox_update ();
620 return; 767 return;
621 } 768 }
622 769
623 object *op = esrv_get_ob_from_count (pl->ob, tag); 770 object *op = esrv_get_ob_from_count (pl->ob, tag);
624 771
… …
692 839
693 m = get_map_from_coord (op->map, &x, &y); 840 m = get_map_from_coord (op->map, &x, &y);
694 if (!m) 841 if (!m)
695 return; 842 return;
696 843
697 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 844 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
698 845
699 for (; tmp != NULL; tmp = tmp->below) 846 for (; tmp != NULL; tmp = tmp->below)
700 { 847 {
701 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 848 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
702 continue; 849 continue;
… …
733 else 880 else
734 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 881 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
735 } 882 }
736} 883}
737 884
738
739
740/** Client wants to look at some object. Lets do so. */ 885/** Client wants to look at some object. Lets do so. */
741void 886void
742LookAt (char *buf, int len, player *pl) 887LookAt (char *buf, int len, player *pl)
743{ 888{
744 int dx, dy; 889 int dx, dy;
… …
749 { 894 {
750 return; 895 return;
751 } 896 }
752 dy = atoi (cp); 897 dy = atoi (cp);
753 898
754 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)
755 return; 900 return;
756 901
757 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])
758 return; 903 return;
759 904
760 look_at (pl->ob, dx, dy); 905 look_at (pl->ob, dx, dy);
761} 906}
762 907

Diff Legend

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