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.45 by root, Mon May 28 21:22:26 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client/server logic. 27 * Client/server logic.
27 * 28 *
28 * \date 2003-12-02 29 * \date 2003-12-02
29 * 30 *
30 * This containes item logic for client/server. It doesn't contain 31 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 32 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 33 * the logic for what items should be sent.
33 */ 34 */
34 35
35#include <global.h> 36#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
37#include <sproto.h> 38#include <sproto.h>
38 39
39/** This is the maximum number of bytes we expect any one item to take up */ 40/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 41#define MAXITEMLEN 300
42
43#if 0
44tag_t
45client_container::tag () const
46{
47 switch (type)
48 {
49 case CC_INVENTORY:
50 return ns->pl->count;
51 case CC_MAPSPACE:
52 return 0;
53 case CC_CONTAINER:
54 return env->count;
55 }
56
57 abort ();
58}
59
60void
61client_container::clear ()
62{
63 switch (type)
64 {
65 case CC_INVENTORY:
66 abort ();
67
68 case CC_MAPSPACE:
69 case CC_CONTAINER:
70 ns->send_packet_printf ("delinv %d", tag ());
71 break;
72 }
73
74 for (iterator i = begin (); i != end (); ++i)
75 i->op->seen_by = 0;
76
77 vector< refitem, slice_allocator<refitem> >::clear ();
78}
79
80inline iterator
81client_container::merge_item (iterator i, object *op)
82{
83 if (i != end () && i->op == op)
84 return ++i;
85
86 if (op->seen_by)
87 return; // seen by another entity already
88
89 op->seen_by = this;
90
91 refitem ref;
92 ref.op = op;
93
94 return insert (i, ref);
95}
96
97void
98client_container::update (int offset)
99{
100 iterator i = begin ();
101
102 switch (type)
103 {
104 case CC_INVENTORY:
105 case CC_CONTAINER:
106 {
107 object *env = type == CC_INVENTORY
108 ? ns->pl->ob
109 : this->env;
110
111 // pass 1, erase all objects no longer in container
112 for (iterator j = begin (); j != end (); ++j)
113 if (j->op->env != env)
114 {
115 j->op->seen_by = 0;
116 erase (j);
117 }
118
119 // pass 2 merge items
120 for (object *op = env->inv; op; op = op->below)
121 {
122 if (--offset < 0)
123 i = merge_item (i, op);
124 else if (offset < -FLOORBOX_PAGESIZE)
125 break;
126 }
127 }
128 break;
129
130 case CC_MAPSPACE:
131 {
132 // pass 1, erase all objects no longer on space
133 for (iterator j = begin (); j != end (); ++j)
134 if (j->op->x != x || j->op->y != y || j->op->map != map)
135 {
136 j->op->seen_by = 0;
137 erase (j);
138 }
139
140 // pass 2 merge items
141 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
142 {
143 if (--offset < 0)
144 i = merge_item (i, op);
145 else if (offset < -FLOORBOX_PAGESIZE)
146 break;
147 }
148 }
149 break;
150 }
151
152 // pass 3, erase all extra items
153 for (iterator j = i; j != end (); ++j)
154 j->op->seen_by = 0;
155
156 if (i != end ())
157 erase (i, end ());
158}
159
160void
161client_container::set_mapspace (maptile *map, int x, int y)
162{
163 if (type == CC_MAPSPACE
164 && this->map == map
165 && this->x == x
166 && this->y == y)
167 return;
168
169 clear ();
170
171 type = CC_MAPSPACE;
172 this->map = map;
173 this->x = x;
174 this->y = y;
175}
176
177void
178client_container::set_container (object *env)
179{
180}
181#endif
41 182
42/******************************************************************************* 183/*******************************************************************************
43 * 184 *
44 * Functions related to sending object data to the client. 185 * Functions related to sending object data to the client.
45 * 186 *
… …
123 264
124 flags = query_flags (head); 265 flags = query_flags (head);
125 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
126 flags |= F_NOPICK; 267 flags |= F_NOPICK;
127 268
128 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
129 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
130 271
131 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
132 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
133 274
134 sl << uint32 (head->count) 275 sl << uint32 (head->count)
135 << uint32 (flags) 276 << uint32 (flags)
136 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
137 << uint32 (head->face->number); 278 << uint32 (head->face);
138 279
139 if (!head->custom_name) 280 if (!head->custom_name)
140 { 281 {
141 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
142 item_n[127] = 0; 283 item_n[127] = 0;
… …
163 { 304 {
164 if (head->anim_speed) 305 if (head->anim_speed)
165 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
166 else 307 else
167 { 308 {
168 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
169 anim_speed = 255; 310 anim_speed = 255;
170 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
171 anim_speed = 1; 312 anim_speed = 1;
172 else 313 else
173 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
174 } 315 }
175 316
176 if (anim_speed > 255) 317 if (anim_speed > 255)
177 anim_speed = 255; 318 anim_speed = 255;
178 } 319 }
… …
183 if (ns.itemcmd == 2) 324 if (ns.itemcmd == 2)
184 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
185 326
186 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
187} 328}
188
189 329
190/** 330/**
191 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
192 * This sends all the faces to the client, not just updates. This is 332 * This sends all the faces to the client, not just updates. This is
193 * because object ordering would otherwise be inconsistent. 333 * because object ordering would otherwise be inconsistent.
194 */ 334 */
195void 335void
196esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
197{ 337{
198 object *tmp, *last;
199 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
200 char buf[MAX_BUF];
201 339
202 if (!pl->contr->socket->update_look) 340 if (!pl->contr->ns->update_look)
203 { 341 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 342 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name);
205 return; 343 return;
206 } 344 }
207 else 345 else
208 pl->contr->socket->update_look = 0; 346 pl->contr->ns->update_look = 0;
209 347
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 348 if (QUERY_FLAG (pl, FLAG_REMOVED)
211 || !pl->map 349 || !pl->map
212 || pl->map->in_memory != MAP_IN_MEMORY 350 || pl->map->in_memory != MAP_IN_MEMORY
213 || out_of_map (pl->map, pl->x, pl->y)) 351 || out_of_map (pl->map, pl->x, pl->y))
214 return; 352 return;
215 353
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 354 pl->contr->ns->send_packet ("delinv 0");
217 ;
218 355
219 packet sl; 356 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 357 sl.printf ("item%d ", pl->contr->ns->itemcmd);
224 358
225 sl << uint32 (0); 359 sl << uint32 (0);
226 360
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 361 pl->contr->ns->send_face (empty_face);
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 362 pl->contr->ns->flush_fx ();
229 363
230 if (pl->contr->socket->look_position) 364 if (pl->contr->ns->look_position)
231 { 365 {
232 char buf[80]; 366 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); 367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
234 368
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
236 << uint32 (0) 370 << uint32 (0)
237 << sint32 (-1) 371 << sint32 (-1)
238 << uint32 (empty_face->number) 372 << uint32 (empty_face)
239 << data8 (buf) 373 << data8 (buf)
240 << uint16 (0) 374 << uint16 (0)
241 << uint8 (0) 375 << uint8 (0)
242 << uint32 (0); 376 << uint32 (0);
243 377
244 if (pl->contr->socket->itemcmd == 2) 378 if (pl->contr->ns->itemcmd == 2)
245 sl << uint16 (0); 379 sl << uint16 (0);
246 } 380 }
247 381
382 object *tmp = pl->ms ().top;
248 for (last = NULL; tmp != last; tmp = tmp->below) 383 for (object *last = 0; tmp != last; tmp = tmp->below)
249 { 384 {
250 object *head; 385 object *head;
251 386
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
253 { 388 {
254 last = tmp->below; /* assumes double floor mode */ 389 last = tmp->below; /* assumes double floor mode */
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 390 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
256 last = last->below; 391 last = last->below;
257 } 392 }
258 393
259 if (LOOK_OBJ (tmp)) 394 if (tmp->client_visible ())
260 { 395 {
261 if (++start_look < pl->contr->socket->look_position) 396 if (++start_look < pl->contr->ns->look_position)
262 continue; 397 continue;
263 398
264 end_look++; 399 end_look++;
265 400
266 if (end_look > NUM_LOOK_OBJECTS) 401 if (end_look > FLOORBOX_PAGESIZE)
267 { 402 {
268 /* What we basically do is make a 'fake' object - when the user applies it, 403 /* 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. 404 * we notice the special tag the object has, and act accordingly.
270 */ 405 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
272 << uint32 (0) 407 << uint32 (0)
273 << uint32 ((uint32) - 1) 408 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number) 409 << uint32 (empty_face)
275 << data8 ("Apply this to see next group of items") 410 << data8 ("Apply this to see next group of items")
276 << uint16 (0) 411 << uint16 (0)
277 << uint8 (0) 412 << uint8 (0)
278 << uint32 (0); 413 << uint32 (0);
279 414
280 if (pl->contr->socket->itemcmd == 2) 415 if (pl->contr->ns->itemcmd == 2)
281 sl << uint16 (0); 416 sl << uint16 (0);
282 417
283 break; 418 break;
284 } 419 }
285 420
286 if (tmp->head) 421 if (tmp->head)
287 head = tmp->head; 422 head = tmp->head;
288 else 423 else
289 head = tmp; 424 head = tmp;
290 425
291 add_object_to_socklist (*pl->contr->socket, sl, head); 426 add_object_to_socklist (*pl->contr->ns, sl, head);
292 got_one++; 427 got_one++;
293 428
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 { 430 {
296 pl->contr->socket->send_packet (sl); 431 pl->contr->ns->send_packet (sl);
297 432
298 sl.reset (); 433 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd); 434 sl.printf ("item%d ", pl->contr->ns->itemcmd);
300 sl << uint32 (0); 435 sl << uint32 (0);
301 got_one = 0; 436 got_one = 0;
302 } 437 }
303 } 438 }
304 } 439 }
305 440
306 if (got_one) 441 if (got_one)
307 pl->contr->socket->send_packet (sl); 442 pl->contr->ns->send_packet (sl);
308 443
309} 444}
310 445
311/** 446/**
312 * Sends whole inventory. 447 * Sends whole inventory.
313 */ 448 */
314void 449void
315esrv_send_inventory (object *pl, object *op) 450esrv_send_inventory (object *pl, object *op)
316{ 451{
317 object *tmp; 452 if (!pl->contr->ns)//D
453 return;
454
318 int got_one = 0; 455 int got_one = 0;
319 456
457 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
458
320 packet sl; 459 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); 460 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 461
328 sl << uint32 (op->count); 462 sl << uint32 (op->count);
329 463
330 for (tmp = op->inv; tmp; tmp = tmp->below) 464 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 465 {
332 object *head; 466 object *head;
333 467
334 if (tmp->head) 468 if (tmp->head)
335 head = tmp->head; 469 head = tmp->head;
336 else 470 else
337 head = tmp; 471 head = tmp;
338 472
339 if (LOOK_OBJ (head)) 473 if (head->client_visible ())
340 { 474 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 475 add_object_to_socklist (*pl->contr->ns, sl, head);
342 476
343 got_one++; 477 got_one++;
344 478
345 /* IT is possible for players to accumulate a huge amount of 479 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 480 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 481 * overflow the buffer. IF so, send multiple item commands.
348 */ 482 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 483 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
350 { 484 {
351 pl->contr->socket->send_packet (sl); 485 pl->contr->ns->send_packet (sl);
352 486
353 sl.reset (); 487 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 488 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 489 sl << uint32 (op->count);
356 got_one = 0; 490 got_one = 0;
357 } 491 }
358 } /* If LOOK_OBJ() */ 492 }
359 } 493 }
360 494
361 if (got_one) 495 if (got_one)
362 pl->contr->socket->send_packet (sl); 496 pl->contr->ns->send_packet (sl);
363} 497}
364 498
365/** 499/**
366 * Updates object *op for player *pl. 500 * Updates object *op for player *pl.
367 * 501 *
368 * flags is a list of values to update 502 * flags is a list of values to update
369 * to the client (as defined in newclient.h - might as well use the 503 * to the client (as defined in newclient.h - might as well use the
370 * same value both places. 504 * same value both places.
371 */ 505 */
372
373void 506void
374esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
375{ 508{
376 /* If we have a request to send the player item, skip a few checks. */ 509 /* If we have a request to send the player item, skip a few checks. */
377 if (op != pl) 510 if (op != pl)
378 { 511 {
379 if (!LOOK_OBJ (op)) 512 if (!op->client_visible ())
380 return; 513 return;
381 /* we remove the check for op->env, because in theory, the object 514 /* we remove the check for op->env, because in theory, the object
382 * is hopefully in the same place, so the client should preserve 515 * is hopefully in the same place, so the client should preserve
383 * order. 516 * order.
384 */ 517 */
385 } 518 }
386 519
520 client *ns = pl->contr->ns;
521 if (!ns)
522 return;
523
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
388 { 525 {
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 526 /* 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 527 * this is happening - we can set a breakpoint here in the debugger
391 * and track back the call. 528 * and track back the call.
392 */ 529 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 530 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 } 531 }
395 532
396 packet sl; 533 packet sl ("upditem");
397 534
398 sl << "upditem "
399 << uint8 (flags); 535 sl << uint8 (flags);
400 536
401 if (op->head) 537 if (op->head)
402 op = op->head; 538 op = op->head;
403 539
404 sl << uint32 (op->count); 540 sl << uint32 (op->count);
… …
414 sint32 weight = WEIGHT (op); 550 sint32 weight = WEIGHT (op);
415 551
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417 553
418 if (pl == op) 554 if (pl == op)
419 op->contr->last_weight = weight; 555 ns->last_weight = weight;
420 } 556 }
421 557
422 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
423 { 559 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 561 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 562 sl << uint32 (op->face);
428 } 563 }
429 564
430 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
431 { 566 {
432 int len; 567 int len;
… …
466 { 601 {
467 if (op->anim_speed) 602 if (op->anim_speed)
468 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
469 else 604 else
470 { 605 {
471 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
472 anim_speed = 255; 607 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
474 anim_speed = 1; 609 anim_speed = 1;
475 else 610 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
477 } 612 }
478 613
479 if (anim_speed > 255) 614 if (anim_speed > 255)
480 anim_speed = 255; 615 anim_speed = 255;
481 } 616 }
… …
484 } 619 }
485 620
486 if (flags & UPD_NROF) 621 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 622 sl << uint32 (op->nrof);
488 623
489 pl->contr->socket->send_packet (sl); 624 pl->contr->ns->send_packet (sl);
490} 625}
491 626
492/** 627/**
493 * Sends item's info to player. 628 * Sends item's info to player.
494 */ 629 */
495void 630void
496esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
497{ 632{
633 if (!pl->contr->ns)
634 return;
635
498 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
499 if (op != pl) 637 if (op != pl)
500 { 638 {
501 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
502 if (!LOOK_OBJ (op)) 640 if (!op->client_visible ())
503 return; 641 return;
642
504 /* if the item is on the ground, mark that the look needs to 643 /* if the item is on the ground, mark that the look needs to
505 * be updated. 644 * be updated.
506 */ 645 */
507 if (!op->env) 646 if (!op->env)
508 { 647 {
509 pl->contr->socket->update_look = 1; 648 pl->contr->ns->floorbox_update ();
510 return; 649 return;
511 } 650 }
512 } 651 }
513 652
514 packet sl; 653 packet sl;
515 654
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 655 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 656
518 if (op->head) 657 if (op->head)
519 op = op->head; 658 op = op->head;
520 659
521 sl << uint32 (op->env ? op->env->count : 0); 660 sl << uint32 (op->env ? op->env->count : 0);
522 661
523 add_object_to_socklist (*pl->contr->socket, sl, op); 662 add_object_to_socklist (*pl->contr->ns, sl, op);
524 663
525 pl->contr->socket->send_packet (sl); 664 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT); 665 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 666}
528 667
529/** 668/**
530 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
531 * command with a -1 location. 670 * command with a -1 location.
532 */ 671 */
533
534void 672void
535esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
536{ 674{
537 packet sl; 675 if (!pl->ns)
676 return;
538 677
539 sl << "delitem " 678 packet sl ("delitem");
679
540 << uint32 (tag); 680 sl << uint32 (tag);
541 681
542 pl->socket->send_packet (sl); 682 pl->ns->send_packet (sl);
543} 683}
544 684
545 685
546/******************************************************************************* 686/*******************************************************************************
547 * 687 *
… …
551 691
552/** 692/**
553 * Takes a player and object count (tag) and returns the actual object 693 * Takes a player and object count (tag) and returns the actual object
554 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
555 */ 695 */
556
557object * 696object *
558esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
559{ 698{
560 object *op, *tmp;
561
562 if (pl->count == count) 699 if (pl->count == count)
563 return pl; 700 return pl;
564 701
565 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 703 if (op->count == count)
567 return op; 704 return op;
568 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 707 if (tmp->count == count)
571 return tmp; 708 return tmp;
572 709
573 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 710 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
574 if (op->head && op->head->count == count) 711 if (op->head && op->head->count == count)
575 return op; 712 return op;
576 else if (op->count == count) 713 else if (op->count == count)
577 return op; 714 return op;
578 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 717 if (tmp->count == count)
581 return tmp; 718 return tmp;
582 719
720#if 0
721 /* If the high bit is set, player examined a pseudo object. */
722 if (count & 0x80000000)
723 return 0;
724#endif
725
583 return 0; 726 return 0;
584} 727}
585 728
586
587/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
588void 730void
589ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
590{ 732{
591 tag_t tag = atoi (buf); 733 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 734
597 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
598 736
599 if (!op) 737 if (!op)
600 { 738 {
601 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 739 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
602 return; 740 return;
603 } 741 }
604 742
605 examine (pl->ob, op); 743 examine (pl->ob, op);
744}
745
746/** Client wants to examine some object. So lets do so. */
747void
748ExCmd (char *buf, int len, player *pl)
749{
750 tag_t tag = atoi (buf);
751
752 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
753 {
754 std::string s = op->describe (pl->ob);
755
756 packet sl ("ex");
757 sl << ber32 (tag) << s.c_str ();
758
759 pl->ns->send_packet (sl);
760 }
606} 761}
607 762
608/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
609void 764void
610ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
… …
618 return; 773 return;
619 774
620 /* If the high bit is set, player applied a pseudo object. */ 775 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 776 if (tag & 0x80000000)
622 { 777 {
623 pl->socket->look_position = tag & 0x7fffffff; 778 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 779 pl->ns->floorbox_update ();
625 return; 780 return;
626 } 781 }
627 782
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 783 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 784
… …
634 } 789 }
635 790
636 player_apply (pl->ob, op, 0, 0); 791 player_apply (pl->ob, op, 0, 0);
637} 792}
638 793
639/** Client wants to apply some object. Lets do so. */ 794/** Client wants to lock some object. Lets do so. */
640void 795void
641LockItem (char *data, int len, player *pl) 796LockItem (char *data, int len, player *pl)
642{ 797{
643 int flag = data[0]; 798 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 799 tag_t tag = net_uint32 ((uint8 *)data + 1);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 811 SET_FLAG (op, FLAG_INV_LOCKED);
657 812
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 813 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 814}
660 815
661/** Client wants to apply some object. Lets do so. */ 816/** Client wants to mark some object. Lets do so. */
662void 817void
663MarkItem (char *data, int len, player *pl) 818MarkItem (char *data, int len, player *pl)
664{ 819{
665 tag_t tag = net_uint32 ((uint8 *)data); 820 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 821 object *op = esrv_get_ob_from_count (pl->ob, tag);
… …
697 852
698 m = get_map_from_coord (op->map, &x, &y); 853 m = get_map_from_coord (op->map, &x, &y);
699 if (!m) 854 if (!m)
700 return; 855 return;
701 856
702 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 857 for (tmp = GET_MAP_OB (m, x, y); tmp && tmp->above; tmp = tmp->above)
858 ;
703 859
704 for (; tmp != NULL; tmp = tmp->below) 860 for (; tmp; tmp = tmp->below)
705 { 861 {
706 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
707 continue; 863 continue;
708 864
709 if (!flag) 865 if (!flag)
… …
738 else 894 else
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
740 } 896 }
741} 897}
742 898
743
744
745/** Client wants to look at some object. Lets do so. */ 899/** Client wants to look at some object. Lets do so. */
746void 900void
747LookAt (char *buf, int len, player *pl) 901LookAt (char *buf, int len, player *pl)
748{ 902{
749 int dx, dy; 903 int dx, dy;
750 char *cp; 904 char *cp;
751 905
752 dx = atoi (buf); 906 dx = atoi (buf);
753 if (!(cp = strchr (buf, ' '))) 907 if (!(cp = strchr (buf, ' ')))
754 {
755 return; 908 return;
756 } 909
757 dy = atoi (cp); 910 dy = atoi (cp);
758
759 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 911 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
760 return; 912 return;
761 913
762 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 914 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
763 return; 915 return;
764 916
765 look_at (pl->ob, dx, dy); 917 look_at (pl->ob, dx, dy);
766} 918}
767 919

Diff Legend

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