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.13 by root, Thu Dec 14 00:13:26 2006 UTC vs.
Revision 1.24 by root, Sat Dec 16 22:14:42 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
44 41
… …
47 * Functions related to sending object data to the client. 44 * Functions related to sending object data to the client.
48 * 45 *
49 ******************************************************************************/ 46 ******************************************************************************/
50 47
51/** 48/**
52 * Adds string to socklist.
53 *
54 * This is a simple function that we use a lot here. It basically
55 * adds the specified buffer into the socklist, but prepends a
56 * single byte in length. If the data is longer than that byte, it is
57 * truncated approprately.
58 */
59inline void
60add_stringlen_to_sockbuf (const char *buf, SockList * sl)
61{
62 int len;
63
64 len = strlen (buf);
65 if (len > 255)
66 len = 255;
67 SockList_AddChar (sl, (char) len);
68 strncpy ((char *) sl->buf + sl->len, buf, len);
69 sl->len += len;
70}
71
72/**
73 * This is a similar to query_name, but returns flags 49 * This is a similar to query_name, but returns flags
74 * to be sended to client. 50 * to be sent to client.
75 */ 51 */
76unsigned int 52unsigned int
77query_flags (object *op) 53query_flags (object *op)
78{ 54{
79 unsigned int flags = 0; 55 unsigned int flags = 0;
80 56
81 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
82 { 58 {
83 switch (op->type) 59 switch (op->type)
84 { 60 {
85 case BOW: 61 case BOW:
86 case WAND: 62 case WAND:
87 case ROD: 63 case ROD:
88 case HORN: 64 case HORN:
89 flags = a_readied; 65 flags = a_readied;
90 break; 66 break;
91 case WEAPON: 67 case WEAPON:
92 flags = a_wielded; 68 flags = a_wielded;
93 break; 69 break;
94 case SKILL: 70 case SKILL:
95 case ARMOUR: 71 case ARMOUR:
96 case HELMET: 72 case HELMET:
97 case SHIELD: 73 case SHIELD:
98 case RING: 74 case RING:
99 case BOOTS: 75 case BOOTS:
100 case GLOVES: 76 case GLOVES:
101 case AMULET: 77 case AMULET:
102 case GIRDLE: 78 case GIRDLE:
103 case BRACERS: 79 case BRACERS:
104 case CLOAK: 80 case CLOAK:
105 flags = a_worn; 81 flags = a_worn;
106 break; 82 break;
107 case CONTAINER: 83 case CONTAINER:
108 flags = a_active; 84 flags = a_active;
109 break; 85 break;
110 default: 86 default:
111 flags = a_applied; 87 flags = a_applied;
112 break; 88 break;
113 } 89 }
114 } 90 }
91
115 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 92 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
116 flags |= F_OPEN; 93 flags |= F_OPEN;
117 94
118 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 95 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
119 { 96 {
120 if (QUERY_FLAG (op, FLAG_DAMNED)) 97 if (QUERY_FLAG (op, FLAG_DAMNED))
121 flags |= F_DAMNED; 98 flags |= F_DAMNED;
122 else if (QUERY_FLAG (op, FLAG_CURSED)) 99 else if (QUERY_FLAG (op, FLAG_CURSED))
123 flags |= F_CURSED; 100 flags |= F_CURSED;
124 } 101 }
102
125 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 103 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
126 flags |= F_MAGIC; 104 flags |= F_MAGIC;
127 if (QUERY_FLAG (op, FLAG_UNPAID)) 105 if (QUERY_FLAG (op, FLAG_UNPAID))
128 flags |= F_UNPAID; 106 flags |= F_UNPAID;
129 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 107 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
130 flags |= F_LOCKED; 108 flags |= F_LOCKED;
131 109
132 return flags; 110 return flags;
133} 111}
134 112
135/* Used in the send_look to put object head into SockList 113/* Used in the send_look to put object head into packet
136 * sl for socket ns. Need socket to know if we need to send 114 * sl for socket ns. Need socket to know if we need to send
137 * animation of face to the client. 115 * animation of face to the client.
138 */ 116 */
139static void 117static void
140add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 118add_object_to_socklist (client &ns, packet &sl, object *head)
141{ 119{
142 int flags, len, anim_speed; 120 int flags, len, anim_speed;
143 char item_n[MAX_BUF]; 121 char item_n[MAX_BUF];
144 const char *item_p; 122 const char *item_p;
145 123
… …
208 SET_FLAG (head, FLAG_CLIENT_SENT); 186 SET_FLAG (head, FLAG_CLIENT_SENT);
209} 187}
210 188
211 189
212/** 190/**
213 * Send the look window. Don't need to do animations here 191 * Send the look window. Don't need to do animations here
214 * This sends all the faces to the client, not just updates. This is 192 * This sends all the faces to the client, not just updates. This is
215 * because object ordering would otherwise be inconsistent 193 * because object ordering would otherwise be inconsistent.
216 */ 194 */
217
218void 195void
219esrv_draw_look (object *pl) 196esrv_draw_look (object *pl)
220{ 197{
221 object *tmp, *last; 198 object *tmp, *last;
222 int got_one = 0, start_look = 0, end_look = 0; 199 int got_one = 0, start_look = 0, end_look = 0;
223 char buf[MAX_BUF]; 200 char buf[MAX_BUF];
224 201
225 if (!pl->contr->socket.update_look) 202 if (!pl->contr->socket->update_look)
226 { 203 {
227 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
228 return; 205 return;
229 } 206 }
230 else 207 else
231 pl->contr->socket.update_look = 0; 208 pl->contr->socket->update_look = 0;
232 209
233 if (QUERY_FLAG (pl, FLAG_REMOVED) 210 if (QUERY_FLAG (pl, FLAG_REMOVED)
234 || !pl->map 211 || !pl->map
235 || pl->map->in_memory != MAP_IN_MEMORY 212 || pl->map->in_memory != MAP_IN_MEMORY
236 || out_of_map (pl->map, pl->x, pl->y)) 213 || out_of_map (pl->map, pl->x, pl->y))
237 return; 214 return;
238 215
239 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above); 216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
217 ;
240 218
241 SockList sl (MAXSOCKBUF); 219 packet sl;
242 220
243 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1); 221 pl->contr->socket->send_packet ("delinv 0");
244 222
245 sl.printf ("item%d ", pl->contr->socket.itemcmd); 223 sl.printf ("item%d ", pl->contr->socket->itemcmd);
246 224
247 sl << uint32 (0); 225 sl << uint32 (0);
248 226
249 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))
250 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 228 esrv_send_face (pl->contr->socket, empty_face->number, 0);
251 229
252 if (pl->contr->socket.look_position) 230 if (pl->contr->socket->look_position)
253 { 231 {
232 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
234
254 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))
255 << uint32 (0) 236 << uint32 (0)
256 << sint32 (-1) 237 << sint32 (-1)
257 << uint32 (empty_face->number); 238 << uint32 (empty_face->number)
258 239 << data8 (buf)
259 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261 sl << uint16 (0) 240 << uint16 (0)
262 << uint8 (0) 241 << uint8 (0)
263 << uint32 (0); 242 << uint32 (0);
264 243
265 if (pl->contr->socket.itemcmd == 2) 244 if (pl->contr->socket->itemcmd == 2)
266 sl << uint16 (0); 245 sl << uint16 (0);
267 } 246 }
268 247
269 for (last = NULL; tmp != last; tmp = tmp->below) 248 for (last = NULL; tmp != last; tmp = tmp->below)
270 { 249 {
… …
277 last = last->below; 256 last = last->below;
278 } 257 }
279 258
280 if (LOOK_OBJ (tmp)) 259 if (LOOK_OBJ (tmp))
281 { 260 {
282 if (++start_look < pl->contr->socket.look_position) 261 if (++start_look < pl->contr->socket->look_position)
283 continue; 262 continue;
284 263
285 end_look++; 264 end_look++;
286 265
287 if (end_look > NUM_LOOK_OBJECTS) 266 if (end_look > NUM_LOOK_OBJECTS)
288 { 267 {
289 /* What we basically do is make a 'fake' object - when the user applies it, 268 /* What we basically do is make a 'fake' object - when the user applies it,
290 * we notice the special tag the object has, and act accordingly. 269 * we notice the special tag the object has, and act accordingly.
291 */ 270 */
292 SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); 271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
293 SockList_AddInt (&sl, 0); 272 << uint32 (0)
294 SockList_AddInt (&sl, (uint32) - 1); 273 << uint32 ((uint32) - 1)
295 SockList_AddInt (&sl, empty_face->number); 274 << uint32 (empty_face->number)
296 sprintf (buf, "Click here to see next group of items"); 275 << data8 ("Apply this to see next group of items")
297 add_stringlen_to_sockbuf (buf, &sl); 276 << uint16 (0)
298 SockList_AddShort (&sl, 0); 277 << uint8 (0)
299 SockList_AddChar (&sl, 0); 278 << uint32 (0);
300 SockList_AddInt (&sl, 0); 279
301 if (pl->contr->socket.itemcmd == 2) 280 if (pl->contr->socket->itemcmd == 2)
302 SockList_AddShort (&sl, 0); 281 sl << uint16 (0);
282
303 break; 283 break;
304 } 284 }
285
305 if (tmp->head) 286 if (tmp->head)
306 head = tmp->head; 287 head = tmp->head;
307 else 288 else
308 head = tmp; 289 head = tmp;
309 290
310 add_object_to_socklist (pl->contr->socket, sl, head); 291 add_object_to_socklist (*pl->contr->socket, sl, head);
311 got_one++; 292 got_one++;
312 293
313 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
314 { 295 {
315 Send_With_Handling (&pl->contr->socket, &sl); 296 pl->contr->socket->send_packet (sl);
297
298 sl.reset ();
316 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 299 sl.printf ("item%d ", pl->contr->socket->itemcmd);
317 sl.len = strlen ((char *) sl.buf); 300 sl << uint32 (0);
318 SockList_AddInt (&sl, 0);
319 got_one = 0; 301 got_one = 0;
320 } 302 }
321 } /* If LOOK_OBJ() */ 303 }
322 } 304 }
323 305
324 if (got_one) 306 if (got_one)
325 Send_With_Handling (&pl->contr->socket, &sl); 307 pl->contr->socket->send_packet (sl);
326 308
327 sl.free ();
328} 309}
329 310
330/** 311/**
331 * Sends whole inventory. 312 * Sends whole inventory.
332 */ 313 */
333void 314void
334esrv_send_inventory (object *pl, object *op) 315esrv_send_inventory (object *pl, object *op)
335{ 316{
336 object *tmp; 317 object *tmp;
337 int got_one = 0; 318 int got_one = 0;
338 SockList sl;
339 319
340 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 320 packet sl;
341 321
342 sprintf ((char *) sl.buf, "delinv %d", op->count); 322 sl.printf ("delinv %d", op->count);
343 sl.len = strlen ((char *) sl.buf); 323 pl->contr->socket->send_packet (sl);
344 Send_With_Handling (&pl->contr->socket, &sl);
345 324
325 sl.reset ();
346 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 326 sl.printf ("item%d ", pl->contr->socket->itemcmd);
347 sl.len = strlen ((char *) sl.buf);
348 327
349 SockList_AddInt (&sl, op->count); 328 sl << uint32 (op->count);
350 329
351 for (tmp = op->inv; tmp; tmp = tmp->below) 330 for (tmp = op->inv; tmp; tmp = tmp->below)
352 { 331 {
353 object *head; 332 object *head;
354 333
… …
357 else 336 else
358 head = tmp; 337 head = tmp;
359 338
360 if (LOOK_OBJ (head)) 339 if (LOOK_OBJ (head))
361 { 340 {
362 add_object_to_socklist (pl->contr->socket, sl, head); 341 add_object_to_socklist (*pl->contr->socket, sl, head);
363 342
364 got_one++; 343 got_one++;
365 344
366 /* IT is possible for players to accumulate a huge amount of 345 /* IT is possible for players to accumulate a huge amount of
367 * items (especially with some of the bags out there) to 346 * items (especially with some of the bags out there) to
368 * overflow the buffer. IF so, send multiple item commands. 347 * overflow the buffer. IF so, send multiple item commands.
369 */ 348 */
370 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
371 { 350 {
372 Send_With_Handling (&pl->contr->socket, &sl); 351 pl->contr->socket->send_packet (sl);
352
353 sl.reset ();
373 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 354 sl.printf ("item%d ", pl->contr->socket->itemcmd);
374 sl.len = strlen ((char *) sl.buf); 355 sl << uint32 (op->count);
375 SockList_AddInt (&sl, op->count);
376 got_one = 0; 356 got_one = 0;
377 } 357 }
378 } /* If LOOK_OBJ() */ 358 } /* If LOOK_OBJ() */
379 } 359 }
360
380 if (got_one) 361 if (got_one)
381 Send_With_Handling (&pl->contr->socket, &sl); 362 pl->contr->socket->send_packet (sl);
382 sl.free ();
383} 363}
384 364
385/** 365/**
386 * Updates object *op for player *pl. 366 * Updates object *op for player *pl.
387 * 367 *
… …
391 */ 371 */
392 372
393void 373void
394esrv_update_item (int flags, object *pl, object *op) 374esrv_update_item (int flags, object *pl, object *op)
395{ 375{
396 SockList sl;
397
398 /* If we have a request to send the player item, skip a few checks. */ 376 /* If we have a request to send the player item, skip a few checks. */
399 if (op != pl) 377 if (op != pl)
400 { 378 {
401 if (!LOOK_OBJ (op)) 379 if (!LOOK_OBJ (op))
402 return; 380 return;
… …
413 * and track back the call. 391 * and track back the call.
414 */ 392 */
415 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
416 } 394 }
417 395
418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 396 packet sl;
419 397
420 strcpy ((char *) sl.buf, "upditem "); 398 sl << "upditem "
421 sl.len = strlen ((char *) sl.buf); 399 << uint8 (flags);
422
423 SockList_AddChar (&sl, (char) flags);
424 400
425 if (op->head) 401 if (op->head)
426 op = op->head; 402 op = op->head;
427 403
428 SockList_AddInt (&sl, op->count); 404 sl << uint32 (op->count);
429 405
430 if (flags & UPD_LOCATION) 406 if (flags & UPD_LOCATION)
431 SockList_AddInt (&sl, op->env ? op->env->count : 0); 407 sl << uint32 (op->env ? op->env->count : 0);
432 408
433 if (flags & UPD_FLAGS) 409 if (flags & UPD_FLAGS)
434 SockList_AddInt (&sl, query_flags (op)); 410 sl << uint32 (query_flags (op));
435 411
436 if (flags & UPD_WEIGHT) 412 if (flags & UPD_WEIGHT)
437 { 413 {
438 sint32 weight = WEIGHT (op); 414 sint32 weight = WEIGHT (op);
439 415
440 SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417
441 if (pl == op) 418 if (pl == op)
442 {
443 op->contr->last_weight = weight; 419 op->contr->last_weight = weight;
444 }
445 } 420 }
446 421
447 if (flags & UPD_FACE) 422 if (flags & UPD_FACE)
448 { 423 {
449 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))
450 esrv_send_face (&pl->contr->socket, op->face->number, 0); 425 esrv_send_face (pl->contr->socket, op->face->number, 0);
451 SockList_AddInt (&sl, op->face->number); 426
427 sl << uint32 (op->face->number);
452 } 428 }
453 429
454 if (flags & UPD_NAME) 430 if (flags & UPD_NAME)
455 { 431 {
456 int len; 432 int len;
… …
473 } 449 }
474 450
475 strncpy (item_n + len + 1, item_p, 127); 451 strncpy (item_n + len + 1, item_p, 127);
476 item_n[254] = 0; 452 item_n[254] = 0;
477 len += strlen (item_n + 1 + len) + 1; 453 len += strlen (item_n + 1 + len) + 1;
478 SockList_AddChar (&sl, (char) len); 454
479 memcpy (sl.buf + sl.len, item_n, len); 455 sl << data8 (item_n, len);
480 sl.len += len;
481 } 456 }
482 457
483 if (flags & UPD_ANIM) 458 if (flags & UPD_ANIM)
484 SockList_AddShort (&sl, op->animation_id); 459 sl << uint16 (op->animation_id);
485 460
486 if (flags & UPD_ANIMSPEED) 461 if (flags & UPD_ANIMSPEED)
487 { 462 {
488 int anim_speed = 0; 463 int anim_speed = 0;
489 464
… …
498 else if (FABS (op->speed) >= 1.0) 473 else if (FABS (op->speed) >= 1.0)
499 anim_speed = 1; 474 anim_speed = 1;
500 else 475 else
501 anim_speed = (int) (1.0 / FABS (op->speed)); 476 anim_speed = (int) (1.0 / FABS (op->speed));
502 } 477 }
478
503 if (anim_speed > 255) 479 if (anim_speed > 255)
504 anim_speed = 255; 480 anim_speed = 255;
505 } 481 }
506 SockList_AddChar (&sl, (char) anim_speed); 482
483 sl << uint8 (anim_speed);
507 } 484 }
485
508 if (flags & UPD_NROF) 486 if (flags & UPD_NROF)
509 SockList_AddInt (&sl, op->nrof); 487 sl << uint32 (op->nrof);
510 488
511 Send_With_Handling (&pl->contr->socket, &sl); 489 pl->contr->socket->send_packet (sl);
512 sl.free ();
513} 490}
514 491
515/** 492/**
516 * Sends item's info to player. 493 * Sends item's info to player.
517 */ 494 */
518void 495void
519esrv_send_item (object *pl, object *op) 496esrv_send_item (object *pl, object *op)
520{ 497{
521 SockList sl;
522
523 /* If this is not the player object, do some more checks */ 498 /* If this is not the player object, do some more checks */
524 if (op != pl) 499 if (op != pl)
525 { 500 {
526 /* We only send 'visibile' objects to the client */ 501 /* We only send 'visibile' objects to the client */
527 if (!LOOK_OBJ (op)) 502 if (!LOOK_OBJ (op))
… …
529 /* if the item is on the ground, mark that the look needs to 504 /* if the item is on the ground, mark that the look needs to
530 * be updated. 505 * be updated.
531 */ 506 */
532 if (!op->env) 507 if (!op->env)
533 { 508 {
534 pl->contr->socket.update_look = 1; 509 pl->contr->socket->update_look = 1;
535 return; 510 return;
536 } 511 }
537 } 512 }
538 513
539 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 514 packet sl;
540 515
541 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 516 sl.printf ("item%d ", pl->contr->socket->itemcmd);
542 sl.len = strlen ((char *) sl.buf);
543 517
544 if (op->head) 518 if (op->head)
545 op = op->head; 519 op = op->head;
546 520
547 SockList_AddInt (&sl, op->env ? op->env->count : 0); 521 sl << uint32 (op->env ? op->env->count : 0);
548 522
549 add_object_to_socklist (pl->contr->socket, sl, op); 523 add_object_to_socklist (*pl->contr->socket, sl, op);
550 524
551 Send_With_Handling (&pl->contr->socket, &sl); 525 pl->contr->socket->send_packet (sl);
552 SET_FLAG (op, FLAG_CLIENT_SENT); 526 SET_FLAG (op, FLAG_CLIENT_SENT);
553
554 sl.free ();
555} 527}
556 528
557/** 529/**
558 * Tells the client to delete an item. Uses the item 530 * Tells the client to delete an item. Uses the item
559 * command with a -1 location. 531 * command with a -1 location.
560 */ 532 */
561 533
562void 534void
563esrv_del_item (player *pl, int tag) 535esrv_del_item (player *pl, int tag)
564{ 536{
565 SockList sl; 537 packet sl;
566 538
567 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 539 sl << "delitem "
540 << uint32 (tag);
568 541
569 strcpy ((char *) sl.buf, "delitem "); 542 pl->socket->send_packet (sl);
570 sl.len = strlen ((char *) sl.buf);
571 SockList_AddInt (&sl, tag);
572
573 Send_With_Handling (&pl->socket, &sl);
574 sl.free ();
575} 543}
576 544
577 545
578/******************************************************************************* 546/*******************************************************************************
579 * 547 *
… …
601 for (tmp = op->inv; tmp; tmp = tmp->below) 569 for (tmp = op->inv; tmp; tmp = tmp->below)
602 if (tmp->count == count) 570 if (tmp->count == count)
603 return tmp; 571 return tmp;
604 572
605 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 573 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
606 if (op->head != NULL && op->head->count == count) 574 if (op->head && op->head->count == count)
607 return op; 575 return op;
608 else if (op->count == count) 576 else if (op->count == count)
609 return op; 577 return op;
610 else if (op->type == CONTAINER && pl->container == op) 578 else if (op->type == CONTAINER && pl->container == op)
611 for (tmp = op->inv; tmp; tmp = tmp->below) 579 for (tmp = op->inv; tmp; tmp = tmp->below)
612 if (tmp->count == count) 580 if (tmp->count == count)
613 return tmp; 581 return tmp;
614 582
615 return NULL; 583 return 0;
616} 584}
617 585
618 586
619/** Client wants to examine some object. So lets do so. */ 587/** Client wants to examine some object. So lets do so. */
620void 588void
… …
635 } 603 }
636 604
637 examine (pl->ob, op); 605 examine (pl->ob, op);
638} 606}
639 607
640/** Client wants to apply some object. Lets do so. */ 608/** Client wants to apply some object. Lets do so. */
641void 609void
642ApplyCmd (char *buf, int len, player *pl) 610ApplyCmd (char *buf, int len, player *pl)
643{ 611{
644 tag_t tag = atoi (buf); 612 tag_t tag = atoi (buf);
645 613
… …
650 return; 618 return;
651 619
652 /* If the high bit is set, player applied a pseudo object. */ 620 /* If the high bit is set, player applied a pseudo object. */
653 if (tag & 0x80000000) 621 if (tag & 0x80000000)
654 { 622 {
655 pl->socket.look_position = tag & 0x7fffffff; 623 pl->socket->look_position = tag & 0x7fffffff;
656 pl->socket.update_look = 1; 624 pl->socket->update_look = 1;
657 return; 625 return;
658 } 626 }
659 627
660 object *op = esrv_get_ob_from_count (pl->ob, tag); 628 object *op = esrv_get_ob_from_count (pl->ob, tag);
661 629
… …
668 player_apply (pl->ob, op, 0, 0); 636 player_apply (pl->ob, op, 0, 0);
669} 637}
670 638
671/** Client wants to apply some object. Lets do so. */ 639/** Client wants to apply some object. Lets do so. */
672void 640void
673LockItem (uint8 *data, int len, player *pl) 641LockItem (char *data, int len, player *pl)
674{ 642{
675 int flag = data[0]; 643 int flag = data[0];
676 tag_t tag = net_uint32 (data + 1); 644 tag_t tag = net_uint32 ((uint8 *)data + 1);
677 object *op = esrv_get_ob_from_count (pl->ob, tag); 645 object *op = esrv_get_ob_from_count (pl->ob, tag);
678 646
679 if (!op) 647 if (!op)
680 { 648 {
681 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 649 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
690 esrv_update_item (UPD_FLAGS, pl->ob, op); 658 esrv_update_item (UPD_FLAGS, pl->ob, op);
691} 659}
692 660
693/** Client wants to apply some object. Lets do so. */ 661/** Client wants to apply some object. Lets do so. */
694void 662void
695MarkItem (uint8 * data, int len, player *pl) 663MarkItem (char *data, int len, player *pl)
696{ 664{
697 tag_t tag = net_uint32 (data); 665 tag_t tag = net_uint32 ((uint8 *)data);
698 object *op = esrv_get_ob_from_count (pl->ob, tag); 666 object *op = esrv_get_ob_from_count (pl->ob, tag);
699 667
700 if (!op) 668 if (!op)
701 { 669 {
702 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 670 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
786 { 754 {
787 return; 755 return;
788 } 756 }
789 dy = atoi (cp); 757 dy = atoi (cp);
790 758
791 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 759 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
792 return; 760 return;
793 761
794 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 762 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
795 return; 763 return;
796 764
797 look_at (pl->ob, dx, dy); 765 look_at (pl->ob, dx, dy);
798} 766}
799 767
… …
810 return; 778 return;
811 } 779 }
812 780
813 if (!to) 781 if (!to)
814 { /* drop it to the ground */ 782 { /* drop it to the ground */
815
816/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818 if (op->map && !op->env) 783 if (op->map && !op->env)
819 {
820
821/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822 return; 784 return;
823 } 785
824 /* If it is an active container, then we should drop all objects 786 /* If it is an active container, then we should drop all objects
825 * in the container and not the container itself. 787 * in the container and not the container itself.
826 */ 788 */
827 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 789 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828 { 790 {
… …
831 for (current = op->inv; current != NULL; current = next) 793 for (current = op->inv; current != NULL; current = next)
832 { 794 {
833 next = current->below; 795 next = current->below;
834 drop_object (pl, current, 0); 796 drop_object (pl, current, 0);
835 } 797 }
798
836 esrv_update_item (UPD_WEIGHT, pl, op); 799 esrv_update_item (UPD_WEIGHT, pl, op);
837 } 800 }
838 else 801 else
839 {
840 drop_object (pl, op, nrof); 802 drop_object (pl, op, nrof);
841 } 803
842 return; 804 return;
843 } 805 }
844 else if (to == pl->count) 806 else if (to == pl->count)
845 { /* pick it up to the inventory */ 807 { /* pick it up to the inventory */
846 /* return if player has already picked it up */ 808 /* return if player has already picked it up */
… …
849 811
850 pl->contr->count = nrof; 812 pl->contr->count = nrof;
851 pick_up (pl, op); 813 pick_up (pl, op);
852 return; 814 return;
853 } 815 }
816
854 env = esrv_get_ob_from_count (pl, to); 817 env = esrv_get_ob_from_count (pl, to);
855 if (!env) 818 if (!env)
856 { 819 {
857 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 820 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858 return; 821 return;
859 } 822 }
823
860 /* put_object_in_sack presumes that necessary sanity checking 824 /* put_object_in_sack presumes that necessary sanity checking
861 * has already been done (eg, it can be picked up and fits in 825 * has already been done (eg, it can be picked up and fits in
862 * in a sack, so check for those things. We should also check 826 * in a sack, so check for those things. We should also check
863 * an make sure env is in fact a container for that matter. 827 * an make sure env is in fact a container for that matter.
864 */ 828 */
865 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 829 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
866 {
867 put_object_in_sack (pl, env, op, nrof); 830 put_object_in_sack (pl, env, op, nrof);
868 }
869} 831}
832

Diff Legend

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