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.62 by root, Wed Apr 23 07:49:57 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra 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 * Deliantra 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 3 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, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client/server logic. 26 * Client/server logic.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * This containes item logic for client/server. It doesn't contain 30 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 32 * the logic for what items should be sent.
33 */ 33 */
34 34
35#include <global.h> 35#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
37#include <sproto.h> 37#include <sproto.h>
38 38
39/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41
42#if 0
43tag_t
44client_container::tag () const
45{
46 switch (type)
47 {
48 case CC_INVENTORY:
49 return ns->pl->count;
50 case CC_MAPSPACE:
51 return 0;
52 case CC_CONTAINER:
53 return env->count;
54 }
55
56 abort ();
57}
58
59void
60client_container::clear ()
61{
62 switch (type)
63 {
64 case CC_INVENTORY:
65 abort ();
66
67 case CC_MAPSPACE:
68 case CC_CONTAINER:
69 ns->send_packet_printf ("delinv %d", tag ());
70 break;
71 }
72
73 for (iterator i = begin (); i != end (); ++i)
74 i->op->seen_by = 0;
75
76 vector< refitem, slice_allocator<refitem> >::clear ();
77}
78
79inline iterator
80client_container::merge_item (iterator i, object *op)
81{
82 if (i != end () && i->op == op)
83 return ++i;
84
85 if (op->seen_by)
86 return; // seen by another entity already
87
88 op->seen_by = this;
89
90 refitem ref;
91 ref.op = op;
92
93 return insert (i, ref);
94}
95
96void
97client_container::update (int offset)
98{
99 iterator i = begin ();
100
101 switch (type)
102 {
103 case CC_INVENTORY:
104 case CC_CONTAINER:
105 {
106 object *env = type == CC_INVENTORY
107 ? ns->pl->ob
108 : this->env;
109
110 // pass 1, erase all objects no longer in container
111 for (iterator j = begin (); j != end (); ++j)
112 if (j->op->env != env)
113 {
114 j->op->seen_by = 0;
115 erase (j);
116 }
117
118 // pass 2 merge items
119 for (object *op = env->inv; op; op = op->below)
120 {
121 if (--offset < 0)
122 i = merge_item (i, op);
123 else if (offset < -FLOORBOX_PAGESIZE)
124 break;
125 }
126 }
127 break;
128
129 case CC_MAPSPACE:
130 {
131 // pass 1, erase all objects no longer on space
132 for (iterator j = begin (); j != end (); ++j)
133 if (j->op->x != x || j->op->y != y || j->op->map != map)
134 {
135 j->op->seen_by = 0;
136 erase (j);
137 }
138
139 // pass 2 merge items
140 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
141 {
142 if (--offset < 0)
143 i = merge_item (i, op);
144 else if (offset < -FLOORBOX_PAGESIZE)
145 break;
146 }
147 }
148 break;
149 }
150
151 // pass 3, erase all extra items
152 for (iterator j = i; j != end (); ++j)
153 j->op->seen_by = 0;
154
155 if (i != end ())
156 erase (i, end ());
157}
158
159void
160client_container::set_mapspace (maptile *map, int x, int y)
161{
162 if (type == CC_MAPSPACE
163 && this->map == map
164 && this->x == x
165 && this->y == y)
166 return;
167
168 clear ();
169
170 type = CC_MAPSPACE;
171 this->map = map;
172 this->x = x;
173 this->y = y;
174}
175
176void
177client_container::set_container (object *env)
178{
179}
180#endif
41 181
42/******************************************************************************* 182/*******************************************************************************
43 * 183 *
44 * Functions related to sending object data to the client. 184 * Functions related to sending object data to the client.
45 * 185 *
… …
123 263
124 flags = query_flags (head); 264 flags = query_flags (head);
125 if (QUERY_FLAG (head, FLAG_NO_PICK)) 265 if (QUERY_FLAG (head, FLAG_NO_PICK))
126 flags |= F_NOPICK; 266 flags |= F_NOPICK;
127 267
128 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 268 ns.send_face (head->face, -50);
129 esrv_send_face (&ns, head->face->number, 0); 269 ns.flush_fx ();
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 : head->client_weight ())
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 (player *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
339 object *ob = pl->ob;
340
202 if (!pl->contr->socket->update_look) 341 if (!pl->ns->update_look)
203 { 342 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 343 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
205 return; 344 return;
206 } 345 }
207 else 346 else
208 pl->contr->socket->update_look = 0; 347 pl->ns->update_look = 0;
209 348
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (ob, FLAG_REMOVED)
211 || !pl->map 350 || !ob->map
212 || pl->map->in_memory != MAP_IN_MEMORY 351 || ob->map->in_memory != MAP_ACTIVE
213 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (ob->map, ob->x, ob->y))
214 return; 353 return;
215 354
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
217 ;
218
219 pl->contr->socket->send_packet ("delinv 0"); 355 pl->ns->send_packet ("delinv 0");
220 356
221 packet sl; 357 packet sl;
222 sl.printf ("item%d ", pl->contr->socket->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
223 359
224 sl << uint32 (0); 360 sl << uint32 (0);
225 361
226 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 pl->ns->send_face (empty_face, -50);
227 esrv_send_face (pl->contr->socket, empty_face->number, 0); 363 pl->ns->flush_fx ();
228 364
229 if (pl->contr->socket->look_position) 365 if (pl->ns->look_position)
230 { 366 {
231 char buf[80]; 367 char buf[80];
232 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE); 368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
233 369
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
235 << uint32 (0) 371 << uint32 (0)
236 << sint32 (-1) 372 << sint32 (-1)
237 << uint32 (empty_face->number) 373 << uint32 (empty_face)
238 << data8 (buf) 374 << data8 (buf)
239 << uint16 (0) 375 << uint16 (0)
240 << uint8 (0) 376 << uint8 (0)
241 << uint32 (0); 377 << uint32 (0);
242 378
243 if (pl->contr->socket->itemcmd == 2) 379 if (pl->ns->itemcmd == 2)
244 sl << uint16 (0); 380 sl << uint16 (0);
245 } 381 }
246 382
383 object *tmp = ob->ms ().top;
247 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
248 { 385 {
249 object *head; 386 object *head;
250 387
251 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
252 { 389 {
253 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
254 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
255 last = last->below; 392 last = last->below;
256 } 393 }
257 394
258 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
259 { 396 {
260 if (++start_look < pl->contr->socket->look_position) 397 if (++start_look < pl->ns->look_position)
261 continue; 398 continue;
262 399
263 end_look++; 400 end_look++;
264 401
265 if (end_look > FLOORBOX_PAGESIZE) 402 if (end_look > FLOORBOX_PAGESIZE)
266 { 403 {
267 /* What we basically do is make a 'fake' object - when the user applies it, 404 /* What we basically do is make a 'fake' object - when the user applies it,
268 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
269 */ 406 */
270 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE)) 407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
271 << uint32 (0) 408 << uint32 (0)
272 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
273 << uint32 (empty_face->number) 410 << uint32 (empty_face)
274 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
275 << uint16 (0) 412 << uint16 (0)
276 << uint8 (0) 413 << uint8 (0)
277 << uint32 (0); 414 << uint32 (0);
278 415
279 if (pl->contr->socket->itemcmd == 2) 416 if (pl->ns->itemcmd == 2)
280 sl << uint16 (0); 417 sl << uint16 (0);
281 418
282 break; 419 break;
283 } 420 }
284 421
285 if (tmp->head) 422 if (tmp->head)
286 head = tmp->head; 423 head = tmp->head;
287 else 424 else
288 head = tmp; 425 head = tmp;
289 426
290 add_object_to_socklist (*pl->contr->socket, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
291 got_one++; 428 got_one++;
292 429
293 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
294 { 431 {
295 pl->contr->socket->send_packet (sl); 432 pl->ns->send_packet (sl);
296 433
297 sl.reset (); 434 sl.reset ();
298 sl.printf ("item%d ", pl->contr->socket->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
299 sl << uint32 (0); 436 sl << uint32 (0);
300 got_one = 0; 437 got_one = 0;
301 } 438 }
302 } 439 }
303 } 440 }
304 441
305 if (got_one) 442 if (got_one)
306 pl->contr->socket->send_packet (sl); 443 pl->ns->send_packet (sl);
307 444
308} 445}
309 446
310/** 447/**
311 * Sends whole inventory. 448 * Sends whole inventory.
312 */ 449 */
313void 450void
314esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
315{ 452{
316 object *tmp; 453 if (!pl->contr->ns)//D
454 return;
455
317 int got_one = 0; 456 int got_one = 0;
318 457
319
320 pl->contr->socket->send_packet_printf ("delinv %d", op->count); 458 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
321 459
322 packet sl; 460 packet sl;
323 sl.printf ("item%d ", pl->contr->socket->itemcmd); 461 sl.printf ("item%d ", pl->contr->ns->itemcmd);
324 462
325 sl << uint32 (op->count); 463 sl << uint32 (op->count);
326 464
327 for (tmp = op->inv; tmp; tmp = tmp->below) 465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
328 { 466 {
329 object *head; 467 object *head;
330 468
331 if (tmp->head) 469 if (tmp->head)
332 head = tmp->head; 470 head = tmp->head;
333 else 471 else
334 head = tmp; 472 head = tmp;
335 473
336 if (LOOK_OBJ (head)) 474 if (head->client_visible ())
337 { 475 {
338 add_object_to_socklist (*pl->contr->socket, sl, head); 476 add_object_to_socklist (*pl->contr->ns, sl, head);
339 477
340 got_one++; 478 got_one++;
341 479
342 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
343 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
344 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
345 */ 483 */
346 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
347 { 485 {
348 pl->contr->socket->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
349 487
350 sl.reset (); 488 sl.reset ();
351 sl.printf ("item%d ", pl->contr->socket->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
352 sl << uint32 (op->count); 490 sl << uint32 (op->count);
353 got_one = 0; 491 got_one = 0;
354 } 492 }
355 } /* If LOOK_OBJ() */ 493 }
356 } 494 }
357 495
358 if (got_one) 496 if (got_one)
359 pl->contr->socket->send_packet (sl); 497 pl->contr->ns->send_packet (sl);
360} 498}
361 499
362/** 500/**
363 * Updates object *op for player *pl. 501 * Updates object *op for player *pl.
364 * 502 *
365 * flags is a list of values to update 503 * flags is a list of values to update
366 * to the client (as defined in newclient.h - might as well use the 504 * to the client (as defined in newclient.h - might as well use the
367 * same value both places. 505 * same value both places.
368 */ 506 */
369
370void 507void
371esrv_update_item (int flags, object *pl, object *op) 508esrv_update_item (int flags, object *pl, object *op)
372{ 509{
373 /* If we have a request to send the player item, skip a few checks. */ 510 /* If we have a request to send the player item, skip a few checks. */
374 if (op != pl) 511 if (op != pl && !op->client_visible ())
375 {
376 if (!LOOK_OBJ (op))
377 return; 512 return;
378 /* we remove the check for op->env, because in theory, the object 513
379 * is hopefully in the same place, so the client should preserve 514 client *ns = pl->contr->ns;
380 * order. 515 if (!ns)
381 */ 516 return;
382 }
383 517
384 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 518 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
385 { 519 {
386 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 520 /* 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 521 * this is happening - we can set a breakpoint here in the debugger
… …
405 if (flags & UPD_FLAGS) 539 if (flags & UPD_FLAGS)
406 sl << uint32 (query_flags (op)); 540 sl << uint32 (query_flags (op));
407 541
408 if (flags & UPD_WEIGHT) 542 if (flags & UPD_WEIGHT)
409 { 543 {
410 sint32 weight = WEIGHT (op); 544 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
411 545
412 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
413
414 if (pl == op) 546 if (op)
415 op->contr->last_weight = weight; 547 ns->last_weight = weight;
548
549 sl << uint32 (weight);
416 } 550 }
417 551
418 if (flags & UPD_FACE) 552 if (flags & UPD_FACE)
419 { 553 {
420 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 554 ns->send_face (op->face, -50);
421 esrv_send_face (pl->contr->socket, op->face->number, 0); 555 ns->flush_fx ();
422
423 sl << uint32 (op->face->number); 556 sl << uint32 (op->face);
424 } 557 }
425 558
426 if (flags & UPD_NAME) 559 if (flags & UPD_NAME)
427 { 560 {
428 int len; 561 int len;
… …
462 { 595 {
463 if (op->anim_speed) 596 if (op->anim_speed)
464 anim_speed = op->anim_speed; 597 anim_speed = op->anim_speed;
465 else 598 else
466 { 599 {
467 if (FABS (op->speed) < 0.001) 600 if (fabs (op->speed) < 0.001)
468 anim_speed = 255; 601 anim_speed = 255;
469 else if (FABS (op->speed) >= 1.0) 602 else if (fabs (op->speed) >= 1.0)
470 anim_speed = 1; 603 anim_speed = 1;
471 else 604 else
472 anim_speed = (int) (1.0 / FABS (op->speed)); 605 anim_speed = (int) (1.0 / fabs (op->speed));
473 } 606 }
474 607
475 if (anim_speed > 255) 608 if (anim_speed > 255)
476 anim_speed = 255; 609 anim_speed = 255;
477 } 610 }
… …
480 } 613 }
481 614
482 if (flags & UPD_NROF) 615 if (flags & UPD_NROF)
483 sl << uint32 (op->nrof); 616 sl << uint32 (op->nrof);
484 617
485 pl->contr->socket->send_packet (sl); 618 pl->contr->ns->send_packet (sl);
486} 619}
487 620
488/** 621/**
489 * Sends item's info to player. 622 * Sends item's info to player.
490 */ 623 */
491void 624void
492esrv_send_item (object *pl, object *op) 625esrv_send_item (object *pl, object *op)
493{ 626{
627 if (!pl->contr->ns)
628 return;
629
494 /* If this is not the player object, do some more checks */ 630 /* If this is not the player object, do some more checks */
495 if (op != pl) 631 if (op != pl)
496 { 632 {
497 /* We only send 'visibile' objects to the client */ 633 /* We only send 'visible' objects to the client */
498 if (!LOOK_OBJ (op)) 634 if (!op->client_visible ())
499 return; 635 return;
636
500 /* if the item is on the ground, mark that the look needs to 637 /* if the item is on the ground, mark that the look needs to
501 * be updated. 638 * be updated.
502 */ 639 */
503 if (!op->env) 640 if (!op->env)
504 { 641 {
505 pl->contr->socket->floorbox_update (); 642 pl->contr->ns->floorbox_update ();
506 return; 643 return;
507 } 644 }
508 } 645 }
509 646
510 packet sl; 647 packet sl;
511 648
512 sl.printf ("item%d ", pl->contr->socket->itemcmd); 649 sl.printf ("item%d ", pl->contr->ns->itemcmd);
513 650
514 if (op->head) 651 if (op->head)
515 op = op->head; 652 op = op->head;
516 653
517 sl << uint32 (op->env ? op->env->count : 0); 654 sl << uint32 (op->env ? op->env->count : 0);
518 655
519 add_object_to_socklist (*pl->contr->socket, sl, op); 656 add_object_to_socklist (*pl->contr->ns, sl, op);
520 657
521 pl->contr->socket->send_packet (sl); 658 pl->contr->ns->send_packet (sl);
522 SET_FLAG (op, FLAG_CLIENT_SENT); 659 SET_FLAG (op, FLAG_CLIENT_SENT);
523} 660}
524 661
525/** 662/**
526 * Tells the client to delete an item. Uses the item 663 * Tells the client to delete an item.
527 * command with a -1 location.
528 */ 664 */
529
530void 665void
531esrv_del_item (player *pl, int tag) 666esrv_del_item (player *pl, int tag)
532{ 667{
668 if (!pl->ns)
669 return;
670
533 packet sl ("delitem"); 671 packet sl ("delitem");
534 672
535 sl << uint32 (tag); 673 sl << uint32 (tag);
536 674
537 pl->socket->send_packet (sl); 675 pl->ns->send_packet (sl);
538} 676}
539 677
540 678
541/******************************************************************************* 679/*******************************************************************************
542 * 680 *
… …
546 684
547/** 685/**
548 * Takes a player and object count (tag) and returns the actual object 686 * Takes a player and object count (tag) and returns the actual object
549 * pointer, or null if it can't be found. 687 * pointer, or null if it can't be found.
550 */ 688 */
551
552object * 689object *
553esrv_get_ob_from_count (object *pl, tag_t count) 690esrv_get_ob_from_count (object *pl, tag_t count)
554{ 691{
555 object *op, *tmp;
556
557 if (pl->count == count) 692 if (pl->count == count)
558 return pl; 693 return pl;
559 694
560 for (op = pl->inv; op; op = op->below) 695 for (object *op = pl->inv; op; op = op->below)
561 if (op->count == count) 696 if (op->count == count)
562 return op; 697 return op;
563 else if (op->type == CONTAINER && pl->container == op) 698 else if (op->type == CONTAINER && pl->container == op)
564 for (tmp = op->inv; tmp; tmp = tmp->below) 699 for (object *tmp = op->inv; tmp; tmp = tmp->below)
565 if (tmp->count == count) 700 if (tmp->count == count)
566 return tmp; 701 return tmp;
567 702
568 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 703 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
569 if (op->head && op->head->count == count) 704 if (op->head && op->head->count == count)
570 return op; 705 return op;
571 else if (op->count == count) 706 else if (op->count == count)
572 return op; 707 return op;
573 else if (op->type == CONTAINER && pl->container == op) 708 else if (op->type == CONTAINER && pl->container == op)
574 for (tmp = op->inv; tmp; tmp = tmp->below) 709 for (object *tmp = op->inv; tmp; tmp = tmp->below)
575 if (tmp->count == count) 710 if (tmp->count == count)
576 return tmp; 711 return tmp;
577 712
713#if 0
714 /* If the high bit is set, player examined a pseudo object. */
715 if (count & 0x80000000)
716 return 0;
717#endif
718
578 return 0; 719 return 0;
579} 720}
580 721
581
582/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
583void 723void
584ExamineCmd (char *buf, int len, player *pl) 724ExamineCmd (char *buf, int len, player *pl)
585{ 725{
586 tag_t tag = atoi (buf); 726 tag_t tag = atoi (buf);
587
588 /* If the high bit is set, player examined a pseudo object. */
589 if (tag & 0x80000000)
590 return;
591 727
592 object *op = esrv_get_ob_from_count (pl->ob, tag); 728 object *op = esrv_get_ob_from_count (pl->ob, tag);
593 729
594 if (!op) 730 if (!op)
595 { 731 {
596 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 732 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
597 return; 733 return;
598 } 734 }
599 735
600 examine (pl->ob, op); 736 examine (pl->ob, op);
737}
738
739/** Client wants to examine some object. So lets do so. */
740void
741ExCmd (char *buf, int len, player *pl)
742{
743 tag_t tag = atoi (buf);
744
745 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
746 {
747 std::string s = op->describe (pl->ob);
748
749 packet sl ("ex");
750 sl << ber32 (tag) << s.c_str ();
751
752 pl->ns->send_packet (sl);
753 }
601} 754}
602 755
603/** Client wants to apply some object. Lets do so. */ 756/** Client wants to apply some object. Lets do so. */
604void 757void
605ApplyCmd (char *buf, int len, player *pl) 758ApplyCmd (char *buf, int len, player *pl)
… …
613 return; 766 return;
614 767
615 /* If the high bit is set, player applied a pseudo object. */ 768 /* If the high bit is set, player applied a pseudo object. */
616 if (tag & 0x80000000) 769 if (tag & 0x80000000)
617 { 770 {
618 pl->socket->look_position = tag & 0x7fffffff; 771 pl->ns->look_position = tag & 0x7fffffff;
619 pl->socket->floorbox_update (); 772 pl->ns->floorbox_update ();
620 return; 773 return;
621 } 774 }
622 775
623 object *op = esrv_get_ob_from_count (pl->ob, tag); 776 object *op = esrv_get_ob_from_count (pl->ob, tag);
624 777
… …
639 tag_t tag = net_uint32 ((uint8 *)data + 1); 792 tag_t tag = net_uint32 ((uint8 *)data + 1);
640 object *op = esrv_get_ob_from_count (pl->ob, tag); 793 object *op = esrv_get_ob_from_count (pl->ob, tag);
641 794
642 if (!op) 795 if (!op)
643 { 796 {
644 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 797 pl->failmsg ("Could not find object to lock/unlock");
645 return; 798 return;
646 } 799 }
647 800
648 if (!flag) 801 if (!flag)
649 CLEAR_FLAG (op, FLAG_INV_LOCKED); 802 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
660 tag_t tag = net_uint32 ((uint8 *)data); 813 tag_t tag = net_uint32 ((uint8 *)data);
661 object *op = esrv_get_ob_from_count (pl->ob, tag); 814 object *op = esrv_get_ob_from_count (pl->ob, tag);
662 815
663 if (!op) 816 if (!op)
664 { 817 {
665 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 818 pl->failmsg ("Could not find object to mark");
666 return; 819 return;
667 } 820 }
668 821
669 pl->mark = op; 822 pl->mark = op;
670 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 823 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
671} 824}
672 825
673/** 826/**
674 * look_at prints items on the specified square. 827 * look_at prints items on the specified square.
675 * 828 *
676 * [ removed EARTHWALL check and added check for containers inventory. 829 * [ removed EARTHWALL check and added check for containers inventory.
677 * Tero.Haatanen@lut.fi ] 830 * Tero.Haatanen@lut.fi ]
678 */ 831 */
679void 832static void
680look_at (object *op, int dx, int dy) 833look_at (player *pl, int dx, int dy)
681{ 834{
682 object *tmp; 835 dynbuf_text buf;
683 int flag = 0; 836 object *ob = pl->ob;
684 sint16 x, y;
685 maptile *m;
686 837
687 x = op->x + dx; 838 if (!pl->observe->map)
688 y = op->y + dy;
689
690 if (out_of_map (op->map, x, y))
691 return; 839 return;
692 840
693 m = get_map_from_coord (op->map, &x, &y); 841 mapxy pos (pl->observe);
694 if (!m) 842 pos.move (dx, dy);
843
844 if (pos.normalise ())
845 for (object *tmp = pos->top; tmp; tmp = tmp->below)
846 {
847 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
848 continue;
849
850 if (QUERY_FLAG (ob, FLAG_WIZ))
851 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
852 else
853 buf.printf ("- %s.\n", query_name (tmp));
854
855 object *head = tmp->head_ ();
856
857 if (head->inv)
858 if ((head->type != CONTAINER && head->type != FLESH)
859 || QUERY_FLAG (ob, FLAG_WIZ))
860 buf << head->query_inventory (ob, " ");
861
862 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
863 break;
864 }
865
866 if (buf.empty ())
867 pl->failmsg ("You see nothing there.");
868 else
869 pl->infobox (MSG_CHANNEL ("lookat"), buf);
870}
871
872/** Client wants to look at some object. Lets do so. */
873void
874LookAt (char *buf, int len, player *pl)
875{
876 char *cp;
877
878 int dx = atoi (buf);
879 if (!(cp = strchr (buf, ' ')))
695 return; 880 return;
696 881
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); 882 int dy = atoi (cp);
753 883
754 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 884 if (player *opl = pl->observe->contr)
885 if (client *ns = opl->ns)
886 {
887 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
755 return; 888 return;
756 889
757 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 890 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
758 return; 891 return;
892 }
759 893
760 look_at (pl->ob, dx, dy); 894 look_at (pl, dx, dy);
761} 895}
762 896
763/** Move an object to a new location */ 897/** Move an object to a new location */
764void 898void
765esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 899esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
781 /* If it is an active container, then we should drop all objects 915 /* If it is an active container, then we should drop all objects
782 * in the container and not the container itself. 916 * in the container and not the container itself.
783 */ 917 */
784 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 918 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
785 { 919 {
786 object *current, *next; 920 int cnt = MAX_ITEM_PER_DROP;
787 921
788 for (current = op->inv; current != NULL; current = next) 922 for (object *current = op->inv; current; )
789 { 923 {
790 next = current->below; 924 object *next = current->below;
925
791 drop_object (pl, current, 0); 926 drop_object (pl, current, 0);
927
928 if (--cnt <= 0) break;
929
930 current = next;
792 } 931 }
793 932
794 esrv_update_item (UPD_WEIGHT, pl, op); 933 if (cnt <= 0)
934 op->failmsg ("Only dropped some items, can't drop that many items at once.");
795 } 935 }
796 else 936 else
797 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
798 938
799 return; 939 return;
… …
819 /* put_object_in_sack presumes that necessary sanity checking 959 /* put_object_in_sack presumes that necessary sanity checking
820 * has already been done (eg, it can be picked up and fits in 960 * has already been done (eg, it can be picked up and fits in
821 * in a sack, so check for those things. We should also check 961 * in a sack, so check for those things. We should also check
822 * an make sure env is in fact a container for that matter. 962 * an make sure env is in fact a container for that matter.
823 */ 963 */
824 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 964 if (env->type == CONTAINER
965 && can_pick (pl, op)
966 && sack_can_hold (pl, env, op, nrof))
825 put_object_in_sack (pl, env, op, nrof); 967 put_object_in_sack (pl, env, op, nrof);
826} 968}
827 969

Diff Legend

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