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.51 by root, Tue Jul 24 04:55:35 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG.
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
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 author can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors 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 : WEIGHT (head))
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_IN_MEMORY
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)
378 { 512 {
379 if (!LOOK_OBJ (op)) 513 if (!op->client_visible ())
380 return; 514 return;
381 /* we remove the check for op->env, because in theory, the object 515 /* we remove the check for op->env, because in theory, the object
382 * is hopefully in the same place, so the client should preserve 516 * is hopefully in the same place, so the client should preserve
383 * order. 517 * order.
384 */ 518 */
385 } 519 }
386 520
521 client *ns = pl->contr->ns;
522 if (!ns)
523 return;
524
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
388 { 526 {
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 527 /* 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 528 * this is happening - we can set a breakpoint here in the debugger
391 * and track back the call. 529 * and track back the call.
392 */ 530 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 531 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 } 532 }
395 533
396 packet sl; 534 packet sl ("upditem");
397 535
398 sl << "upditem "
399 << uint8 (flags); 536 sl << uint8 (flags);
400 537
401 if (op->head) 538 if (op->head)
402 op = op->head; 539 op = op->head;
403 540
404 sl << uint32 (op->count); 541 sl << uint32 (op->count);
… …
414 sint32 weight = WEIGHT (op); 551 sint32 weight = WEIGHT (op);
415 552
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417 554
418 if (pl == op) 555 if (pl == op)
419 op->contr->last_weight = weight; 556 ns->last_weight = weight;
420 } 557 }
421 558
422 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
423 { 560 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 561 ns->send_face (op->face, -50);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 562 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 563 sl << uint32 (op->face);
428 } 564 }
429 565
430 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
431 { 567 {
432 int len; 568 int len;
… …
466 { 602 {
467 if (op->anim_speed) 603 if (op->anim_speed)
468 anim_speed = op->anim_speed; 604 anim_speed = op->anim_speed;
469 else 605 else
470 { 606 {
471 if (FABS (op->speed) < 0.001) 607 if (fabs (op->speed) < 0.001)
472 anim_speed = 255; 608 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 609 else if (fabs (op->speed) >= 1.0)
474 anim_speed = 1; 610 anim_speed = 1;
475 else 611 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 612 anim_speed = (int) (1.0 / fabs (op->speed));
477 } 613 }
478 614
479 if (anim_speed > 255) 615 if (anim_speed > 255)
480 anim_speed = 255; 616 anim_speed = 255;
481 } 617 }
… …
484 } 620 }
485 621
486 if (flags & UPD_NROF) 622 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 623 sl << uint32 (op->nrof);
488 624
489 pl->contr->socket->send_packet (sl); 625 pl->contr->ns->send_packet (sl);
490} 626}
491 627
492/** 628/**
493 * Sends item's info to player. 629 * Sends item's info to player.
494 */ 630 */
495void 631void
496esrv_send_item (object *pl, object *op) 632esrv_send_item (object *pl, object *op)
497{ 633{
634 if (!pl->contr->ns)
635 return;
636
498 /* If this is not the player object, do some more checks */ 637 /* If this is not the player object, do some more checks */
499 if (op != pl) 638 if (op != pl)
500 { 639 {
501 /* We only send 'visibile' objects to the client */ 640 /* We only send 'visibile' objects to the client */
502 if (!LOOK_OBJ (op)) 641 if (!op->client_visible ())
503 return; 642 return;
643
504 /* if the item is on the ground, mark that the look needs to 644 /* if the item is on the ground, mark that the look needs to
505 * be updated. 645 * be updated.
506 */ 646 */
507 if (!op->env) 647 if (!op->env)
508 { 648 {
509 pl->contr->socket->update_look = 1; 649 pl->contr->ns->floorbox_update ();
510 return; 650 return;
511 } 651 }
512 } 652 }
513 653
514 packet sl; 654 packet sl;
515 655
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 656 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 657
518 if (op->head) 658 if (op->head)
519 op = op->head; 659 op = op->head;
520 660
521 sl << uint32 (op->env ? op->env->count : 0); 661 sl << uint32 (op->env ? op->env->count : 0);
522 662
523 add_object_to_socklist (*pl->contr->socket, sl, op); 663 add_object_to_socklist (*pl->contr->ns, sl, op);
524 664
525 pl->contr->socket->send_packet (sl); 665 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT); 666 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 667}
528 668
529/** 669/**
530 * Tells the client to delete an item. Uses the item 670 * Tells the client to delete an item. Uses the item
531 * command with a -1 location. 671 * command with a -1 location.
532 */ 672 */
533
534void 673void
535esrv_del_item (player *pl, int tag) 674esrv_del_item (player *pl, int tag)
536{ 675{
537 packet sl; 676 if (!pl->ns)
677 return;
538 678
539 sl << "delitem " 679 packet sl ("delitem");
680
540 << uint32 (tag); 681 sl << uint32 (tag);
541 682
542 pl->socket->send_packet (sl); 683 pl->ns->send_packet (sl);
543} 684}
544 685
545 686
546/******************************************************************************* 687/*******************************************************************************
547 * 688 *
… …
551 692
552/** 693/**
553 * Takes a player and object count (tag) and returns the actual object 694 * Takes a player and object count (tag) and returns the actual object
554 * pointer, or null if it can't be found. 695 * pointer, or null if it can't be found.
555 */ 696 */
556
557object * 697object *
558esrv_get_ob_from_count (object *pl, tag_t count) 698esrv_get_ob_from_count (object *pl, tag_t count)
559{ 699{
560 object *op, *tmp;
561
562 if (pl->count == count) 700 if (pl->count == count)
563 return pl; 701 return pl;
564 702
565 for (op = pl->inv; op; op = op->below) 703 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 704 if (op->count == count)
567 return op; 705 return op;
568 else if (op->type == CONTAINER && pl->container == op) 706 else if (op->type == CONTAINER && pl->container == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 707 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 708 if (tmp->count == count)
571 return tmp; 709 return tmp;
572 710
573 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 711 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
574 if (op->head && op->head->count == count) 712 if (op->head && op->head->count == count)
575 return op; 713 return op;
576 else if (op->count == count) 714 else if (op->count == count)
577 return op; 715 return op;
578 else if (op->type == CONTAINER && pl->container == op) 716 else if (op->type == CONTAINER && pl->container == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 717 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 718 if (tmp->count == count)
581 return tmp; 719 return tmp;
582 720
721#if 0
722 /* If the high bit is set, player examined a pseudo object. */
723 if (count & 0x80000000)
724 return 0;
725#endif
726
583 return 0; 727 return 0;
584} 728}
585 729
586
587/** Client wants to examine some object. So lets do so. */ 730/** Client wants to examine some object. So lets do so. */
588void 731void
589ExamineCmd (char *buf, int len, player *pl) 732ExamineCmd (char *buf, int len, player *pl)
590{ 733{
591 tag_t tag = atoi (buf); 734 tag_t tag = atoi (buf);
592 735
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); 736 object *op = esrv_get_ob_from_count (pl->ob, tag);
598 737
599 if (!op) 738 if (!op)
600 { 739 {
601 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 740 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
602 return; 741 return;
603 } 742 }
604 743
605 examine (pl->ob, op); 744 examine (pl->ob, op);
745}
746
747/** Client wants to examine some object. So lets do so. */
748void
749ExCmd (char *buf, int len, player *pl)
750{
751 tag_t tag = atoi (buf);
752
753 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
754 {
755 std::string s = op->describe (pl->ob);
756
757 packet sl ("ex");
758 sl << ber32 (tag) << s.c_str ();
759
760 pl->ns->send_packet (sl);
761 }
606} 762}
607 763
608/** Client wants to apply some object. Lets do so. */ 764/** Client wants to apply some object. Lets do so. */
609void 765void
610ApplyCmd (char *buf, int len, player *pl) 766ApplyCmd (char *buf, int len, player *pl)
… …
618 return; 774 return;
619 775
620 /* If the high bit is set, player applied a pseudo object. */ 776 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 777 if (tag & 0x80000000)
622 { 778 {
623 pl->socket->look_position = tag & 0x7fffffff; 779 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 780 pl->ns->floorbox_update ();
625 return; 781 return;
626 } 782 }
627 783
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 784 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 785
… …
634 } 790 }
635 791
636 player_apply (pl->ob, op, 0, 0); 792 player_apply (pl->ob, op, 0, 0);
637} 793}
638 794
639/** Client wants to apply some object. Lets do so. */ 795/** Client wants to lock some object. Lets do so. */
640void 796void
641LockItem (char *data, int len, player *pl) 797LockItem (char *data, int len, player *pl)
642{ 798{
643 int flag = data[0]; 799 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 800 tag_t tag = net_uint32 ((uint8 *)data + 1);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 812 SET_FLAG (op, FLAG_INV_LOCKED);
657 813
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 814 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 815}
660 816
661/** Client wants to apply some object. Lets do so. */ 817/** Client wants to mark some object. Lets do so. */
662void 818void
663MarkItem (char *data, int len, player *pl) 819MarkItem (char *data, int len, player *pl)
664{ 820{
665 tag_t tag = net_uint32 ((uint8 *)data); 821 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 822 object *op = esrv_get_ob_from_count (pl->ob, tag);
… …
679 * look_at prints items on the specified square. 835 * look_at prints items on the specified square.
680 * 836 *
681 * [ removed EARTHWALL check and added check for containers inventory. 837 * [ removed EARTHWALL check and added check for containers inventory.
682 * Tero.Haatanen@lut.fi ] 838 * Tero.Haatanen@lut.fi ]
683 */ 839 */
684void 840static void
685look_at (object *op, int dx, int dy) 841look_at (player *pl, int dx, int dy)
686{ 842{
687 object *tmp; 843 object *ob = pl->ob;
688 int flag = 0;
689 sint16 x, y;
690 maptile *m;
691 844
692 x = op->x + dx; 845 maptile *m = pl->observe->map;
693 y = op->y + dy; 846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
694 848
695 if (out_of_map (op->map, x, y))
696 return;
697
698 m = get_map_from_coord (op->map, &x, &y);
699 if (!m) 849 if (!m)
700 return; 850 return;
701 851
702 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 852 if (!xy_normalise (m, x, y))
703 853 {
704 for (; tmp != NULL; tmp = tmp->below) 854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
855 return;
705 { 856 }
857
858 int flag = 0;
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
861 {
706 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
707 continue; 863 continue;
708 864
709 if (!flag) 865 if (!flag)
710 { 866 {
711 if (dx || dy) 867 if (dx || dy)
712 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
713 else 869 else
714 {
715 clear_win_info (op);
716 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
717 } 871
718 flag = 1; 872 flag = 1;
719 } 873 }
720 874
721 if (QUERY_FLAG (op, FLAG_WIZ)) 875 if (QUERY_FLAG (ob, FLAG_WIZ))
722 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
723 else 877 else
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 878 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
725 879
726 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
727 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) 881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
728 inventory (op, tmp->head == NULL ? tmp : tmp->head); 882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
729 883
730 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 884 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
731 break; 885 break;
732 } 886 }
733 887
734 if (!flag) 888 if (!flag)
735 { 889 {
736 if (dx || dy) 890 if (dx || dy)
737 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
738 else 892 else
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
740 } 894 }
741} 895}
742
743
744 896
745/** Client wants to look at some object. Lets do so. */ 897/** Client wants to look at some object. Lets do so. */
746void 898void
747LookAt (char *buf, int len, player *pl) 899LookAt (char *buf, int len, player *pl)
748{ 900{
749 int dx, dy;
750 char *cp; 901 char *cp;
751 902
752 dx = atoi (buf); 903 int dx = atoi (buf);
753 if (!(cp = strchr (buf, ' '))) 904 if (!(cp = strchr (buf, ' ')))
754 {
755 return;
756 }
757 dy = atoi (cp);
758
759 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
760 return; 905 return;
761 906
907 int dy = atoi (cp);
908
909 if (player *opl = pl->observe->contr)
910 if (client *ns = opl->ns)
911 {
912 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
913 return;
914
762 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 915 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
763 return; 916 return;
917 }
764 918
765 look_at (pl->ob, dx, dy); 919 look_at (pl, dx, dy);
766} 920}
767 921
768/** Move an object to a new location */ 922/** Move an object to a new location */
769void 923void
770esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)

Diff Legend

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