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.16 by root, Thu Dec 14 01:21:58 2006 UTC vs.
Revision 1.29 by root, Thu Dec 21 23:37:06 2006 UTC

… …
30 * This containes item logic for client/server. It doesn't contain 30 * This containes 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
36#include <global.h> 35#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 36#include <object.h> /* LOOK_OBJ */
38#include <newclient.h>
39#include <newserver.h>
40#include <sproto.h> 37#include <sproto.h>
41 38
42/** 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 */
43#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
44 181
45/******************************************************************************* 182/*******************************************************************************
46 * 183 *
47 * Functions related to sending object data to the client. 184 * Functions related to sending object data to the client.
48 * 185 *
49 ******************************************************************************/ 186 ******************************************************************************/
50 187
51/** 188/**
52 * This is a similar to query_name, but returns flags 189 * This is a similar to query_name, but returns flags
53 * to be sended to client. 190 * to be sent to client.
54 */ 191 */
55unsigned int 192unsigned int
56query_flags (object *op) 193query_flags (object *op)
57{ 194{
58 unsigned int flags = 0; 195 unsigned int flags = 0;
59 196
60 if (QUERY_FLAG (op, FLAG_APPLIED)) 197 if (QUERY_FLAG (op, FLAG_APPLIED))
61 { 198 {
62 switch (op->type) 199 switch (op->type)
63 { 200 {
64 case BOW: 201 case BOW:
65 case WAND: 202 case WAND:
66 case ROD: 203 case ROD:
67 case HORN: 204 case HORN:
68 flags = a_readied; 205 flags = a_readied;
69 break; 206 break;
70 case WEAPON: 207 case WEAPON:
71 flags = a_wielded; 208 flags = a_wielded;
72 break; 209 break;
73 case SKILL: 210 case SKILL:
74 case ARMOUR: 211 case ARMOUR:
75 case HELMET: 212 case HELMET:
76 case SHIELD: 213 case SHIELD:
77 case RING: 214 case RING:
78 case BOOTS: 215 case BOOTS:
79 case GLOVES: 216 case GLOVES:
80 case AMULET: 217 case AMULET:
81 case GIRDLE: 218 case GIRDLE:
82 case BRACERS: 219 case BRACERS:
83 case CLOAK: 220 case CLOAK:
84 flags = a_worn; 221 flags = a_worn;
85 break; 222 break;
86 case CONTAINER: 223 case CONTAINER:
87 flags = a_active; 224 flags = a_active;
88 break; 225 break;
89 default: 226 default:
90 flags = a_applied; 227 flags = a_applied;
91 break; 228 break;
92 } 229 }
93 } 230 }
231
94 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 232 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
95 flags |= F_OPEN; 233 flags |= F_OPEN;
96 234
97 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 235 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
98 { 236 {
99 if (QUERY_FLAG (op, FLAG_DAMNED)) 237 if (QUERY_FLAG (op, FLAG_DAMNED))
100 flags |= F_DAMNED; 238 flags |= F_DAMNED;
101 else if (QUERY_FLAG (op, FLAG_CURSED)) 239 else if (QUERY_FLAG (op, FLAG_CURSED))
102 flags |= F_CURSED; 240 flags |= F_CURSED;
103 } 241 }
242
104 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 243 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
105 flags |= F_MAGIC; 244 flags |= F_MAGIC;
106 if (QUERY_FLAG (op, FLAG_UNPAID)) 245 if (QUERY_FLAG (op, FLAG_UNPAID))
107 flags |= F_UNPAID; 246 flags |= F_UNPAID;
108 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 247 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
114/* Used in the send_look to put object head into packet 253/* Used in the send_look to put object head into packet
115 * sl for socket ns. Need socket to know if we need to send 254 * sl for socket ns. Need socket to know if we need to send
116 * animation of face to the client. 255 * animation of face to the client.
117 */ 256 */
118static void 257static void
119add_object_to_socklist (NewSocket &ns, packet &sl, object *head) 258add_object_to_socklist (client &ns, packet &sl, object *head)
120{ 259{
121 int flags, len, anim_speed; 260 int flags, len, anim_speed;
122 char item_n[MAX_BUF]; 261 char item_n[MAX_BUF];
123 const char *item_p; 262 const char *item_p;
124 263
… …
187 SET_FLAG (head, FLAG_CLIENT_SENT); 326 SET_FLAG (head, FLAG_CLIENT_SENT);
188} 327}
189 328
190 329
191/** 330/**
192 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
193 * 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
194 * because object ordering would otherwise be inconsistent 333 * because object ordering would otherwise be inconsistent.
195 */ 334 */
196
197void 335void
198esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
199{ 337{
200 object *tmp, *last; 338 object *tmp, *last;
201 int got_one = 0, start_look = 0, end_look = 0; 339 int got_one = 0, start_look = 0, end_look = 0;
202 char buf[MAX_BUF]; 340 char buf[MAX_BUF];
203 341
204 if (!pl->contr->socket.update_look) 342 if (!pl->contr->ns->update_look)
205 { 343 {
206 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
207 return; 345 return;
208 } 346 }
209 else 347 else
210 pl->contr->socket.update_look = 0; 348 pl->contr->ns->update_look = 0;
211 349
212 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (pl, FLAG_REMOVED)
213 || !pl->map 351 || !pl->map
214 || pl->map->in_memory != MAP_IN_MEMORY 352 || pl->map->in_memory != MAP_IN_MEMORY
215 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (pl->map, pl->x, pl->y))
216 return; 354 return;
217 355
218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 356 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
219 ; 357 ;
220 358
359 pl->contr->ns->send_packet ("delinv 0");
360
221 packet sl; 361 packet sl;
222
223 pl->contr->socket.send_packet ("delinv 0");
224
225 sl.printf ("item%d ", pl->contr->socket.itemcmd); 362 sl.printf ("item%d ", pl->contr->ns->itemcmd);
226 363
227 sl << uint32 (0); 364 sl << uint32 (0);
228 365
229 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 366 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
230 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 367 esrv_send_face (pl->contr->ns, empty_face->number, 0);
231 368
232 if (pl->contr->socket.look_position) 369 if (pl->contr->ns->look_position)
233 { 370 {
371 char buf[80];
372 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
373
234 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 374 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
235 << uint32 (0) 375 << uint32 (0)
236 << sint32 (-1) 376 << sint32 (-1)
237 << uint32 (empty_face->number); 377 << uint32 (empty_face->number)
238 378 << data8 (buf)
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241 sl << uint16 (0) 379 << uint16 (0)
242 << uint8 (0) 380 << uint8 (0)
243 << uint32 (0); 381 << uint32 (0);
244 382
245 if (pl->contr->socket.itemcmd == 2) 383 if (pl->contr->ns->itemcmd == 2)
246 sl << uint16 (0); 384 sl << uint16 (0);
247 } 385 }
248 386
249 for (last = NULL; tmp != last; tmp = tmp->below) 387 for (last = NULL; tmp != last; tmp = tmp->below)
250 { 388 {
… …
257 last = last->below; 395 last = last->below;
258 } 396 }
259 397
260 if (LOOK_OBJ (tmp)) 398 if (LOOK_OBJ (tmp))
261 { 399 {
262 if (++start_look < pl->contr->socket.look_position) 400 if (++start_look < pl->contr->ns->look_position)
263 continue; 401 continue;
264 402
265 end_look++; 403 end_look++;
266 404
267 if (end_look > NUM_LOOK_OBJECTS) 405 if (end_look > FLOORBOX_PAGESIZE)
268 { 406 {
269 /* What we basically do is make a 'fake' object - when the user applies it, 407 /* What we basically do is make a 'fake' object - when the user applies it,
270 * we notice the special tag the object has, and act accordingly. 408 * we notice the special tag the object has, and act accordingly.
271 */ 409 */
272 sl << uint32 (0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)) 410 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
273 << uint32 (0) 411 << uint32 (0)
274 << uint32 ((uint32) - 1) 412 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number); 413 << uint32 (empty_face->number)
276 414 << data8 ("Apply this to see next group of items")
277 sl.printf ("Click here to see next group of items");
278
279 sl << uint16 (0) 415 << uint16 (0)
280 << uint8 (0) 416 << uint8 (0)
281 << uint32 (0); 417 << uint32 (0);
282 418
283 if (pl->contr->socket.itemcmd == 2) 419 if (pl->contr->ns->itemcmd == 2)
284 sl << uint16 (0); 420 sl << uint16 (0);
285 421
286 break; 422 break;
287 } 423 }
288 424
289 if (tmp->head) 425 if (tmp->head)
290 head = tmp->head; 426 head = tmp->head;
291 else 427 else
292 head = tmp; 428 head = tmp;
293 429
294 add_object_to_socklist (pl->contr->socket, sl, head); 430 add_object_to_socklist (*pl->contr->ns, sl, head);
295 got_one++; 431 got_one++;
296 432
297 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 433 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 { 434 {
299 Send_With_Handling (&pl->contr->socket, &sl); 435 pl->contr->ns->send_packet (sl);
300 436
301 sl.reset (); 437 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket.itemcmd); 438 sl.printf ("item%d ", pl->contr->ns->itemcmd);
303 sl << uint32 (0); 439 sl << uint32 (0);
304 got_one = 0; 440 got_one = 0;
305 } 441 }
306 } /* If LOOK_OBJ() */ 442 }
307 } 443 }
308 444
309 if (got_one) 445 if (got_one)
310 Send_With_Handling (&pl->contr->socket, &sl); 446 pl->contr->ns->send_packet (sl);
311 447
312} 448}
313 449
314/** 450/**
315 * Sends whole inventory. 451 * Sends whole inventory.
… …
318esrv_send_inventory (object *pl, object *op) 454esrv_send_inventory (object *pl, object *op)
319{ 455{
320 object *tmp; 456 object *tmp;
321 int got_one = 0; 457 int got_one = 0;
322 458
459
460 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
461
323 packet sl; 462 packet sl;
324
325 sl.printf ("delinv %d", op->count);
326 Send_With_Handling (&pl->contr->socket, &sl);
327
328 sl.reset ();
329 sl.printf ("item%d ", pl->contr->socket.itemcmd); 463 sl.printf ("item%d ", pl->contr->ns->itemcmd);
330 464
331 sl << uint32 (op->count); 465 sl << uint32 (op->count);
332 466
333 for (tmp = op->inv; tmp; tmp = tmp->below) 467 for (tmp = op->inv; tmp; tmp = tmp->below)
334 { 468 {
… …
339 else 473 else
340 head = tmp; 474 head = tmp;
341 475
342 if (LOOK_OBJ (head)) 476 if (LOOK_OBJ (head))
343 { 477 {
344 add_object_to_socklist (pl->contr->socket, sl, head); 478 add_object_to_socklist (*pl->contr->ns, sl, head);
345 479
346 got_one++; 480 got_one++;
347 481
348 /* IT is possible for players to accumulate a huge amount of 482 /* IT is possible for players to accumulate a huge amount of
349 * items (especially with some of the bags out there) to 483 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 484 * overflow the buffer. IF so, send multiple item commands.
351 */ 485 */
352 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 486 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
353 { 487 {
354 Send_With_Handling (&pl->contr->socket, &sl); 488 pl->contr->ns->send_packet (sl);
489
490 sl.reset ();
355 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 491 sl.printf ("item%d ", pl->contr->ns->itemcmd);
356 sl.len = strlen ((char *) sl.buf);
357 sl << uint32 (op->count); 492 sl << uint32 (op->count);
358 got_one = 0; 493 got_one = 0;
359 } 494 }
360 } /* If LOOK_OBJ() */ 495 } /* If LOOK_OBJ() */
361 } 496 }
362 497
363 if (got_one) 498 if (got_one)
364 Send_With_Handling (&pl->contr->socket, &sl); 499 pl->contr->ns->send_packet (sl);
365
366} 500}
367 501
368/** 502/**
369 * Updates object *op for player *pl. 503 * Updates object *op for player *pl.
370 * 504 *
… …
394 * and track back the call. 528 * and track back the call.
395 */ 529 */
396 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);
397 } 531 }
398 532
399 packet sl; 533 packet sl ("upditem");
400 534
401 sl << "upditem "
402 << uint8 (flags); 535 sl << uint8 (flags);
403 536
404 if (op->head) 537 if (op->head)
405 op = op->head; 538 op = op->head;
406 539
407 sl << uint32 (op->count); 540 sl << uint32 (op->count);
… …
422 op->contr->last_weight = weight; 555 op->contr->last_weight = weight;
423 } 556 }
424 557
425 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
426 { 559 {
427 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
428 esrv_send_face (&pl->contr->socket, op->face->number, 0); 561 esrv_send_face (pl->contr->ns, op->face->number, 0);
429 562
430 sl << uint32 (op->face->number); 563 sl << uint32 (op->face->number);
431 } 564 }
432 565
433 if (flags & UPD_NAME) 566 if (flags & UPD_NAME)
… …
487 } 620 }
488 621
489 if (flags & UPD_NROF) 622 if (flags & UPD_NROF)
490 sl << uint32 (op->nrof); 623 sl << uint32 (op->nrof);
491 624
492 Send_With_Handling (&pl->contr->socket, &sl); 625 pl->contr->ns->send_packet (sl);
493} 626}
494 627
495/** 628/**
496 * Sends item's info to player. 629 * Sends item's info to player.
497 */ 630 */
… …
507 /* if the item is on the ground, mark that the look needs to 640 /* if the item is on the ground, mark that the look needs to
508 * be updated. 641 * be updated.
509 */ 642 */
510 if (!op->env) 643 if (!op->env)
511 { 644 {
512 pl->contr->socket.update_look = 1; 645 pl->contr->ns->floorbox_update ();
513 return; 646 return;
514 } 647 }
515 } 648 }
516 649
517 packet sl; 650 packet sl;
518 651
519 sl.printf ("item%d ", pl->contr->socket.itemcmd); 652 sl.printf ("item%d ", pl->contr->ns->itemcmd);
520 653
521 if (op->head) 654 if (op->head)
522 op = op->head; 655 op = op->head;
523 656
524 sl << uint32 (op->env ? op->env->count : 0); 657 sl << uint32 (op->env ? op->env->count : 0);
525 658
526 add_object_to_socklist (pl->contr->socket, sl, op); 659 add_object_to_socklist (*pl->contr->ns, sl, op);
527 660
528 Send_With_Handling (&pl->contr->socket, &sl); 661 pl->contr->ns->send_packet (sl);
529 SET_FLAG (op, FLAG_CLIENT_SENT); 662 SET_FLAG (op, FLAG_CLIENT_SENT);
530
531} 663}
532 664
533/** 665/**
534 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
535 * command with a -1 location. 667 * command with a -1 location.
536 */ 668 */
537 669
538void 670void
539esrv_del_item (player *pl, int tag) 671esrv_del_item (player *pl, int tag)
540{ 672{
541 packet sl; 673 packet sl ("delitem");
542 674
543 sl << "delitem "
544 << uint32 (tag); 675 sl << uint32 (tag);
545 676
546 Send_With_Handling (&pl->socket, &sl); 677 pl->ns->send_packet (sl);
547} 678}
548 679
549 680
550/******************************************************************************* 681/*******************************************************************************
551 * 682 *
… …
572 else if (op->type == CONTAINER && pl->container == op) 703 else if (op->type == CONTAINER && pl->container == op)
573 for (tmp = op->inv; tmp; tmp = tmp->below) 704 for (tmp = op->inv; tmp; tmp = tmp->below)
574 if (tmp->count == count) 705 if (tmp->count == count)
575 return tmp; 706 return tmp;
576 707
577 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
578 if (op->head != NULL && op->head->count == count) 709 if (op->head && op->head->count == count)
579 return op; 710 return op;
580 else if (op->count == count) 711 else if (op->count == count)
581 return op; 712 return op;
582 else if (op->type == CONTAINER && pl->container == op) 713 else if (op->type == CONTAINER && pl->container == op)
583 for (tmp = op->inv; tmp; tmp = tmp->below) 714 for (tmp = op->inv; tmp; tmp = tmp->below)
584 if (tmp->count == count) 715 if (tmp->count == count)
585 return tmp; 716 return tmp;
586 717
587 return NULL; 718 return 0;
588} 719}
589 720
590 721
591/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
592void 723void
… …
607 } 738 }
608 739
609 examine (pl->ob, op); 740 examine (pl->ob, op);
610} 741}
611 742
612/** Client wants to apply some object. Lets do so. */ 743/** Client wants to apply some object. Lets do so. */
613void 744void
614ApplyCmd (char *buf, int len, player *pl) 745ApplyCmd (char *buf, int len, player *pl)
615{ 746{
616 tag_t tag = atoi (buf); 747 tag_t tag = atoi (buf);
617 748
… …
622 return; 753 return;
623 754
624 /* If the high bit is set, player applied a pseudo object. */ 755 /* If the high bit is set, player applied a pseudo object. */
625 if (tag & 0x80000000) 756 if (tag & 0x80000000)
626 { 757 {
627 pl->socket.look_position = tag & 0x7fffffff; 758 pl->ns->look_position = tag & 0x7fffffff;
628 pl->socket.update_look = 1; 759 pl->ns->floorbox_update ();
629 return; 760 return;
630 } 761 }
631 762
632 object *op = esrv_get_ob_from_count (pl->ob, tag); 763 object *op = esrv_get_ob_from_count (pl->ob, tag);
633 764
… …
638 } 769 }
639 770
640 player_apply (pl->ob, op, 0, 0); 771 player_apply (pl->ob, op, 0, 0);
641} 772}
642 773
643/** Client wants to apply some object. Lets do so. */ 774/** Client wants to lock some object. Lets do so. */
644void 775void
645LockItem (uint8 *data, int len, player *pl) 776LockItem (char *data, int len, player *pl)
646{ 777{
647 int flag = data[0]; 778 int flag = data[0];
648 tag_t tag = net_uint32 (data + 1); 779 tag_t tag = net_uint32 ((uint8 *)data + 1);
649 object *op = esrv_get_ob_from_count (pl->ob, tag); 780 object *op = esrv_get_ob_from_count (pl->ob, tag);
650 781
651 if (!op) 782 if (!op)
652 { 783 {
653 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 784 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
660 SET_FLAG (op, FLAG_INV_LOCKED); 791 SET_FLAG (op, FLAG_INV_LOCKED);
661 792
662 esrv_update_item (UPD_FLAGS, pl->ob, op); 793 esrv_update_item (UPD_FLAGS, pl->ob, op);
663} 794}
664 795
665/** Client wants to apply some object. Lets do so. */ 796/** Client wants to mark some object. Lets do so. */
666void 797void
667MarkItem (uint8 * data, int len, player *pl) 798MarkItem (char *data, int len, player *pl)
668{ 799{
669 tag_t tag = net_uint32 (data); 800 tag_t tag = net_uint32 ((uint8 *)data);
670 object *op = esrv_get_ob_from_count (pl->ob, tag); 801 object *op = esrv_get_ob_from_count (pl->ob, tag);
671 802
672 if (!op) 803 if (!op)
673 { 804 {
674 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
701 832
702 m = get_map_from_coord (op->map, &x, &y); 833 m = get_map_from_coord (op->map, &x, &y);
703 if (!m) 834 if (!m)
704 return; 835 return;
705 836
706 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
707 838
708 for (; tmp != NULL; tmp = tmp->below) 839 for (; tmp != NULL; tmp = tmp->below)
709 { 840 {
710 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
711 continue; 842 continue;
… …
758 { 889 {
759 return; 890 return;
760 } 891 }
761 dy = atoi (cp); 892 dy = atoi (cp);
762 893
763 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
764 return; 895 return;
765 896
766 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
767 return; 898 return;
768 899
769 look_at (pl->ob, dx, dy); 900 look_at (pl->ob, dx, dy);
770} 901}
771 902
… …
801 } 932 }
802 933
803 esrv_update_item (UPD_WEIGHT, pl, op); 934 esrv_update_item (UPD_WEIGHT, pl, op);
804 } 935 }
805 else 936 else
806 {
807 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
808 } 938
809 return; 939 return;
810 } 940 }
811 else if (to == pl->count) 941 else if (to == pl->count)
812 { /* pick it up to the inventory */ 942 { /* pick it up to the inventory */
813 /* return if player has already picked it up */ 943 /* return if player has already picked it up */
… …
830 * 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
831 * 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
832 * 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.
833 */ 963 */
834 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
835 {
836 put_object_in_sack (pl, env, op, nrof); 965 put_object_in_sack (pl, env, op, nrof);
837 }
838} 966}
839 967

Diff Legend

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