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.15 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.20 by root, Thu Dec 14 20:39:54 2006 UTC

… …
109 flags |= F_LOCKED; 109 flags |= F_LOCKED;
110 110
111 return flags; 111 return flags;
112} 112}
113 113
114/* Used in the send_look to put object head into SockList 114/* 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 115 * sl for socket ns. Need socket to know if we need to send
116 * animation of face to the client. 116 * animation of face to the client.
117 */ 117 */
118static void 118static void
119add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 119add_object_to_socklist (client_socket &ns, packet &sl, object *head)
120{ 120{
121 int flags, len, anim_speed; 121 int flags, len, anim_speed;
122 char item_n[MAX_BUF]; 122 char item_n[MAX_BUF];
123 const char *item_p; 123 const char *item_p;
124 124
… …
199{ 199{
200 object *tmp, *last; 200 object *tmp, *last;
201 int got_one = 0, start_look = 0, end_look = 0; 201 int got_one = 0, start_look = 0, end_look = 0;
202 char buf[MAX_BUF]; 202 char buf[MAX_BUF];
203 203
204 if (!pl->contr->socket.update_look) 204 if (!pl->contr->socket->update_look)
205 { 205 {
206 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 206 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
207 return; 207 return;
208 } 208 }
209 else 209 else
210 pl->contr->socket.update_look = 0; 210 pl->contr->socket->update_look = 0;
211 211
212 if (QUERY_FLAG (pl, FLAG_REMOVED) 212 if (QUERY_FLAG (pl, FLAG_REMOVED)
213 || !pl->map 213 || !pl->map
214 || pl->map->in_memory != MAP_IN_MEMORY 214 || pl->map->in_memory != MAP_IN_MEMORY
215 || out_of_map (pl->map, pl->x, pl->y)) 215 || out_of_map (pl->map, pl->x, pl->y))
216 return; 216 return;
217 217
218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
219 ; 219 ;
220 220
221 SockList sl (MAXSOCKBUF); 221 packet sl;
222 222
223 pl->contr->socket.send_packet ("delinv 0"); 223 pl->contr->socket->send_packet ("delinv 0");
224 224
225 sl.printf ("item%d ", pl->contr->socket.itemcmd); 225 sl.printf ("item%d ", pl->contr->socket->itemcmd);
226 226
227 sl << uint32 (0); 227 sl << uint32 (0);
228 228
229 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 229 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE))
230 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 230 esrv_send_face (pl->contr->socket, empty_face->number, 0);
231 231
232 if (pl->contr->socket.look_position) 232 if (pl->contr->socket->look_position)
233 { 233 {
234 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS))
235 << uint32 (0) 235 << uint32 (0)
236 << sint32 (-1) 236 << sint32 (-1)
237 << uint32 (empty_face->number); 237 << uint32 (empty_face->number);
238 238
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS); 239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240 240
241 sl << uint16 (0) 241 sl << uint16 (0)
242 << uint8 (0) 242 << uint8 (0)
243 << uint32 (0); 243 << uint32 (0);
244 244
245 if (pl->contr->socket.itemcmd == 2) 245 if (pl->contr->socket->itemcmd == 2)
246 sl << uint16 (0); 246 sl << uint16 (0);
247 } 247 }
248 248
249 for (last = NULL; tmp != last; tmp = tmp->below) 249 for (last = NULL; tmp != last; tmp = tmp->below)
250 { 250 {
… …
257 last = last->below; 257 last = last->below;
258 } 258 }
259 259
260 if (LOOK_OBJ (tmp)) 260 if (LOOK_OBJ (tmp))
261 { 261 {
262 if (++start_look < pl->contr->socket.look_position) 262 if (++start_look < pl->contr->socket->look_position)
263 continue; 263 continue;
264 264
265 end_look++; 265 end_look++;
266 266
267 if (end_look > NUM_LOOK_OBJECTS) 267 if (end_look > NUM_LOOK_OBJECTS)
268 { 268 {
269 /* What we basically do is make a 'fake' object - when the user applies it, 269 /* 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. 270 * we notice the special tag the object has, and act accordingly.
271 */ 271 */
272 sl << uint32 (0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)) 272 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
273 << uint32 (0) 273 << uint32 (0)
274 << uint32 ((uint32) - 1) 274 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number); 275 << uint32 (empty_face->number);
276 276
277 sl.printf ("Click here to see next group of items"); 277 sl.printf ("Click here to see next group of items");
278 278
279 sl << uint16 (0) 279 sl << uint16 (0)
280 << uint8 (0) 280 << uint8 (0)
281 << uint32 (0); 281 << uint32 (0);
282 282
283 if (pl->contr->socket.itemcmd == 2) 283 if (pl->contr->socket->itemcmd == 2)
284 sl << uint16 (0); 284 sl << uint16 (0);
285 285
286 break; 286 break;
287 } 287 }
288 288
289 if (tmp->head) 289 if (tmp->head)
290 head = tmp->head; 290 head = tmp->head;
291 else 291 else
292 head = tmp; 292 head = tmp;
293 293
294 add_object_to_socklist (pl->contr->socket, sl, head); 294 add_object_to_socklist (*pl->contr->socket, sl, head);
295 got_one++; 295 got_one++;
296 296
297 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 297 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 { 298 {
299 Send_With_Handling (&pl->contr->socket, &sl); 299 pl->contr->socket->send_packet (sl);
300 300
301 sl.reset (); 301 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket.itemcmd); 302 sl.printf ("item%d ", pl->contr->socket->itemcmd);
303 sl << uint32 (0); 303 sl << uint32 (0);
304 got_one = 0; 304 got_one = 0;
305 } 305 }
306 } /* If LOOK_OBJ() */ 306 } /* If LOOK_OBJ() */
307 } 307 }
308 308
309 if (got_one) 309 if (got_one)
310 Send_With_Handling (&pl->contr->socket, &sl); 310 pl->contr->socket->send_packet (sl);
311 311
312 sl.free ();
313} 312}
314 313
315/** 314/**
316 * Sends whole inventory. 315 * Sends whole inventory.
317 */ 316 */
… …
319esrv_send_inventory (object *pl, object *op) 318esrv_send_inventory (object *pl, object *op)
320{ 319{
321 object *tmp; 320 object *tmp;
322 int got_one = 0; 321 int got_one = 0;
323 322
324 SockList sl (MAXSOCKBUF); 323 packet sl;
325 324
326 sl.printf ("delinv %d", op->count); 325 sl.printf ("delinv %d", op->count);
327 Send_With_Handling (&pl->contr->socket, &sl); 326 pl->contr->socket->send_packet (sl);
328 327
329 sl.reset (); 328 sl.reset ();
330 sl.printf ("item%d ", pl->contr->socket.itemcmd); 329 sl.printf ("item%d ", pl->contr->socket->itemcmd);
331 330
332 sl << uint32 (op->count); 331 sl << uint32 (op->count);
333 332
334 for (tmp = op->inv; tmp; tmp = tmp->below) 333 for (tmp = op->inv; tmp; tmp = tmp->below)
335 { 334 {
… …
340 else 339 else
341 head = tmp; 340 head = tmp;
342 341
343 if (LOOK_OBJ (head)) 342 if (LOOK_OBJ (head))
344 { 343 {
345 add_object_to_socklist (pl->contr->socket, sl, head); 344 add_object_to_socklist (*pl->contr->socket, sl, head);
346 345
347 got_one++; 346 got_one++;
348 347
349 /* IT is possible for players to accumulate a huge amount of 348 /* IT is possible for players to accumulate a huge amount of
350 * items (especially with some of the bags out there) to 349 * items (especially with some of the bags out there) to
351 * overflow the buffer. IF so, send multiple item commands. 350 * overflow the buffer. IF so, send multiple item commands.
352 */ 351 */
353 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 352 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
354 { 353 {
355 Send_With_Handling (&pl->contr->socket, &sl); 354 pl->contr->socket->send_packet (sl);
355
356 sl.reset ();
356 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 357 sl.printf ("item%d ", pl->contr->socket->itemcmd);
357 sl.len = strlen ((char *) sl.buf);
358 sl << uint32 (op->count); 358 sl << uint32 (op->count);
359 got_one = 0; 359 got_one = 0;
360 } 360 }
361 } /* If LOOK_OBJ() */ 361 } /* If LOOK_OBJ() */
362 } 362 }
363 363
364 if (got_one) 364 if (got_one)
365 Send_With_Handling (&pl->contr->socket, &sl); 365 pl->contr->socket->send_packet (sl);
366 366
367 sl.free ();
368} 367}
369 368
370/** 369/**
371 * Updates object *op for player *pl. 370 * Updates object *op for player *pl.
372 * 371 *
… …
396 * and track back the call. 395 * and track back the call.
397 */ 396 */
398 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 397 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
399 } 398 }
400 399
401 SockList sl (MAXSOCKBUF); 400 packet sl;
402 401
403 sl << "upditem " 402 sl << "upditem "
404 << uint8 (flags); 403 << uint8 (flags);
405 404
406 if (op->head) 405 if (op->head)
… …
424 op->contr->last_weight = weight; 423 op->contr->last_weight = weight;
425 } 424 }
426 425
427 if (flags & UPD_FACE) 426 if (flags & UPD_FACE)
428 { 427 {
429 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 428 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE))
430 esrv_send_face (&pl->contr->socket, op->face->number, 0); 429 esrv_send_face (pl->contr->socket, op->face->number, 0);
431 430
432 sl << uint32 (op->face->number); 431 sl << uint32 (op->face->number);
433 } 432 }
434 433
435 if (flags & UPD_NAME) 434 if (flags & UPD_NAME)
… …
489 } 488 }
490 489
491 if (flags & UPD_NROF) 490 if (flags & UPD_NROF)
492 sl << uint32 (op->nrof); 491 sl << uint32 (op->nrof);
493 492
494 Send_With_Handling (&pl->contr->socket, &sl); 493 pl->contr->socket->send_packet (sl);
495 sl.free ();
496} 494}
497 495
498/** 496/**
499 * Sends item's info to player. 497 * Sends item's info to player.
500 */ 498 */
… …
510 /* if the item is on the ground, mark that the look needs to 508 /* if the item is on the ground, mark that the look needs to
511 * be updated. 509 * be updated.
512 */ 510 */
513 if (!op->env) 511 if (!op->env)
514 { 512 {
515 pl->contr->socket.update_look = 1; 513 pl->contr->socket->update_look = 1;
516 return; 514 return;
517 } 515 }
518 } 516 }
519 517
520 SockList sl (MAXSOCKBUF); 518 packet sl;
521 519
522 sl.printf ("item%d ", pl->contr->socket.itemcmd); 520 sl.printf ("item%d ", pl->contr->socket->itemcmd);
523 521
524 if (op->head) 522 if (op->head)
525 op = op->head; 523 op = op->head;
526 524
527 sl << uint32 (op->env ? op->env->count : 0); 525 sl << uint32 (op->env ? op->env->count : 0);
528 526
529 add_object_to_socklist (pl->contr->socket, sl, op); 527 add_object_to_socklist (*pl->contr->socket, sl, op);
530 528
531 Send_With_Handling (&pl->contr->socket, &sl); 529 pl->contr->socket->send_packet (sl);
532 SET_FLAG (op, FLAG_CLIENT_SENT); 530 SET_FLAG (op, FLAG_CLIENT_SENT);
533 531
534 sl.free ();
535} 532}
536 533
537/** 534/**
538 * Tells the client to delete an item. Uses the item 535 * Tells the client to delete an item. Uses the item
539 * command with a -1 location. 536 * command with a -1 location.
540 */ 537 */
541 538
542void 539void
543esrv_del_item (player *pl, int tag) 540esrv_del_item (player *pl, int tag)
544{ 541{
545 SockList sl (MAXSOCKBUF); 542 packet sl;
546 543
547 sl << "delitem " 544 sl << "delitem "
548 << uint32 (tag); 545 << uint32 (tag);
549 546
550 Send_With_Handling (&pl->socket, &sl); 547 pl->socket->send_packet (sl);
551 sl.free ();
552} 548}
553 549
554 550
555/******************************************************************************* 551/*******************************************************************************
556 * 552 *
… …
627 return; 623 return;
628 624
629 /* If the high bit is set, player applied a pseudo object. */ 625 /* If the high bit is set, player applied a pseudo object. */
630 if (tag & 0x80000000) 626 if (tag & 0x80000000)
631 { 627 {
632 pl->socket.look_position = tag & 0x7fffffff; 628 pl->socket->look_position = tag & 0x7fffffff;
633 pl->socket.update_look = 1; 629 pl->socket->update_look = 1;
634 return; 630 return;
635 } 631 }
636 632
637 object *op = esrv_get_ob_from_count (pl->ob, tag); 633 object *op = esrv_get_ob_from_count (pl->ob, tag);
638 634
… …
763 { 759 {
764 return; 760 return;
765 } 761 }
766 dy = atoi (cp); 762 dy = atoi (cp);
767 763
768 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 764 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
769 return; 765 return;
770 766
771 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 767 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
772 return; 768 return;
773 769
774 look_at (pl->ob, dx, dy); 770 look_at (pl->ob, dx, dy);
775} 771}
776 772

Diff Legend

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