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

Diff Legend

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