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.48 by root, Fri Jun 8 09:18:31 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors 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); 270 ns.flush_fx ();
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 ns.send_animation (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 (player *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
340 object *ob = pl->ob;
341
202 if (!pl->contr->socket->update_look) 342 if (!pl->ns->update_look)
203 { 343 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
205 return; 345 return;
206 } 346 }
207 else 347 else
208 pl->contr->socket->update_look = 0; 348 pl->ns->update_look = 0;
209 349
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (ob, FLAG_REMOVED)
211 || !pl->map 351 || !ob->map
212 || pl->map->in_memory != MAP_IN_MEMORY 352 || ob->map->in_memory != MAP_IN_MEMORY
213 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (ob->map, ob->x, ob->y))
214 return; 354 return;
215 355
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
217 ;
218
219 pl->contr->socket->send_packet ("delinv 0"); 356 pl->ns->send_packet ("delinv 0");
220 357
221 packet sl; 358 packet sl;
222 sl.printf ("item%d ", pl->contr->socket->itemcmd); 359 sl.printf ("item%d ", pl->ns->itemcmd);
223 360
224 sl << uint32 (0); 361 sl << uint32 (0);
225 362
226 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 363 pl->ns->send_face (empty_face);
227 esrv_send_face (pl->contr->socket, empty_face->number, 0); 364 pl->ns->flush_fx ();
228 365
229 if (pl->contr->socket->look_position) 366 if (pl->ns->look_position)
230 { 367 {
231 char buf[80]; 368 char buf[80];
232 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
233 370
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
235 << uint32 (0) 372 << uint32 (0)
236 << sint32 (-1) 373 << sint32 (-1)
237 << uint32 (empty_face->number) 374 << uint32 (empty_face)
238 << data8 (buf) 375 << data8 (buf)
239 << uint16 (0) 376 << uint16 (0)
240 << uint8 (0) 377 << uint8 (0)
241 << uint32 (0); 378 << uint32 (0);
242 379
243 if (pl->contr->socket->itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
244 sl << uint16 (0); 381 sl << uint16 (0);
245 } 382 }
246 383
384 object *tmp = ob->ms ().top;
247 for (last = NULL; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
248 { 386 {
249 object *head; 387 object *head;
250 388
251 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
252 { 390 {
253 last = tmp->below; /* assumes double floor mode */ 391 last = tmp->below; /* assumes double floor mode */
254 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
255 last = last->below; 393 last = last->below;
256 } 394 }
257 395
258 if (LOOK_OBJ (tmp)) 396 if (tmp->client_visible ())
259 { 397 {
260 if (++start_look < pl->contr->socket->look_position) 398 if (++start_look < pl->ns->look_position)
261 continue; 399 continue;
262 400
263 end_look++; 401 end_look++;
264 402
265 if (end_look > FLOORBOX_PAGESIZE) 403 if (end_look > FLOORBOX_PAGESIZE)
266 { 404 {
267 /* What we basically do is make a 'fake' object - when the user applies it, 405 /* 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. 406 * we notice the special tag the object has, and act accordingly.
269 */ 407 */
270 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
271 << uint32 (0) 409 << uint32 (0)
272 << uint32 ((uint32) - 1) 410 << uint32 ((uint32) - 1)
273 << uint32 (empty_face->number) 411 << uint32 (empty_face)
274 << data8 ("Apply this to see next group of items") 412 << data8 ("Apply this to see next group of items")
275 << uint16 (0) 413 << uint16 (0)
276 << uint8 (0) 414 << uint8 (0)
277 << uint32 (0); 415 << uint32 (0);
278 416
279 if (pl->contr->socket->itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
280 sl << uint16 (0); 418 sl << uint16 (0);
281 419
282 break; 420 break;
283 } 421 }
284 422
285 if (tmp->head) 423 if (tmp->head)
286 head = tmp->head; 424 head = tmp->head;
287 else 425 else
288 head = tmp; 426 head = tmp;
289 427
290 add_object_to_socklist (*pl->contr->socket, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
291 got_one++; 429 got_one++;
292 430
293 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
294 { 432 {
295 pl->contr->socket->send_packet (sl); 433 pl->ns->send_packet (sl);
296 434
297 sl.reset (); 435 sl.reset ();
298 sl.printf ("item%d ", pl->contr->socket->itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
299 sl << uint32 (0); 437 sl << uint32 (0);
300 got_one = 0; 438 got_one = 0;
301 } 439 }
302 } 440 }
303 } 441 }
304 442
305 if (got_one) 443 if (got_one)
306 pl->contr->socket->send_packet (sl); 444 pl->ns->send_packet (sl);
307 445
308} 446}
309 447
310/** 448/**
311 * Sends whole inventory. 449 * Sends whole inventory.
312 */ 450 */
313void 451void
314esrv_send_inventory (object *pl, object *op) 452esrv_send_inventory (object *pl, object *op)
315{ 453{
316 object *tmp; 454 if (!pl->contr->ns)//D
455 return;
456
317 int got_one = 0; 457 int got_one = 0;
318 458
319
320 pl->contr->socket->send_packet_printf ("delinv %d", op->count); 459 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
321 460
322 packet sl; 461 packet sl;
323 sl.printf ("item%d ", pl->contr->socket->itemcmd); 462 sl.printf ("item%d ", pl->contr->ns->itemcmd);
324 463
325 sl << uint32 (op->count); 464 sl << uint32 (op->count);
326 465
327 for (tmp = op->inv; tmp; tmp = tmp->below) 466 for (object *tmp = op->inv; tmp; tmp = tmp->below)
328 { 467 {
329 object *head; 468 object *head;
330 469
331 if (tmp->head) 470 if (tmp->head)
332 head = tmp->head; 471 head = tmp->head;
333 else 472 else
334 head = tmp; 473 head = tmp;
335 474
336 if (LOOK_OBJ (head)) 475 if (head->client_visible ())
337 { 476 {
338 add_object_to_socklist (*pl->contr->socket, sl, head); 477 add_object_to_socklist (*pl->contr->ns, sl, head);
339 478
340 got_one++; 479 got_one++;
341 480
342 /* IT is possible for players to accumulate a huge amount of 481 /* IT is possible for players to accumulate a huge amount of
343 * items (especially with some of the bags out there) to 482 * items (especially with some of the bags out there) to
344 * overflow the buffer. IF so, send multiple item commands. 483 * overflow the buffer. IF so, send multiple item commands.
345 */ 484 */
346 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
347 { 486 {
348 pl->contr->socket->send_packet (sl); 487 pl->contr->ns->send_packet (sl);
349 488
350 sl.reset (); 489 sl.reset ();
351 sl.printf ("item%d ", pl->contr->socket->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
352 sl << uint32 (op->count); 491 sl << uint32 (op->count);
353 got_one = 0; 492 got_one = 0;
354 } 493 }
355 } /* If LOOK_OBJ() */ 494 }
356 } 495 }
357 496
358 if (got_one) 497 if (got_one)
359 pl->contr->socket->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
360} 499}
361 500
362/** 501/**
363 * Updates object *op for player *pl. 502 * Updates object *op for player *pl.
364 * 503 *
365 * flags is a list of values to update 504 * flags is a list of values to update
366 * to the client (as defined in newclient.h - might as well use the 505 * to the client (as defined in newclient.h - might as well use the
367 * same value both places. 506 * same value both places.
368 */ 507 */
369
370void 508void
371esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
372{ 510{
373 /* 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. */
374 if (op != pl) 512 if (op != pl)
375 { 513 {
376 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
377 return; 515 return;
378 /* 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
379 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
380 * order. 518 * order.
381 */ 519 */
382 } 520 }
383 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
384 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
385 { 527 {
386 /* 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
387 * 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
388 * and track back the call. 530 * and track back the call.
… …
410 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
411 553
412 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
413 555
414 if (pl == op) 556 if (pl == op)
415 op->contr->last_weight = weight; 557 ns->last_weight = weight;
416 } 558 }
417 559
418 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
419 { 561 {
420 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 ns->send_face (op->face);
421 esrv_send_face (pl->contr->socket, op->face->number, 0); 563 ns->flush_fx ();
422
423 sl << uint32 (op->face->number); 564 sl << uint32 (op->face);
424 } 565 }
425 566
426 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
427 { 568 {
428 int len; 569 int len;
… …
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 *
… …
546 693
547/** 694/**
548 * Takes a player and object count (tag) and returns the actual object 695 * Takes a player and object count (tag) and returns the actual object
549 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
550 */ 697 */
551
552object * 698object *
553esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
554{ 700{
555 object *op, *tmp;
556
557 if (pl->count == count) 701 if (pl->count == count)
558 return pl; 702 return pl;
559 703
560 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
561 if (op->count == count) 705 if (op->count == count)
562 return op; 706 return op;
563 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
564 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
565 if (tmp->count == count) 709 if (tmp->count == count)
566 return tmp; 710 return tmp;
567 711
568 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 712 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
569 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
570 return op; 714 return op;
571 else if (op->count == count) 715 else if (op->count == count)
572 return op; 716 return op;
573 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
574 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
575 if (tmp->count == count) 719 if (tmp->count == count)
576 return tmp; 720 return tmp;
577 721
722#if 0
723 /* If the high bit is set, player examined a pseudo object. */
724 if (count & 0x80000000)
725 return 0;
726#endif
727
578 return 0; 728 return 0;
579} 729}
580 730
581
582/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
583void 732void
584ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
585{ 734{
586 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
587 736
588 /* If the high bit is set, player examined a pseudo object. */
589 if (tag & 0x80000000)
590 return;
591
592 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
593 738
594 if (!op) 739 if (!op)
595 { 740 {
596 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
597 return; 742 return;
598 } 743 }
599 744
600 examine (pl->ob, op); 745 examine (pl->ob, op);
746}
747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (char *buf, int len, player *pl)
751{
752 tag_t tag = atoi (buf);
753
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 {
756 std::string s = op->describe (pl->ob);
757
758 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str ();
760
761 pl->ns->send_packet (sl);
762 }
601} 763}
602 764
603/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
604void 766void
605ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
613 return; 775 return;
614 776
615 /* If the high bit is set, player applied a pseudo object. */ 777 /* If the high bit is set, player applied a pseudo object. */
616 if (tag & 0x80000000) 778 if (tag & 0x80000000)
617 { 779 {
618 pl->socket->look_position = tag & 0x7fffffff; 780 pl->ns->look_position = tag & 0x7fffffff;
619 pl->socket->floorbox_update (); 781 pl->ns->floorbox_update ();
620 return; 782 return;
621 } 783 }
622 784
623 object *op = esrv_get_ob_from_count (pl->ob, tag); 785 object *op = esrv_get_ob_from_count (pl->ob, tag);
624 786
… …
674 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
675 * 837 *
676 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
677 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
678 */ 840 */
679void 841static void
680look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
681{ 843{
682 object *tmp; 844 object *ob = pl->ob;
845
846 maptile *m = pl->observe->map;
847 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy;
849
850 if (!xy_normalise (m, x, y))
851 {
852 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853 return;
854 }
855
683 int flag = 0; 856 int flag = 0;
684 sint16 x, y;
685 maptile *m;
686 857
687 x = op->x + dx; 858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
688 y = op->y + dy; 859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue;
689 862
690 if (out_of_map (op->map, x, y)) 863 if (!flag)
864 {
865 if (dx || dy)
866 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
867 else
868 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
869
870 flag = 1;
871 }
872
873 if (QUERY_FLAG (ob, FLAG_WIZ))
874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
875 else
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
877
878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
881
882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
883 break;
884 }
885
886 if (!flag)
887 {
888 if (dx || dy)
889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
890 else
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
892 }
893}
894
895/** Client wants to look at some object. Lets do so. */
896void
897LookAt (char *buf, int len, player *pl)
898{
899 char *cp;
900
901 int dx = atoi (buf);
902 if (!(cp = strchr (buf, ' ')))
691 return; 903 return;
692 904
693 m = get_map_from_coord (op->map, &x, &y);
694 if (!m)
695 return;
696
697 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
698
699 for (; tmp != NULL; tmp = tmp->below)
700 {
701 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
702 continue;
703
704 if (!flag)
705 {
706 if (dx || dy)
707 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
708 else
709 {
710 clear_win_info (op);
711 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
712 }
713 flag = 1;
714 }
715
716 if (QUERY_FLAG (op, FLAG_WIZ))
717 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
718 else
719 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
720
721 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
722 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
723 inventory (op, tmp->head == NULL ? tmp : tmp->head);
724
725 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
726 break;
727 }
728
729 if (!flag)
730 {
731 if (dx || dy)
732 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
733 else
734 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
735 }
736}
737
738
739
740/** Client wants to look at some object. Lets do so. */
741void
742LookAt (char *buf, int len, player *pl)
743{
744 int dx, dy;
745 char *cp;
746
747 dx = atoi (buf);
748 if (!(cp = strchr (buf, ' ')))
749 {
750 return;
751 }
752 dy = atoi (cp); 905 int dy = atoi (cp);
753 906
754 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 907 if (player *opl = pl->observe->contr)
908 if (client *ns = opl->ns)
909 {
910 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
755 return; 911 return;
756 912
757 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 913 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
758 return; 914 return;
915 }
759 916
760 look_at (pl->ob, dx, dy); 917 look_at (pl, dx, dy);
761} 918}
762 919
763/** Move an object to a new location */ 920/** Move an object to a new location */
764void 921void
765esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 922esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

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