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

Diff Legend

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