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.26 by root, Tue Dec 19 05:41:22 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) 356 pl->ns->send_packet ("delinv 0");
217 ;
218 357
219 packet sl; 358 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 359 sl.printf ("item%d ", pl->ns->itemcmd);
224 360
225 sl << uint32 (0); 361 sl << uint32 (0);
226 362
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 363 pl->ns->send_face (empty_face);
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 364 pl->ns->flush_fx ();
229 365
230 if (pl->contr->socket->look_position) 366 if (pl->ns->look_position)
231 { 367 {
232 char buf[80]; 368 char buf[80];
233 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);
234 370
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
236 << uint32 (0) 372 << uint32 (0)
237 << sint32 (-1) 373 << sint32 (-1)
238 << uint32 (empty_face->number) 374 << uint32 (empty_face)
239 << data8 (buf) 375 << data8 (buf)
240 << uint16 (0) 376 << uint16 (0)
241 << uint8 (0) 377 << uint8 (0)
242 << uint32 (0); 378 << uint32 (0);
243 379
244 if (pl->contr->socket->itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
245 sl << uint16 (0); 381 sl << uint16 (0);
246 } 382 }
247 383
384 object *tmp = ob->ms ().top;
248 for (last = NULL; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
249 { 386 {
250 object *head; 387 object *head;
251 388
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
253 { 390 {
254 last = tmp->below; /* assumes double floor mode */ 391 last = tmp->below; /* assumes double floor mode */
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
256 last = last->below; 393 last = last->below;
257 } 394 }
258 395
259 if (LOOK_OBJ (tmp)) 396 if (tmp->client_visible ())
260 { 397 {
261 if (++start_look < pl->contr->socket->look_position) 398 if (++start_look < pl->ns->look_position)
262 continue; 399 continue;
263 400
264 end_look++; 401 end_look++;
265 402
266 if (end_look > FLOORBOX_PAGESIZE) 403 if (end_look > FLOORBOX_PAGESIZE)
267 { 404 {
268 /* 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,
269 * we notice the special tag the object has, and act accordingly. 406 * we notice the special tag the object has, and act accordingly.
270 */ 407 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
272 << uint32 (0) 409 << uint32 (0)
273 << uint32 ((uint32) - 1) 410 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number) 411 << uint32 (empty_face)
275 << data8 ("Apply this to see next group of items") 412 << data8 ("Apply this to see next group of items")
276 << uint16 (0) 413 << uint16 (0)
277 << uint8 (0) 414 << uint8 (0)
278 << uint32 (0); 415 << uint32 (0);
279 416
280 if (pl->contr->socket->itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
281 sl << uint16 (0); 418 sl << uint16 (0);
282 419
283 break; 420 break;
284 } 421 }
285 422
286 if (tmp->head) 423 if (tmp->head)
287 head = tmp->head; 424 head = tmp->head;
288 else 425 else
289 head = tmp; 426 head = tmp;
290 427
291 add_object_to_socklist (*pl->contr->socket, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
292 got_one++; 429 got_one++;
293 430
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 { 432 {
296 pl->contr->socket->send_packet (sl); 433 pl->ns->send_packet (sl);
297 434
298 sl.reset (); 435 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
300 sl << uint32 (0); 437 sl << uint32 (0);
301 got_one = 0; 438 got_one = 0;
302 } 439 }
303 } 440 }
304 } 441 }
305 442
306 if (got_one) 443 if (got_one)
307 pl->contr->socket->send_packet (sl); 444 pl->ns->send_packet (sl);
308 445
309} 446}
310 447
311/** 448/**
312 * Sends whole inventory. 449 * Sends whole inventory.
313 */ 450 */
314void 451void
315esrv_send_inventory (object *pl, object *op) 452esrv_send_inventory (object *pl, object *op)
316{ 453{
317 object *tmp; 454 if (!pl->contr->ns)//D
455 return;
456
318 int got_one = 0; 457 int got_one = 0;
319 458
459 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
460
320 packet sl; 461 packet sl;
321
322 sl.printf ("delinv %d", op->count);
323 pl->contr->socket->send_packet (sl);
324
325 sl.reset ();
326 sl.printf ("item%d ", pl->contr->socket->itemcmd); 462 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 463
328 sl << uint32 (op->count); 464 sl << uint32 (op->count);
329 465
330 for (tmp = op->inv; tmp; tmp = tmp->below) 466 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 467 {
332 object *head; 468 object *head;
333 469
334 if (tmp->head) 470 if (tmp->head)
335 head = tmp->head; 471 head = tmp->head;
336 else 472 else
337 head = tmp; 473 head = tmp;
338 474
339 if (LOOK_OBJ (head)) 475 if (head->client_visible ())
340 { 476 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 477 add_object_to_socklist (*pl->contr->ns, sl, head);
342 478
343 got_one++; 479 got_one++;
344 480
345 /* IT is possible for players to accumulate a huge amount of 481 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 482 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 483 * overflow the buffer. IF so, send multiple item commands.
348 */ 484 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
350 { 486 {
351 pl->contr->socket->send_packet (sl); 487 pl->contr->ns->send_packet (sl);
352 488
353 sl.reset (); 489 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 491 sl << uint32 (op->count);
356 got_one = 0; 492 got_one = 0;
357 } 493 }
358 } /* If LOOK_OBJ() */ 494 }
359 } 495 }
360 496
361 if (got_one) 497 if (got_one)
362 pl->contr->socket->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
363} 499}
364 500
365/** 501/**
366 * Updates object *op for player *pl. 502 * Updates object *op for player *pl.
367 * 503 *
368 * flags is a list of values to update 504 * flags is a list of values to update
369 * 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
370 * same value both places. 506 * same value both places.
371 */ 507 */
372
373void 508void
374esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
375{ 510{
376 /* If we have a request to send the player item, skip a few checks. */ 511 /* If we have a request to send the player item, skip a few checks. */
377 if (op != pl) 512 if (op != pl)
378 { 513 {
379 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
380 return; 515 return;
381 /* we remove the check for op->env, because in theory, the object 516 /* we remove the check for op->env, because in theory, the object
382 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
383 * order. 518 * order.
384 */ 519 */
385 } 520 }
386 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
388 { 527 {
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 528 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
390 * this is happening - we can set a breakpoint here in the debugger 529 * this is happening - we can set a breakpoint here in the debugger
391 * and track back the call. 530 * and track back the call.
392 */ 531 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 532 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 } 533 }
395 534
396 packet sl; 535 packet sl ("upditem");
397 536
398 sl << "upditem "
399 << uint8 (flags); 537 sl << uint8 (flags);
400 538
401 if (op->head) 539 if (op->head)
402 op = op->head; 540 op = op->head;
403 541
404 sl << uint32 (op->count); 542 sl << uint32 (op->count);
… …
414 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
415 553
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417 555
418 if (pl == op) 556 if (pl == op)
419 op->contr->last_weight = weight; 557 ns->last_weight = weight;
420 } 558 }
421 559
422 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
423 { 561 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 ns->send_face (op->face);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 563 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 564 sl << uint32 (op->face);
428 } 565 }
429 566
430 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
431 { 568 {
432 int len; 569 int len;
… …
466 { 603 {
467 if (op->anim_speed) 604 if (op->anim_speed)
468 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
469 else 606 else
470 { 607 {
471 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
472 anim_speed = 255; 609 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
474 anim_speed = 1; 611 anim_speed = 1;
475 else 612 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
477 } 614 }
478 615
479 if (anim_speed > 255) 616 if (anim_speed > 255)
480 anim_speed = 255; 617 anim_speed = 255;
481 } 618 }
… …
484 } 621 }
485 622
486 if (flags & UPD_NROF) 623 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 624 sl << uint32 (op->nrof);
488 625
489 pl->contr->socket->send_packet (sl); 626 pl->contr->ns->send_packet (sl);
490} 627}
491 628
492/** 629/**
493 * Sends item's info to player. 630 * Sends item's info to player.
494 */ 631 */
495void 632void
496esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
497{ 634{
635 if (!pl->contr->ns)
636 return;
637
498 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
499 if (op != pl) 639 if (op != pl)
500 { 640 {
501 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
502 if (!LOOK_OBJ (op)) 642 if (!op->client_visible ())
503 return; 643 return;
644
504 /* 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
505 * be updated. 646 * be updated.
506 */ 647 */
507 if (!op->env) 648 if (!op->env)
508 { 649 {
509 pl->contr->socket->floorbox_update (); 650 pl->contr->ns->floorbox_update ();
510 return; 651 return;
511 } 652 }
512 } 653 }
513 654
514 packet sl; 655 packet sl;
515 656
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 657 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 658
518 if (op->head) 659 if (op->head)
519 op = op->head; 660 op = op->head;
520 661
521 sl << uint32 (op->env ? op->env->count : 0); 662 sl << uint32 (op->env ? op->env->count : 0);
522 663
523 add_object_to_socklist (*pl->contr->socket, sl, op); 664 add_object_to_socklist (*pl->contr->ns, sl, op);
524 665
525 pl->contr->socket->send_packet (sl); 666 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT); 667 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 668}
528 669
529/** 670/**
530 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
531 * command with a -1 location. 672 * command with a -1 location.
532 */ 673 */
533
534void 674void
535esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
536{ 676{
537 packet sl; 677 if (!pl->ns)
678 return;
538 679
539 sl << "delitem " 680 packet sl ("delitem");
681
540 << uint32 (tag); 682 sl << uint32 (tag);
541 683
542 pl->socket->send_packet (sl); 684 pl->ns->send_packet (sl);
543} 685}
544 686
545 687
546/******************************************************************************* 688/*******************************************************************************
547 * 689 *
… …
551 693
552/** 694/**
553 * 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
554 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
555 */ 697 */
556
557object * 698object *
558esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
559{ 700{
560 object *op, *tmp;
561
562 if (pl->count == count) 701 if (pl->count == count)
563 return pl; 702 return pl;
564 703
565 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 705 if (op->count == count)
567 return op; 706 return op;
568 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 709 if (tmp->count == count)
571 return tmp; 710 return tmp;
572 711
573 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)
574 if (op->head && op->head->count == count) 713 if (op->head && op->head->count == count)
575 return op; 714 return op;
576 else if (op->count == count) 715 else if (op->count == count)
577 return op; 716 return op;
578 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 719 if (tmp->count == count)
581 return tmp; 720 return tmp;
582 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
583 return 0; 728 return 0;
584} 729}
585 730
586
587/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
588void 732void
589ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
590{ 734{
591 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
592 736
593 /* If the high bit is set, player examined a pseudo object. */
594 if (tag & 0x80000000)
595 return;
596
597 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
598 738
599 if (!op) 739 if (!op)
600 { 740 {
601 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);
602 return; 742 return;
603 } 743 }
604 744
605 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 }
606} 763}
607 764
608/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
609void 766void
610ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
… …
618 return; 775 return;
619 776
620 /* If the high bit is set, player applied a pseudo object. */ 777 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 778 if (tag & 0x80000000)
622 { 779 {
623 pl->socket->look_position = tag & 0x7fffffff; 780 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->floorbox_update (); 781 pl->ns->floorbox_update ();
625 return; 782 return;
626 } 783 }
627 784
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 785 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 786
… …
679 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
680 * 837 *
681 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
682 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
683 */ 840 */
684void 841static void
685look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
686{ 843{
687 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
688 int flag = 0; 856 int flag = 0;
689 sint16 x, y;
690 maptile *m;
691 857
692 x = op->x + dx; 858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
693 y = op->y + dy; 859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue;
694 862
695 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, ' ')))
696 return; 903 return;
697 904
698 m = get_map_from_coord (op->map, &x, &y);
699 if (!m)
700 return;
701
702 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
703
704 for (; tmp != NULL; tmp = tmp->below)
705 {
706 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
707 continue;
708
709 if (!flag)
710 {
711 if (dx || dy)
712 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
713 else
714 {
715 clear_win_info (op);
716 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
717 }
718 flag = 1;
719 }
720
721 if (QUERY_FLAG (op, FLAG_WIZ))
722 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
723 else
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
725
726 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
727 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
728 inventory (op, tmp->head == NULL ? tmp : tmp->head);
729
730 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
731 break;
732 }
733
734 if (!flag)
735 {
736 if (dx || dy)
737 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
738 else
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
740 }
741}
742
743
744
745/** Client wants to look at some object. Lets do so. */
746void
747LookAt (char *buf, int len, player *pl)
748{
749 int dx, dy;
750 char *cp;
751
752 dx = atoi (buf);
753 if (!(cp = strchr (buf, ' ')))
754 {
755 return;
756 }
757 dy = atoi (cp); 905 int dy = atoi (cp);
758 906
759 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)
760 return; 911 return;
761 912
762 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])
763 return; 914 return;
915 }
764 916
765 look_at (pl->ob, dx, dy); 917 look_at (pl, dx, dy);
766} 918}
767 919
768/** Move an object to a new location */ 920/** Move an object to a new location */
769void 921void
770esrv_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