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.23 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.34 by root, Mon Jan 15 02:39:41 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game for X-windows
3 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * This program 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 2 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, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author 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
36#include <global.h> 36#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 37#include <object.h>
38#include <sproto.h> 38#include <sproto.h>
39 39
40/** 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 */
41#define MAXITEMLEN 300 41#define MAXITEMLEN 300
42 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
182
43/******************************************************************************* 183/*******************************************************************************
44 * 184 *
45 * Functions related to sending object data to the client. 185 * Functions related to sending object data to the client.
46 * 186 *
47 ******************************************************************************/ 187 ******************************************************************************/
48 188
49/** 189/**
50 * This is a similar to query_name, but returns flags 190 * This is a similar to query_name, but returns flags
51 * to be sended to client. 191 * to be sent to client.
52 */ 192 */
53unsigned int 193unsigned int
54query_flags (object *op) 194query_flags (object *op)
55{ 195{
56 unsigned int flags = 0; 196 unsigned int flags = 0;
57 197
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 198 if (QUERY_FLAG (op, FLAG_APPLIED))
59 { 199 {
60 switch (op->type) 200 switch (op->type)
61 { 201 {
62 case BOW: 202 case BOW:
63 case WAND: 203 case WAND:
64 case ROD: 204 case ROD:
65 case HORN: 205 case HORN:
66 flags = a_readied; 206 flags = a_readied;
67 break; 207 break;
68 case WEAPON: 208 case WEAPON:
69 flags = a_wielded; 209 flags = a_wielded;
70 break; 210 break;
71 case SKILL: 211 case SKILL:
72 case ARMOUR: 212 case ARMOUR:
73 case HELMET: 213 case HELMET:
74 case SHIELD: 214 case SHIELD:
75 case RING: 215 case RING:
76 case BOOTS: 216 case BOOTS:
77 case GLOVES: 217 case GLOVES:
78 case AMULET: 218 case AMULET:
79 case GIRDLE: 219 case GIRDLE:
80 case BRACERS: 220 case BRACERS:
81 case CLOAK: 221 case CLOAK:
82 flags = a_worn; 222 flags = a_worn;
83 break; 223 break;
84 case CONTAINER: 224 case CONTAINER:
85 flags = a_active; 225 flags = a_active;
86 break; 226 break;
87 default: 227 default:
88 flags = a_applied; 228 flags = a_applied;
89 break; 229 break;
90 } 230 }
91 } 231 }
232
92 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
93 flags |= F_OPEN; 234 flags |= F_OPEN;
94 235
95 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
96 { 237 {
97 if (QUERY_FLAG (op, FLAG_DAMNED)) 238 if (QUERY_FLAG (op, FLAG_DAMNED))
98 flags |= F_DAMNED; 239 flags |= F_DAMNED;
99 else if (QUERY_FLAG (op, FLAG_CURSED)) 240 else if (QUERY_FLAG (op, FLAG_CURSED))
100 flags |= F_CURSED; 241 flags |= F_CURSED;
101 } 242 }
243
102 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 244 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
103 flags |= F_MAGIC; 245 flags |= F_MAGIC;
104 if (QUERY_FLAG (op, FLAG_UNPAID)) 246 if (QUERY_FLAG (op, FLAG_UNPAID))
105 flags |= F_UNPAID; 247 flags |= F_UNPAID;
106 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 248 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
183 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
184 326
185 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
186} 328}
187 329
188
189/** 330/**
190 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
191 * 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
192 * because object ordering would otherwise be inconsistent 333 * because object ordering would otherwise be inconsistent.
193 */ 334 */
194
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]; 339 char buf[MAX_BUF];
201 340
202 if (!pl->contr->socket->update_look) 341 if (!pl->contr->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\n");
205 return; 344 return;
206 } 345 }
207 else 346 else
208 pl->contr->socket->update_look = 0; 347 pl->contr->ns->update_look = 0;
209 348
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (pl, FLAG_REMOVED)
211 || !pl->map 350 || !pl->map
212 || pl->map->in_memory != MAP_IN_MEMORY 351 || pl->map->in_memory != MAP_IN_MEMORY
213 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (pl->map, pl->x, pl->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->contr->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->contr->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 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 363 esrv_send_face (pl->contr->ns, empty_face->number, 0);
229 364
230 if (pl->contr->socket->look_position) 365 if (pl->contr->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->contr->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->number)
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->contr->ns->itemcmd == 2)
245 sl << uint16 (0); 380 sl << uint16 (0);
246 } 381 }
247 382
383 object *tmp = pl->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->contr->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->contr->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->number)
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->contr->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->contr->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->contr->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->contr->ns->itemcmd);
300 sl << uint32 (0); 436 sl << uint32 (0);
301 got_one = 0; 437 got_one = 0;
302 } 438 }
303 } /* If LOOK_OBJ() */ 439 }
304 } 440 }
305 441
306 if (got_one) 442 if (got_one)
307 pl->contr->socket->send_packet (sl); 443 pl->contr->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
364} 498}
365 499
366/** 500/**
367 * Updates object *op for player *pl. 501 * Updates object *op for player *pl.
368 * 502 *
… …
375esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
376{ 510{
377 /* If we have a request to send the player item, skip a few checks. */ 511 /* If we have a request to send the player item, skip a few checks. */
378 if (op != pl) 512 if (op != pl)
379 { 513 {
380 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
381 return; 515 return;
382 /* we remove the check for op->env, because in theory, the object 516 /* we remove the check for op->env, because in theory, the object
383 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
384 * order. 518 * order.
385 */ 519 */
386 } 520 }
387 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
388 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
389 { 527 {
390 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 528 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
391 * this is happening - we can set a breakpoint here in the debugger 529 * this is happening - we can set a breakpoint here in the debugger
392 * and track back the call. 530 * and track back the call.
393 */ 531 */
394 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 532 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
395 } 533 }
396 534
397 packet sl; 535 packet sl ("upditem");
398 536
399 sl << "upditem "
400 << uint8 (flags); 537 sl << uint8 (flags);
401 538
402 if (op->head) 539 if (op->head)
403 op = op->head; 540 op = op->head;
404 541
405 sl << uint32 (op->count); 542 sl << uint32 (op->count);
… …
415 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
416 553
417 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
418 555
419 if (pl == op) 556 if (pl == op)
420 op->contr->last_weight = weight; 557 ns->last_weight = weight;
421 } 558 }
422 559
423 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
424 { 561 {
425 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
426 esrv_send_face (pl->contr->socket, op->face->number, 0); 563 esrv_send_face (ns, op->face->number, 0);
427 564
428 sl << uint32 (op->face->number); 565 sl << uint32 (op->face->number);
429 } 566 }
430 567
431 if (flags & UPD_NAME) 568 if (flags & UPD_NAME)
… …
485 } 622 }
486 623
487 if (flags & UPD_NROF) 624 if (flags & UPD_NROF)
488 sl << uint32 (op->nrof); 625 sl << uint32 (op->nrof);
489 626
490 pl->contr->socket->send_packet (sl); 627 pl->contr->ns->send_packet (sl);
491} 628}
492 629
493/** 630/**
494 * Sends item's info to player. 631 * Sends item's info to player.
495 */ 632 */
496void 633void
497esrv_send_item (object *pl, object *op) 634esrv_send_item (object *pl, object *op)
498{ 635{
636 if (!pl->contr->ns)
637 return;
638
499 /* If this is not the player object, do some more checks */ 639 /* If this is not the player object, do some more checks */
500 if (op != pl) 640 if (op != pl)
501 { 641 {
502 /* We only send 'visibile' objects to the client */ 642 /* We only send 'visibile' objects to the client */
503 if (!LOOK_OBJ (op)) 643 if (!op->client_visible ())
504 return; 644 return;
645
505 /* if the item is on the ground, mark that the look needs to 646 /* if the item is on the ground, mark that the look needs to
506 * be updated. 647 * be updated.
507 */ 648 */
508 if (!op->env) 649 if (!op->env)
509 { 650 {
510 pl->contr->socket->update_look = 1; 651 pl->contr->ns->floorbox_update ();
511 return; 652 return;
512 } 653 }
513 } 654 }
514 655
515 packet sl; 656 packet sl;
516 657
517 sl.printf ("item%d ", pl->contr->socket->itemcmd); 658 sl.printf ("item%d ", pl->contr->ns->itemcmd);
518 659
519 if (op->head) 660 if (op->head)
520 op = op->head; 661 op = op->head;
521 662
522 sl << uint32 (op->env ? op->env->count : 0); 663 sl << uint32 (op->env ? op->env->count : 0);
523 664
524 add_object_to_socklist (*pl->contr->socket, sl, op); 665 add_object_to_socklist (*pl->contr->ns, sl, op);
525 666
526 pl->contr->socket->send_packet (sl); 667 pl->contr->ns->send_packet (sl);
527 SET_FLAG (op, FLAG_CLIENT_SENT); 668 SET_FLAG (op, FLAG_CLIENT_SENT);
528
529} 669}
530 670
531/** 671/**
532 * Tells the client to delete an item. Uses the item 672 * Tells the client to delete an item. Uses the item
533 * command with a -1 location. 673 * command with a -1 location.
534 */ 674 */
535 675
536void 676void
537esrv_del_item (player *pl, int tag) 677esrv_del_item (player *pl, int tag)
538{ 678{
539 packet sl; 679 packet sl ("delitem");
540 680
541 sl << "delitem "
542 << uint32 (tag); 681 sl << uint32 (tag);
543 682
544 pl->socket->send_packet (sl); 683 pl->ns->send_packet (sl);
545} 684}
546 685
547 686
548/******************************************************************************* 687/*******************************************************************************
549 * 688 *
… …
570 else if (op->type == CONTAINER && pl->container == op) 709 else if (op->type == CONTAINER && pl->container == op)
571 for (tmp = op->inv; tmp; tmp = tmp->below) 710 for (tmp = op->inv; tmp; tmp = tmp->below)
572 if (tmp->count == count) 711 if (tmp->count == count)
573 return tmp; 712 return tmp;
574 713
575 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 714 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
576 if (op->head != NULL && op->head->count == count) 715 if (op->head && op->head->count == count)
577 return op; 716 return op;
578 else if (op->count == count) 717 else if (op->count == count)
579 return op; 718 return op;
580 else if (op->type == CONTAINER && pl->container == op) 719 else if (op->type == CONTAINER && pl->container == op)
581 for (tmp = op->inv; tmp; tmp = tmp->below) 720 for (tmp = op->inv; tmp; tmp = tmp->below)
582 if (tmp->count == count) 721 if (tmp->count == count)
583 return tmp; 722 return tmp;
584 723
585 return NULL; 724 return 0;
586} 725}
587 726
588 727
589/** Client wants to examine some object. So lets do so. */ 728/** Client wants to examine some object. So lets do so. */
590void 729void
… …
605 } 744 }
606 745
607 examine (pl->ob, op); 746 examine (pl->ob, op);
608} 747}
609 748
610/** Client wants to apply some object. Lets do so. */ 749/** Client wants to apply some object. Lets do so. */
611void 750void
612ApplyCmd (char *buf, int len, player *pl) 751ApplyCmd (char *buf, int len, player *pl)
613{ 752{
614 tag_t tag = atoi (buf); 753 tag_t tag = atoi (buf);
615 754
… …
620 return; 759 return;
621 760
622 /* If the high bit is set, player applied a pseudo object. */ 761 /* If the high bit is set, player applied a pseudo object. */
623 if (tag & 0x80000000) 762 if (tag & 0x80000000)
624 { 763 {
625 pl->socket->look_position = tag & 0x7fffffff; 764 pl->ns->look_position = tag & 0x7fffffff;
626 pl->socket->update_look = 1; 765 pl->ns->floorbox_update ();
627 return; 766 return;
628 } 767 }
629 768
630 object *op = esrv_get_ob_from_count (pl->ob, tag); 769 object *op = esrv_get_ob_from_count (pl->ob, tag);
631 770
… …
636 } 775 }
637 776
638 player_apply (pl->ob, op, 0, 0); 777 player_apply (pl->ob, op, 0, 0);
639} 778}
640 779
641/** Client wants to apply some object. Lets do so. */ 780/** Client wants to lock some object. Lets do so. */
642void 781void
643LockItem (char *data, int len, player *pl) 782LockItem (char *data, int len, player *pl)
644{ 783{
645 int flag = data[0]; 784 int flag = data[0];
646 tag_t tag = net_uint32 ((uint8 *)data + 1); 785 tag_t tag = net_uint32 ((uint8 *)data + 1);
… …
658 SET_FLAG (op, FLAG_INV_LOCKED); 797 SET_FLAG (op, FLAG_INV_LOCKED);
659 798
660 esrv_update_item (UPD_FLAGS, pl->ob, op); 799 esrv_update_item (UPD_FLAGS, pl->ob, op);
661} 800}
662 801
663/** Client wants to apply some object. Lets do so. */ 802/** Client wants to mark some object. Lets do so. */
664void 803void
665MarkItem (char *data, int len, player *pl) 804MarkItem (char *data, int len, player *pl)
666{ 805{
667 tag_t tag = net_uint32 ((uint8 *)data); 806 tag_t tag = net_uint32 ((uint8 *)data);
668 object *op = esrv_get_ob_from_count (pl->ob, tag); 807 object *op = esrv_get_ob_from_count (pl->ob, tag);
… …
699 838
700 m = get_map_from_coord (op->map, &x, &y); 839 m = get_map_from_coord (op->map, &x, &y);
701 if (!m) 840 if (!m)
702 return; 841 return;
703 842
704 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 843 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
705 844
706 for (; tmp != NULL; tmp = tmp->below) 845 for (; tmp != NULL; tmp = tmp->below)
707 { 846 {
708 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 847 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
709 continue; 848 continue;
… …
756 { 895 {
757 return; 896 return;
758 } 897 }
759 dy = atoi (cp); 898 dy = atoi (cp);
760 899
761 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 900 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
762 return; 901 return;
763 902
764 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 903 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
765 return; 904 return;
766 905
767 look_at (pl->ob, dx, dy); 906 look_at (pl->ob, dx, dy);
768} 907}
769 908
… …
799 } 938 }
800 939
801 esrv_update_item (UPD_WEIGHT, pl, op); 940 esrv_update_item (UPD_WEIGHT, pl, op);
802 } 941 }
803 else 942 else
804 {
805 drop_object (pl, op, nrof); 943 drop_object (pl, op, nrof);
806 } 944
807 return; 945 return;
808 } 946 }
809 else if (to == pl->count) 947 else if (to == pl->count)
810 { /* pick it up to the inventory */ 948 { /* pick it up to the inventory */
811 /* return if player has already picked it up */ 949 /* return if player has already picked it up */
… …
828 * has already been done (eg, it can be picked up and fits in 966 * has already been done (eg, it can be picked up and fits in
829 * in a sack, so check for those things. We should also check 967 * in a sack, so check for those things. We should also check
830 * an make sure env is in fact a container for that matter. 968 * an make sure env is in fact a container for that matter.
831 */ 969 */
832 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 970 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
833 {
834 put_object_in_sack (pl, env, op, nrof); 971 put_object_in_sack (pl, env, op, nrof);
835 }
836} 972}
837 973

Diff Legend

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