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

Diff Legend

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