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.27 by root, Wed Dec 20 01:19:11 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 pl->contr->socket->send_packet ("delinv 0");
242 220
243 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1); 221 packet sl;
244
245 sl.printf ("item%d ", pl->contr->socket.itemcmd); 222 sl.printf ("item%d ", pl->contr->socket->itemcmd);
246 223
247 sl << uint32 (0); 224 sl << uint32 (0);
248 225
249 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 226 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))
250 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 227 esrv_send_face (pl->contr->socket, empty_face->number, 0);
251 228
252 if (pl->contr->socket.look_position) 229 if (pl->contr->socket->look_position)
253 { 230 {
231 char buf[80];
232 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
233
254 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE))
255 << uint32 (0) 235 << uint32 (0)
256 << sint32 (-1) 236 << sint32 (-1)
257 << uint32 (empty_face->number); 237 << uint32 (empty_face->number)
258 238 << data8 (buf)
259 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261 sl << uint16 (0) 239 << uint16 (0)
262 << uint8 (0) 240 << uint8 (0)
263 << uint32 (0); 241 << uint32 (0);
264 242
265 if (pl->contr->socket.itemcmd == 2) 243 if (pl->contr->socket->itemcmd == 2)
266 sl << uint16 (0); 244 sl << uint16 (0);
267 } 245 }
268 246
269 for (last = NULL; tmp != last; tmp = tmp->below) 247 for (last = NULL; tmp != last; tmp = tmp->below)
270 { 248 {
… …
277 last = last->below; 255 last = last->below;
278 } 256 }
279 257
280 if (LOOK_OBJ (tmp)) 258 if (LOOK_OBJ (tmp))
281 { 259 {
282 if (++start_look < pl->contr->socket.look_position) 260 if (++start_look < pl->contr->socket->look_position)
283 continue; 261 continue;
284 262
285 end_look++; 263 end_look++;
286 264
287 if (end_look > NUM_LOOK_OBJECTS) 265 if (end_look > FLOORBOX_PAGESIZE)
288 { 266 {
289 /* What we basically do is make a 'fake' object - when the user applies it, 267 /* 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. 268 * we notice the special tag the object has, and act accordingly.
291 */ 269 */
292 SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); 270 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE))
293 SockList_AddInt (&sl, 0); 271 << uint32 (0)
294 SockList_AddInt (&sl, (uint32) - 1); 272 << uint32 ((uint32) - 1)
295 SockList_AddInt (&sl, empty_face->number); 273 << uint32 (empty_face->number)
296 sprintf (buf, "Click here to see next group of items"); 274 << data8 ("Apply this to see next group of items")
297 add_stringlen_to_sockbuf (buf, &sl); 275 << uint16 (0)
298 SockList_AddShort (&sl, 0); 276 << uint8 (0)
299 SockList_AddChar (&sl, 0); 277 << uint32 (0);
300 SockList_AddInt (&sl, 0); 278
301 if (pl->contr->socket.itemcmd == 2) 279 if (pl->contr->socket->itemcmd == 2)
302 SockList_AddShort (&sl, 0); 280 sl << uint16 (0);
281
303 break; 282 break;
304 } 283 }
284
305 if (tmp->head) 285 if (tmp->head)
306 head = tmp->head; 286 head = tmp->head;
307 else 287 else
308 head = tmp; 288 head = tmp;
309 289
310 add_object_to_socklist (pl->contr->socket, sl, head); 290 add_object_to_socklist (*pl->contr->socket, sl, head);
311 got_one++; 291 got_one++;
312 292
313 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 293 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
314 { 294 {
315 Send_With_Handling (&pl->contr->socket, &sl); 295 pl->contr->socket->send_packet (sl);
296
297 sl.reset ();
316 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 298 sl.printf ("item%d ", pl->contr->socket->itemcmd);
317 sl.len = strlen ((char *) sl.buf); 299 sl << uint32 (0);
318 SockList_AddInt (&sl, 0);
319 got_one = 0; 300 got_one = 0;
320 } 301 }
321 } /* If LOOK_OBJ() */ 302 }
322 } 303 }
323 304
324 if (got_one) 305 if (got_one)
325 Send_With_Handling (&pl->contr->socket, &sl); 306 pl->contr->socket->send_packet (sl);
326 307
327 sl.free ();
328} 308}
329 309
330/** 310/**
331 * Sends whole inventory. 311 * Sends whole inventory.
332 */ 312 */
333void 313void
334esrv_send_inventory (object *pl, object *op) 314esrv_send_inventory (object *pl, object *op)
335{ 315{
336 object *tmp; 316 object *tmp;
337 int got_one = 0; 317 int got_one = 0;
338 SockList sl;
339 318
340 sl.buf = (unsigned char *) malloc (MAXSOCKBUF);
341 319
342 sprintf ((char *) sl.buf, "delinv %d", op->count); 320 pl->contr->socket->send_packet_printf ("delinv %d", op->count);
343 sl.len = strlen ((char *) sl.buf);
344 Send_With_Handling (&pl->contr->socket, &sl);
345 321
322 packet sl;
346 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 323 sl.printf ("item%d ", pl->contr->socket->itemcmd);
347 sl.len = strlen ((char *) sl.buf);
348 324
349 SockList_AddInt (&sl, op->count); 325 sl << uint32 (op->count);
350 326
351 for (tmp = op->inv; tmp; tmp = tmp->below) 327 for (tmp = op->inv; tmp; tmp = tmp->below)
352 { 328 {
353 object *head; 329 object *head;
354 330
… …
357 else 333 else
358 head = tmp; 334 head = tmp;
359 335
360 if (LOOK_OBJ (head)) 336 if (LOOK_OBJ (head))
361 { 337 {
362 add_object_to_socklist (pl->contr->socket, sl, head); 338 add_object_to_socklist (*pl->contr->socket, sl, head);
363 339
364 got_one++; 340 got_one++;
365 341
366 /* IT is possible for players to accumulate a huge amount of 342 /* IT is possible for players to accumulate a huge amount of
367 * items (especially with some of the bags out there) to 343 * items (especially with some of the bags out there) to
368 * overflow the buffer. IF so, send multiple item commands. 344 * overflow the buffer. IF so, send multiple item commands.
369 */ 345 */
370 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 346 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
371 { 347 {
372 Send_With_Handling (&pl->contr->socket, &sl); 348 pl->contr->socket->send_packet (sl);
349
350 sl.reset ();
373 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 351 sl.printf ("item%d ", pl->contr->socket->itemcmd);
374 sl.len = strlen ((char *) sl.buf); 352 sl << uint32 (op->count);
375 SockList_AddInt (&sl, op->count);
376 got_one = 0; 353 got_one = 0;
377 } 354 }
378 } /* If LOOK_OBJ() */ 355 } /* If LOOK_OBJ() */
379 } 356 }
357
380 if (got_one) 358 if (got_one)
381 Send_With_Handling (&pl->contr->socket, &sl); 359 pl->contr->socket->send_packet (sl);
382 sl.free ();
383} 360}
384 361
385/** 362/**
386 * Updates object *op for player *pl. 363 * Updates object *op for player *pl.
387 * 364 *
… …
391 */ 368 */
392 369
393void 370void
394esrv_update_item (int flags, object *pl, object *op) 371esrv_update_item (int flags, object *pl, object *op)
395{ 372{
396 SockList sl;
397
398 /* If we have a request to send the player item, skip a few checks. */ 373 /* If we have a request to send the player item, skip a few checks. */
399 if (op != pl) 374 if (op != pl)
400 { 375 {
401 if (!LOOK_OBJ (op)) 376 if (!LOOK_OBJ (op))
402 return; 377 return;
… …
413 * and track back the call. 388 * and track back the call.
414 */ 389 */
415 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 390 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
416 } 391 }
417 392
418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 393 packet sl ("upditem");
419 394
420 strcpy ((char *) sl.buf, "upditem "); 395 sl << uint8 (flags);
421 sl.len = strlen ((char *) sl.buf);
422
423 SockList_AddChar (&sl, (char) flags);
424 396
425 if (op->head) 397 if (op->head)
426 op = op->head; 398 op = op->head;
427 399
428 SockList_AddInt (&sl, op->count); 400 sl << uint32 (op->count);
429 401
430 if (flags & UPD_LOCATION) 402 if (flags & UPD_LOCATION)
431 SockList_AddInt (&sl, op->env ? op->env->count : 0); 403 sl << uint32 (op->env ? op->env->count : 0);
432 404
433 if (flags & UPD_FLAGS) 405 if (flags & UPD_FLAGS)
434 SockList_AddInt (&sl, query_flags (op)); 406 sl << uint32 (query_flags (op));
435 407
436 if (flags & UPD_WEIGHT) 408 if (flags & UPD_WEIGHT)
437 { 409 {
438 sint32 weight = WEIGHT (op); 410 sint32 weight = WEIGHT (op);
439 411
440 SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 412 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
413
441 if (pl == op) 414 if (pl == op)
442 {
443 op->contr->last_weight = weight; 415 op->contr->last_weight = weight;
444 }
445 } 416 }
446 417
447 if (flags & UPD_FACE) 418 if (flags & UPD_FACE)
448 { 419 {
449 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 420 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))
450 esrv_send_face (&pl->contr->socket, op->face->number, 0); 421 esrv_send_face (pl->contr->socket, op->face->number, 0);
451 SockList_AddInt (&sl, op->face->number); 422
423 sl << uint32 (op->face->number);
452 } 424 }
453 425
454 if (flags & UPD_NAME) 426 if (flags & UPD_NAME)
455 { 427 {
456 int len; 428 int len;
… …
473 } 445 }
474 446
475 strncpy (item_n + len + 1, item_p, 127); 447 strncpy (item_n + len + 1, item_p, 127);
476 item_n[254] = 0; 448 item_n[254] = 0;
477 len += strlen (item_n + 1 + len) + 1; 449 len += strlen (item_n + 1 + len) + 1;
478 SockList_AddChar (&sl, (char) len); 450
479 memcpy (sl.buf + sl.len, item_n, len); 451 sl << data8 (item_n, len);
480 sl.len += len;
481 } 452 }
482 453
483 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
484 SockList_AddShort (&sl, op->animation_id); 455 sl << uint16 (op->animation_id);
485 456
486 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
487 { 458 {
488 int anim_speed = 0; 459 int anim_speed = 0;
489 460
… …
498 else if (FABS (op->speed) >= 1.0) 469 else if (FABS (op->speed) >= 1.0)
499 anim_speed = 1; 470 anim_speed = 1;
500 else 471 else
501 anim_speed = (int) (1.0 / FABS (op->speed)); 472 anim_speed = (int) (1.0 / FABS (op->speed));
502 } 473 }
474
503 if (anim_speed > 255) 475 if (anim_speed > 255)
504 anim_speed = 255; 476 anim_speed = 255;
505 } 477 }
506 SockList_AddChar (&sl, (char) anim_speed); 478
479 sl << uint8 (anim_speed);
507 } 480 }
481
508 if (flags & UPD_NROF) 482 if (flags & UPD_NROF)
509 SockList_AddInt (&sl, op->nrof); 483 sl << uint32 (op->nrof);
510 484
511 Send_With_Handling (&pl->contr->socket, &sl); 485 pl->contr->socket->send_packet (sl);
512 sl.free ();
513} 486}
514 487
515/** 488/**
516 * Sends item's info to player. 489 * Sends item's info to player.
517 */ 490 */
518void 491void
519esrv_send_item (object *pl, object *op) 492esrv_send_item (object *pl, object *op)
520{ 493{
521 SockList sl;
522
523 /* If this is not the player object, do some more checks */ 494 /* If this is not the player object, do some more checks */
524 if (op != pl) 495 if (op != pl)
525 { 496 {
526 /* We only send 'visibile' objects to the client */ 497 /* We only send 'visibile' objects to the client */
527 if (!LOOK_OBJ (op)) 498 if (!LOOK_OBJ (op))
… …
529 /* if the item is on the ground, mark that the look needs to 500 /* if the item is on the ground, mark that the look needs to
530 * be updated. 501 * be updated.
531 */ 502 */
532 if (!op->env) 503 if (!op->env)
533 { 504 {
534 pl->contr->socket.update_look = 1; 505 pl->contr->socket->floorbox_update ();
535 return; 506 return;
536 } 507 }
537 } 508 }
538 509
539 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 510 packet sl;
540 511
541 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 512 sl.printf ("item%d ", pl->contr->socket->itemcmd);
542 sl.len = strlen ((char *) sl.buf);
543 513
544 if (op->head) 514 if (op->head)
545 op = op->head; 515 op = op->head;
546 516
547 SockList_AddInt (&sl, op->env ? op->env->count : 0); 517 sl << uint32 (op->env ? op->env->count : 0);
548 518
549 add_object_to_socklist (pl->contr->socket, sl, op); 519 add_object_to_socklist (*pl->contr->socket, sl, op);
550 520
551 Send_With_Handling (&pl->contr->socket, &sl); 521 pl->contr->socket->send_packet (sl);
552 SET_FLAG (op, FLAG_CLIENT_SENT); 522 SET_FLAG (op, FLAG_CLIENT_SENT);
553
554 sl.free ();
555} 523}
556 524
557/** 525/**
558 * Tells the client to delete an item. Uses the item 526 * Tells the client to delete an item. Uses the item
559 * command with a -1 location. 527 * command with a -1 location.
560 */ 528 */
561 529
562void 530void
563esrv_del_item (player *pl, int tag) 531esrv_del_item (player *pl, int tag)
564{ 532{
565 SockList sl; 533 packet sl ("delitem");
566 534
567 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 535 sl << uint32 (tag);
568 536
569 strcpy ((char *) sl.buf, "delitem "); 537 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} 538}
576 539
577 540
578/******************************************************************************* 541/*******************************************************************************
579 * 542 *
… …
601 for (tmp = op->inv; tmp; tmp = tmp->below) 564 for (tmp = op->inv; tmp; tmp = tmp->below)
602 if (tmp->count == count) 565 if (tmp->count == count)
603 return tmp; 566 return tmp;
604 567
605 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 568 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above)
606 if (op->head != NULL && op->head->count == count) 569 if (op->head && op->head->count == count)
607 return op; 570 return op;
608 else if (op->count == count) 571 else if (op->count == count)
609 return op; 572 return op;
610 else if (op->type == CONTAINER && pl->container == op) 573 else if (op->type == CONTAINER && pl->container == op)
611 for (tmp = op->inv; tmp; tmp = tmp->below) 574 for (tmp = op->inv; tmp; tmp = tmp->below)
612 if (tmp->count == count) 575 if (tmp->count == count)
613 return tmp; 576 return tmp;
614 577
615 return NULL; 578 return 0;
616} 579}
617 580
618 581
619/** Client wants to examine some object. So lets do so. */ 582/** Client wants to examine some object. So lets do so. */
620void 583void
… …
635 } 598 }
636 599
637 examine (pl->ob, op); 600 examine (pl->ob, op);
638} 601}
639 602
640/** Client wants to apply some object. Lets do so. */ 603/** Client wants to apply some object. Lets do so. */
641void 604void
642ApplyCmd (char *buf, int len, player *pl) 605ApplyCmd (char *buf, int len, player *pl)
643{ 606{
644 tag_t tag = atoi (buf); 607 tag_t tag = atoi (buf);
645 608
… …
650 return; 613 return;
651 614
652 /* If the high bit is set, player applied a pseudo object. */ 615 /* If the high bit is set, player applied a pseudo object. */
653 if (tag & 0x80000000) 616 if (tag & 0x80000000)
654 { 617 {
655 pl->socket.look_position = tag & 0x7fffffff; 618 pl->socket->look_position = tag & 0x7fffffff;
656 pl->socket.update_look = 1; 619 pl->socket->floorbox_update ();
657 return; 620 return;
658 } 621 }
659 622
660 object *op = esrv_get_ob_from_count (pl->ob, tag); 623 object *op = esrv_get_ob_from_count (pl->ob, tag);
661 624
… …
666 } 629 }
667 630
668 player_apply (pl->ob, op, 0, 0); 631 player_apply (pl->ob, op, 0, 0);
669} 632}
670 633
671/** Client wants to apply some object. Lets do so. */ 634/** Client wants to lock some object. Lets do so. */
672void 635void
673LockItem (uint8 *data, int len, player *pl) 636LockItem (char *data, int len, player *pl)
674{ 637{
675 int flag = data[0]; 638 int flag = data[0];
676 tag_t tag = net_uint32 (data + 1); 639 tag_t tag = net_uint32 ((uint8 *)data + 1);
677 object *op = esrv_get_ob_from_count (pl->ob, tag); 640 object *op = esrv_get_ob_from_count (pl->ob, tag);
678 641
679 if (!op) 642 if (!op)
680 { 643 {
681 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 644 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
688 SET_FLAG (op, FLAG_INV_LOCKED); 651 SET_FLAG (op, FLAG_INV_LOCKED);
689 652
690 esrv_update_item (UPD_FLAGS, pl->ob, op); 653 esrv_update_item (UPD_FLAGS, pl->ob, op);
691} 654}
692 655
693/** Client wants to apply some object. Lets do so. */ 656/** Client wants to mark some object. Lets do so. */
694void 657void
695MarkItem (uint8 * data, int len, player *pl) 658MarkItem (char *data, int len, player *pl)
696{ 659{
697 tag_t tag = net_uint32 (data); 660 tag_t tag = net_uint32 ((uint8 *)data);
698 object *op = esrv_get_ob_from_count (pl->ob, tag); 661 object *op = esrv_get_ob_from_count (pl->ob, tag);
699 662
700 if (!op) 663 if (!op)
701 { 664 {
702 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 665 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
786 { 749 {
787 return; 750 return;
788 } 751 }
789 dy = atoi (cp); 752 dy = atoi (cp);
790 753
791 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 754 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
792 return; 755 return;
793 756
794 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 757 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
795 return; 758 return;
796 759
797 look_at (pl->ob, dx, dy); 760 look_at (pl->ob, dx, dy);
798} 761}
799 762
… …
810 return; 773 return;
811 } 774 }
812 775
813 if (!to) 776 if (!to)
814 { /* drop it to the ground */ 777 { /* drop it to the ground */
815
816/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818 if (op->map && !op->env) 778 if (op->map && !op->env)
819 {
820
821/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822 return; 779 return;
823 } 780
824 /* If it is an active container, then we should drop all objects 781 /* If it is an active container, then we should drop all objects
825 * in the container and not the container itself. 782 * in the container and not the container itself.
826 */ 783 */
827 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 784 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828 { 785 {
… …
831 for (current = op->inv; current != NULL; current = next) 788 for (current = op->inv; current != NULL; current = next)
832 { 789 {
833 next = current->below; 790 next = current->below;
834 drop_object (pl, current, 0); 791 drop_object (pl, current, 0);
835 } 792 }
793
836 esrv_update_item (UPD_WEIGHT, pl, op); 794 esrv_update_item (UPD_WEIGHT, pl, op);
837 } 795 }
838 else 796 else
839 {
840 drop_object (pl, op, nrof); 797 drop_object (pl, op, nrof);
841 } 798
842 return; 799 return;
843 } 800 }
844 else if (to == pl->count) 801 else if (to == pl->count)
845 { /* pick it up to the inventory */ 802 { /* pick it up to the inventory */
846 /* return if player has already picked it up */ 803 /* return if player has already picked it up */
… …
849 806
850 pl->contr->count = nrof; 807 pl->contr->count = nrof;
851 pick_up (pl, op); 808 pick_up (pl, op);
852 return; 809 return;
853 } 810 }
811
854 env = esrv_get_ob_from_count (pl, to); 812 env = esrv_get_ob_from_count (pl, to);
855 if (!env) 813 if (!env)
856 { 814 {
857 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 815 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858 return; 816 return;
859 } 817 }
818
860 /* put_object_in_sack presumes that necessary sanity checking 819 /* put_object_in_sack presumes that necessary sanity checking
861 * has already been done (eg, it can be picked up and fits in 820 * 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 821 * 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. 822 * an make sure env is in fact a container for that matter.
864 */ 823 */
865 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 824 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); 825 put_object_in_sack (pl, env, op, nrof);
868 }
869} 826}
827

Diff Legend

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