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.24 by root, Sat Dec 16 22:14:42 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) 355 pl->ns->send_packet ("delinv 0");
217 ;
218 356
219 packet sl; 357 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 358 sl.printf ("item%d ", pl->ns->itemcmd);
224 359
225 sl << uint32 (0); 360 sl << uint32 (0);
226 361
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 pl->ns->send_face (empty_face, -50);
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 363 pl->ns->flush_fx ();
229 364
230 if (pl->contr->socket->look_position) 365 if (pl->ns->look_position)
231 { 366 {
232 char buf[80]; 367 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); 368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
234 369
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
236 << uint32 (0) 371 << uint32 (0)
237 << sint32 (-1) 372 << sint32 (-1)
238 << uint32 (empty_face->number) 373 << uint32 (empty_face)
239 << data8 (buf) 374 << data8 (buf)
240 << uint16 (0) 375 << uint16 (0)
241 << uint8 (0) 376 << uint8 (0)
242 << uint32 (0); 377 << uint32 (0);
243 378
244 if (pl->contr->socket->itemcmd == 2) 379 if (pl->ns->itemcmd == 2)
245 sl << uint16 (0); 380 sl << uint16 (0);
246 } 381 }
247 382
383 object *tmp = ob->ms ().top;
248 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
249 { 385 {
250 object *head; 386 object *head;
251 387
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
253 { 389 {
254 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
256 last = last->below; 392 last = last->below;
257 } 393 }
258 394
259 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
260 { 396 {
261 if (++start_look < pl->contr->socket->look_position) 397 if (++start_look < pl->ns->look_position)
262 continue; 398 continue;
263 399
264 end_look++; 400 end_look++;
265 401
266 if (end_look > NUM_LOOK_OBJECTS) 402 if (end_look > FLOORBOX_PAGESIZE)
267 { 403 {
268 /* 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,
269 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
270 */ 406 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) 407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
272 << uint32 (0) 408 << uint32 (0)
273 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number) 410 << uint32 (empty_face)
275 << data8 ("Apply this to see next group of items") 411 << data8 ("Apply this to see next group of items")
276 << uint16 (0) 412 << uint16 (0)
277 << uint8 (0) 413 << uint8 (0)
278 << uint32 (0); 414 << uint32 (0);
279 415
280 if (pl->contr->socket->itemcmd == 2) 416 if (pl->ns->itemcmd == 2)
281 sl << uint16 (0); 417 sl << uint16 (0);
282 418
283 break; 419 break;
284 } 420 }
285 421
286 if (tmp->head) 422 if (tmp->head)
287 head = tmp->head; 423 head = tmp->head;
288 else 424 else
289 head = tmp; 425 head = tmp;
290 426
291 add_object_to_socklist (*pl->contr->socket, sl, head); 427 add_object_to_socklist (*pl->ns, sl, head);
292 got_one++; 428 got_one++;
293 429
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
295 { 431 {
296 pl->contr->socket->send_packet (sl); 432 pl->ns->send_packet (sl);
297 433
298 sl.reset (); 434 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd); 435 sl.printf ("item%d ", pl->ns->itemcmd);
300 sl << uint32 (0); 436 sl << uint32 (0);
301 got_one = 0; 437 got_one = 0;
302 } 438 }
303 } 439 }
304 } 440 }
305 441
306 if (got_one) 442 if (got_one)
307 pl->contr->socket->send_packet (sl); 443 pl->ns->send_packet (sl);
308 444
309} 445}
310 446
311/** 447/**
312 * Sends whole inventory. 448 * Sends whole inventory.
313 */ 449 */
314void 450void
315esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
316{ 452{
317 object *tmp; 453 if (!pl->contr->ns)//D
454 return;
455
318 int got_one = 0; 456 int got_one = 0;
319 457
458 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
459
320 packet sl; 460 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); 461 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 462
328 sl << uint32 (op->count); 463 sl << uint32 (op->count);
329 464
330 for (tmp = op->inv; tmp; tmp = tmp->below) 465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 466 {
332 object *head; 467 object *head;
333 468
334 if (tmp->head) 469 if (tmp->head)
335 head = tmp->head; 470 head = tmp->head;
336 else 471 else
337 head = tmp; 472 head = tmp;
338 473
339 if (LOOK_OBJ (head)) 474 if (head->client_visible ())
340 { 475 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 476 add_object_to_socklist (*pl->contr->ns, sl, head);
342 477
343 got_one++; 478 got_one++;
344 479
345 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
348 */ 483 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
350 { 485 {
351 pl->contr->socket->send_packet (sl); 486 pl->contr->ns->send_packet (sl);
352 487
353 sl.reset (); 488 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 490 sl << uint32 (op->count);
356 got_one = 0; 491 got_one = 0;
357 } 492 }
358 } /* If LOOK_OBJ() */ 493 }
359 } 494 }
360 495
361 if (got_one) 496 if (got_one)
362 pl->contr->socket->send_packet (sl); 497 pl->contr->ns->send_packet (sl);
363} 498}
364 499
365/** 500/**
366 * Updates object *op for player *pl. 501 * Updates object *op for player *pl.
367 * 502 *
368 * flags is a list of values to update 503 * flags is a list of values to update
369 * 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
370 * same value both places. 505 * same value both places.
371 */ 506 */
372
373void 507void
374esrv_update_item (int flags, object *pl, object *op) 508esrv_update_item (int flags, object *pl, object *op)
375{ 509{
376 /* 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. */
377 if (op != pl) 511 if (op != pl && !op->client_visible ())
378 {
379 if (!LOOK_OBJ (op))
380 return; 512 return;
381 /* we remove the check for op->env, because in theory, the object 513
382 * is hopefully in the same place, so the client should preserve 514 client *ns = pl->contr->ns;
383 * order. 515 if (!ns)
384 */ 516 return;
385 }
386 517
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 518 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
388 { 519 {
389 /* 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
390 * 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
391 * and track back the call. 522 * and track back the call.
392 */ 523 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 524 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 } 525 }
395 526
396 packet sl; 527 packet sl ("upditem");
397 528
398 sl << "upditem "
399 << uint8 (flags); 529 sl << uint8 (flags);
400 530
401 if (op->head) 531 if (op->head)
402 op = op->head; 532 op = op->head;
403 533
404 sl << uint32 (op->count); 534 sl << uint32 (op->count);
… …
409 if (flags & UPD_FLAGS) 539 if (flags & UPD_FLAGS)
410 sl << uint32 (query_flags (op)); 540 sl << uint32 (query_flags (op));
411 541
412 if (flags & UPD_WEIGHT) 542 if (flags & UPD_WEIGHT)
413 { 543 {
414 sint32 weight = WEIGHT (op); 544 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
415 545
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417
418 if (pl == op) 546 if (op)
419 op->contr->last_weight = weight; 547 ns->last_weight = weight;
548
549 sl << uint32 (weight);
420 } 550 }
421 551
422 if (flags & UPD_FACE) 552 if (flags & UPD_FACE)
423 { 553 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 554 ns->send_face (op->face, -50);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 555 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 556 sl << uint32 (op->face);
428 } 557 }
429 558
430 if (flags & UPD_NAME) 559 if (flags & UPD_NAME)
431 { 560 {
432 int len; 561 int len;
… …
466 { 595 {
467 if (op->anim_speed) 596 if (op->anim_speed)
468 anim_speed = op->anim_speed; 597 anim_speed = op->anim_speed;
469 else 598 else
470 { 599 {
471 if (FABS (op->speed) < 0.001) 600 if (fabs (op->speed) < 0.001)
472 anim_speed = 255; 601 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 602 else if (fabs (op->speed) >= 1.0)
474 anim_speed = 1; 603 anim_speed = 1;
475 else 604 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 605 anim_speed = (int) (1.0 / fabs (op->speed));
477 } 606 }
478 607
479 if (anim_speed > 255) 608 if (anim_speed > 255)
480 anim_speed = 255; 609 anim_speed = 255;
481 } 610 }
… …
484 } 613 }
485 614
486 if (flags & UPD_NROF) 615 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 616 sl << uint32 (op->nrof);
488 617
489 pl->contr->socket->send_packet (sl); 618 pl->contr->ns->send_packet (sl);
490} 619}
491 620
492/** 621/**
493 * Sends item's info to player. 622 * Sends item's info to player.
494 */ 623 */
495void 624void
496esrv_send_item (object *pl, object *op) 625esrv_send_item (object *pl, object *op)
497{ 626{
627 if (!pl->contr->ns)
628 return;
629
498 /* If this is not the player object, do some more checks */ 630 /* If this is not the player object, do some more checks */
499 if (op != pl) 631 if (op != pl)
500 { 632 {
501 /* We only send 'visibile' objects to the client */ 633 /* We only send 'visible' objects to the client */
502 if (!LOOK_OBJ (op)) 634 if (!op->client_visible ())
503 return; 635 return;
636
504 /* 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
505 * be updated. 638 * be updated.
506 */ 639 */
507 if (!op->env) 640 if (!op->env)
508 { 641 {
509 pl->contr->socket->update_look = 1; 642 pl->contr->ns->floorbox_update ();
510 return; 643 return;
511 } 644 }
512 } 645 }
513 646
514 packet sl; 647 packet sl;
515 648
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 649 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 650
518 if (op->head) 651 if (op->head)
519 op = op->head; 652 op = op->head;
520 653
521 sl << uint32 (op->env ? op->env->count : 0); 654 sl << uint32 (op->env ? op->env->count : 0);
522 655
523 add_object_to_socklist (*pl->contr->socket, sl, op); 656 add_object_to_socklist (*pl->contr->ns, sl, op);
524 657
525 pl->contr->socket->send_packet (sl); 658 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT); 659 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 660}
528 661
529/** 662/**
530 * Tells the client to delete an item. Uses the item 663 * Tells the client to delete an item.
531 * command with a -1 location.
532 */ 664 */
533
534void 665void
535esrv_del_item (player *pl, int tag) 666esrv_del_item (player *pl, int tag)
536{ 667{
537 packet sl; 668 if (!pl->ns)
669 return;
538 670
539 sl << "delitem " 671 packet sl ("delitem");
672
540 << uint32 (tag); 673 sl << uint32 (tag);
541 674
542 pl->socket->send_packet (sl); 675 pl->ns->send_packet (sl);
543} 676}
544 677
545 678
546/******************************************************************************* 679/*******************************************************************************
547 * 680 *
… …
551 684
552/** 685/**
553 * 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
554 * pointer, or null if it can't be found. 687 * pointer, or null if it can't be found.
555 */ 688 */
556
557object * 689object *
558esrv_get_ob_from_count (object *pl, tag_t count) 690esrv_get_ob_from_count (object *pl, tag_t count)
559{ 691{
560 object *op, *tmp;
561
562 if (pl->count == count) 692 if (pl->count == count)
563 return pl; 693 return pl;
564 694
565 for (op = pl->inv; op; op = op->below) 695 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 696 if (op->count == count)
567 return op; 697 return op;
568 else if (op->type == CONTAINER && pl->container == op) 698 else if (op->type == CONTAINER && pl->container == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 699 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 700 if (tmp->count == count)
571 return tmp; 701 return tmp;
572 702
573 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)
574 if (op->head && op->head->count == count) 704 if (op->head && op->head->count == count)
575 return op; 705 return op;
576 else if (op->count == count) 706 else if (op->count == count)
577 return op; 707 return op;
578 else if (op->type == CONTAINER && pl->container == op) 708 else if (op->type == CONTAINER && pl->container == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 709 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 710 if (tmp->count == count)
581 return tmp; 711 return tmp;
582 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
583 return 0; 719 return 0;
584} 720}
585 721
586
587/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
588void 723void
589ExamineCmd (char *buf, int len, player *pl) 724ExamineCmd (char *buf, int len, player *pl)
590{ 725{
591 tag_t tag = atoi (buf); 726 tag_t tag = atoi (buf);
592
593 /* If the high bit is set, player examined a pseudo object. */
594 if (tag & 0x80000000)
595 return;
596 727
597 object *op = esrv_get_ob_from_count (pl->ob, tag); 728 object *op = esrv_get_ob_from_count (pl->ob, tag);
598 729
599 if (!op) 730 if (!op)
600 { 731 {
601 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);
602 return; 733 return;
603 } 734 }
604 735
605 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 }
606} 754}
607 755
608/** Client wants to apply some object. Lets do so. */ 756/** Client wants to apply some object. Lets do so. */
609void 757void
610ApplyCmd (char *buf, int len, player *pl) 758ApplyCmd (char *buf, int len, player *pl)
… …
618 return; 766 return;
619 767
620 /* If the high bit is set, player applied a pseudo object. */ 768 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 769 if (tag & 0x80000000)
622 { 770 {
623 pl->socket->look_position = tag & 0x7fffffff; 771 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 772 pl->ns->floorbox_update ();
625 return; 773 return;
626 } 774 }
627 775
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 776 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 777
… …
634 } 782 }
635 783
636 player_apply (pl->ob, op, 0, 0); 784 player_apply (pl->ob, op, 0, 0);
637} 785}
638 786
639/** Client wants to apply some object. Lets do so. */ 787/** Client wants to lock some object. Lets do so. */
640void 788void
641LockItem (char *data, int len, player *pl) 789LockItem (char *data, int len, player *pl)
642{ 790{
643 int flag = data[0]; 791 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 792 tag_t tag = net_uint32 ((uint8 *)data + 1);
645 object *op = esrv_get_ob_from_count (pl->ob, tag); 793 object *op = esrv_get_ob_from_count (pl->ob, tag);
646 794
647 if (!op) 795 if (!op)
648 { 796 {
649 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");
650 return; 798 return;
651 } 799 }
652 800
653 if (!flag) 801 if (!flag)
654 CLEAR_FLAG (op, FLAG_INV_LOCKED); 802 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 804 SET_FLAG (op, FLAG_INV_LOCKED);
657 805
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 806 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 807}
660 808
661/** Client wants to apply some object. Lets do so. */ 809/** Client wants to mark some object. Lets do so. */
662void 810void
663MarkItem (char *data, int len, player *pl) 811MarkItem (char *data, int len, player *pl)
664{ 812{
665 tag_t tag = net_uint32 ((uint8 *)data); 813 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 814 object *op = esrv_get_ob_from_count (pl->ob, tag);
667 815
668 if (!op) 816 if (!op)
669 { 817 {
670 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 818 pl->failmsg ("Could not find object to mark");
671 return; 819 return;
672 } 820 }
673 821
674 pl->mark = op; 822 pl->mark = op;
675 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)));
676} 824}
677 825
678/** 826/**
679 * look_at prints items on the specified square. 827 * look_at prints items on the specified square.
680 * 828 *
681 * [ removed EARTHWALL check and added check for containers inventory. 829 * [ removed EARTHWALL check and added check for containers inventory.
682 * Tero.Haatanen@lut.fi ] 830 * Tero.Haatanen@lut.fi ]
683 */ 831 */
684void 832static void
685look_at (object *op, int dx, int dy) 833look_at (player *pl, int dx, int dy)
686{ 834{
687 object *tmp; 835 dynbuf_text buf;
688 int flag = 0; 836 object *ob = pl->ob;
689 sint16 x, y;
690 maptile *m;
691 837
692 x = op->x + dx; 838 if (!pl->observe->map)
693 y = op->y + dy;
694
695 if (out_of_map (op->map, x, y))
696 return; 839 return;
697 840
698 m = get_map_from_coord (op->map, &x, &y); 841 mapxy pos (pl->observe);
699 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, ' ')))
700 return; 880 return;
701 881
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); 882 int dy = atoi (cp);
758 883
759 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)
760 return; 888 return;
761 889
762 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])
763 return; 891 return;
892 }
764 893
765 look_at (pl->ob, dx, dy); 894 look_at (pl, dx, dy);
766} 895}
767 896
768/** Move an object to a new location */ 897/** Move an object to a new location */
769void 898void
770esrv_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)
… …
786 /* 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
787 * in the container and not the container itself. 916 * in the container and not the container itself.
788 */ 917 */
789 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 918 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
790 { 919 {
791 object *current, *next; 920 int cnt = MAX_ITEM_PER_DROP;
792 921
793 for (current = op->inv; current != NULL; current = next) 922 for (object *current = op->inv; current; )
794 { 923 {
795 next = current->below; 924 object *next = current->below;
925
796 drop_object (pl, current, 0); 926 drop_object (pl, current, 0);
927
928 if (--cnt <= 0) break;
929
930 current = next;
797 } 931 }
798 932
799 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.");
800 } 935 }
801 else 936 else
802 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
803 938
804 return; 939 return;
… …
824 /* put_object_in_sack presumes that necessary sanity checking 959 /* put_object_in_sack presumes that necessary sanity checking
825 * 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
826 * 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
827 * 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.
828 */ 963 */
829 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))
830 put_object_in_sack (pl, env, op, nrof); 967 put_object_in_sack (pl, env, op, nrof);
831} 968}
832 969

Diff Legend

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