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.32 by root, Tue Jan 9 21:32:43 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
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation; either version 2 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program; if not, write to the Free Software
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client/server logic. 27 * Client/server logic.
27 * 28 *
28 * \date 2003-12-02 29 * \date 2003-12-02
29 * 30 *
30 * This containes item logic for client/server. It doesn't contain 31 * This contains 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 */
38#include <newclient.h> 37#include <object.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
44 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
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
51/**
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 188
72/** 189/**
73 * This is a similar to query_name, but returns flags 190 * This is a similar to query_name, but returns flags
74 * to be sended to client. 191 * to be sent to client.
75 */ 192 */
76unsigned int 193unsigned int
77query_flags (object *op) 194query_flags (object *op)
78{ 195{
79 unsigned int flags = 0; 196 unsigned int flags = 0;
80 197
81 if (QUERY_FLAG (op, FLAG_APPLIED)) 198 if (QUERY_FLAG (op, FLAG_APPLIED))
82 { 199 {
83 switch (op->type) 200 switch (op->type)
84 { 201 {
85 case BOW: 202 case BOW:
86 case WAND: 203 case WAND:
87 case ROD: 204 case ROD:
88 case HORN: 205 case HORN:
89 flags = a_readied; 206 flags = a_readied;
90 break; 207 break;
91 case WEAPON: 208 case WEAPON:
92 flags = a_wielded; 209 flags = a_wielded;
93 break; 210 break;
94 case SKILL: 211 case SKILL:
95 case ARMOUR: 212 case ARMOUR:
96 case HELMET: 213 case HELMET:
97 case SHIELD: 214 case SHIELD:
98 case RING: 215 case RING:
99 case BOOTS: 216 case BOOTS:
100 case GLOVES: 217 case GLOVES:
101 case AMULET: 218 case AMULET:
102 case GIRDLE: 219 case GIRDLE:
103 case BRACERS: 220 case BRACERS:
104 case CLOAK: 221 case CLOAK:
105 flags = a_worn; 222 flags = a_worn;
106 break; 223 break;
107 case CONTAINER: 224 case CONTAINER:
108 flags = a_active; 225 flags = a_active;
109 break; 226 break;
110 default: 227 default:
111 flags = a_applied; 228 flags = a_applied;
112 break; 229 break;
113 } 230 }
114 } 231 }
232
115 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))))
116 flags |= F_OPEN; 234 flags |= F_OPEN;
117 235
118 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
119 { 237 {
120 if (QUERY_FLAG (op, FLAG_DAMNED)) 238 if (QUERY_FLAG (op, FLAG_DAMNED))
121 flags |= F_DAMNED; 239 flags |= F_DAMNED;
122 else if (QUERY_FLAG (op, FLAG_CURSED)) 240 else if (QUERY_FLAG (op, FLAG_CURSED))
123 flags |= F_CURSED; 241 flags |= F_CURSED;
124 } 242 }
243
125 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))
126 flags |= F_MAGIC; 245 flags |= F_MAGIC;
127 if (QUERY_FLAG (op, FLAG_UNPAID)) 246 if (QUERY_FLAG (op, FLAG_UNPAID))
128 flags |= F_UNPAID; 247 flags |= F_UNPAID;
129 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 248 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
130 flags |= F_LOCKED; 249 flags |= F_LOCKED;
131 250
132 return flags; 251 return flags;
133} 252}
134 253
135/* Used in the send_look to put object head into SockList 254/* 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 255 * sl for socket ns. Need socket to know if we need to send
137 * animation of face to the client. 256 * animation of face to the client.
138 */ 257 */
139static void 258static void
140add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 259add_object_to_socklist (client &ns, packet &sl, object *head)
141{ 260{
142 int flags, len, anim_speed; 261 int flags, len, anim_speed;
143 char item_n[MAX_BUF]; 262 char item_n[MAX_BUF];
144 const char *item_p; 263 const char *item_p;
145 264
… …
206 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
207 326
208 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
209} 328}
210 329
211
212/** 330/**
213 * Send the look window. Don't need to do animations here 331 * 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 332 * This sends all the faces to the client, not just updates. This is
215 * because object ordering would otherwise be inconsistent 333 * because object ordering would otherwise be inconsistent.
216 */ 334 */
217
218void 335void
219esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
220{ 337{
221 object *tmp, *last;
222 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
223 char buf[MAX_BUF]; 339 char buf[MAX_BUF];
224 340
225 if (!pl->contr->socket.update_look) 341 if (!pl->contr->ns->update_look)
226 { 342 {
227 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 343 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n");
228 return; 344 return;
229 } 345 }
230 else 346 else
231 pl->contr->socket.update_look = 0; 347 pl->contr->ns->update_look = 0;
232 348
233 if (QUERY_FLAG (pl, FLAG_REMOVED) 349 if (QUERY_FLAG (pl, FLAG_REMOVED)
234 || !pl->map 350 || !pl->map
235 || pl->map->in_memory != MAP_IN_MEMORY 351 || pl->map->in_memory != MAP_IN_MEMORY
236 || out_of_map (pl->map, pl->x, pl->y)) 352 || out_of_map (pl->map, pl->x, pl->y))
237 return; 353 return;
238 354
239 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above); 355 pl->contr->ns->send_packet ("delinv 0");
240 356
241 SockList sl (MAXSOCKBUF); 357 packet sl;
242
243 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1);
244
245 sl.printf ("item%d ", pl->contr->socket.itemcmd); 358 sl.printf ("item%d ", pl->contr->ns->itemcmd);
246 359
247 sl << uint32 (0); 360 sl << uint32 (0);
248 361
249 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 362 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE))
250 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 363 esrv_send_face (pl->contr->ns, empty_face->number, 0);
251 364
252 if (pl->contr->socket.look_position) 365 if (pl->contr->ns->look_position)
253 { 366 {
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369
254 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
255 << uint32 (0) 371 << uint32 (0)
256 << sint32 (-1) 372 << sint32 (-1)
257 << uint32 (empty_face->number); 373 << uint32 (empty_face->number)
258 374 << data8 (buf)
259 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261 sl << uint16 (0) 375 << uint16 (0)
262 << uint8 (0) 376 << uint8 (0)
263 << uint32 (0); 377 << uint32 (0);
264 378
265 if (pl->contr->socket.itemcmd == 2) 379 if (pl->contr->ns->itemcmd == 2)
266 sl << uint16 (0); 380 sl << uint16 (0);
267 } 381 }
268 382
383 object *tmp = pl->ms ().top;
269 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
270 { 385 {
271 object *head; 386 object *head;
272 387
273 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
274 { 389 {
275 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
276 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
277 last = last->below; 392 last = last->below;
278 } 393 }
279 394
280 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
281 { 396 {
282 if (++start_look < pl->contr->socket.look_position) 397 if (++start_look < pl->contr->ns->look_position)
283 continue; 398 continue;
284 399
285 end_look++; 400 end_look++;
286 401
287 if (end_look > NUM_LOOK_OBJECTS) 402 if (end_look > FLOORBOX_PAGESIZE)
288 { 403 {
289 /* What we basically do is make a 'fake' object - when the user applies it, 404 /* 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. 405 * we notice the special tag the object has, and act accordingly.
291 */ 406 */
292 SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); 407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
293 SockList_AddInt (&sl, 0); 408 << uint32 (0)
294 SockList_AddInt (&sl, (uint32) - 1); 409 << uint32 ((uint32) - 1)
295 SockList_AddInt (&sl, empty_face->number); 410 << uint32 (empty_face->number)
296 sprintf (buf, "Click here to see next group of items"); 411 << data8 ("Apply this to see next group of items")
297 add_stringlen_to_sockbuf (buf, &sl); 412 << uint16 (0)
298 SockList_AddShort (&sl, 0); 413 << uint8 (0)
299 SockList_AddChar (&sl, 0); 414 << uint32 (0);
300 SockList_AddInt (&sl, 0); 415
301 if (pl->contr->socket.itemcmd == 2) 416 if (pl->contr->ns->itemcmd == 2)
302 SockList_AddShort (&sl, 0); 417 sl << uint16 (0);
418
303 break; 419 break;
304 } 420 }
421
305 if (tmp->head) 422 if (tmp->head)
306 head = tmp->head; 423 head = tmp->head;
307 else 424 else
308 head = tmp; 425 head = tmp;
309 426
310 add_object_to_socklist (pl->contr->socket, sl, head); 427 add_object_to_socklist (*pl->contr->ns, sl, head);
311 got_one++; 428 got_one++;
312 429
313 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
314 { 431 {
315 Send_With_Handling (&pl->contr->socket, &sl); 432 pl->contr->ns->send_packet (sl);
433
434 sl.reset ();
316 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 435 sl.printf ("item%d ", pl->contr->ns->itemcmd);
317 sl.len = strlen ((char *) sl.buf); 436 sl << uint32 (0);
318 SockList_AddInt (&sl, 0);
319 got_one = 0; 437 got_one = 0;
320 } 438 }
321 } /* If LOOK_OBJ() */ 439 }
322 } 440 }
323 441
324 if (got_one) 442 if (got_one)
325 Send_With_Handling (&pl->contr->socket, &sl); 443 pl->contr->ns->send_packet (sl);
326 444
327 sl.free ();
328} 445}
329 446
330/** 447/**
331 * Sends whole inventory. 448 * Sends whole inventory.
332 */ 449 */
333void 450void
334esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
335{ 452{
336 object *tmp;
337 int got_one = 0; 453 int got_one = 0;
338 SockList sl;
339 454
340 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 455 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
341 456
342 sprintf ((char *) sl.buf, "delinv %d", op->count); 457 packet sl;
343 sl.len = strlen ((char *) sl.buf);
344 Send_With_Handling (&pl->contr->socket, &sl);
345
346 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 458 sl.printf ("item%d ", pl->contr->ns->itemcmd);
347 sl.len = strlen ((char *) sl.buf);
348 459
349 SockList_AddInt (&sl, op->count); 460 sl << uint32 (op->count);
350 461
351 for (tmp = op->inv; tmp; tmp = tmp->below) 462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
352 { 463 {
353 object *head; 464 object *head;
354 465
355 if (tmp->head) 466 if (tmp->head)
356 head = tmp->head; 467 head = tmp->head;
357 else 468 else
358 head = tmp; 469 head = tmp;
359 470
360 if (LOOK_OBJ (head)) 471 if (head->client_visible ())
361 { 472 {
362 add_object_to_socklist (pl->contr->socket, sl, head); 473 add_object_to_socklist (*pl->contr->ns, sl, head);
363 474
364 got_one++; 475 got_one++;
365 476
366 /* IT is possible for players to accumulate a huge amount of 477 /* IT is possible for players to accumulate a huge amount of
367 * items (especially with some of the bags out there) to 478 * items (especially with some of the bags out there) to
368 * overflow the buffer. IF so, send multiple item commands. 479 * overflow the buffer. IF so, send multiple item commands.
369 */ 480 */
370 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 481 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
371 { 482 {
372 Send_With_Handling (&pl->contr->socket, &sl); 483 pl->contr->ns->send_packet (sl);
484
485 sl.reset ();
373 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 486 sl.printf ("item%d ", pl->contr->ns->itemcmd);
374 sl.len = strlen ((char *) sl.buf); 487 sl << uint32 (op->count);
375 SockList_AddInt (&sl, op->count);
376 got_one = 0; 488 got_one = 0;
377 } 489 }
378 } /* If LOOK_OBJ() */ 490 }
379 } 491 }
492
380 if (got_one) 493 if (got_one)
381 Send_With_Handling (&pl->contr->socket, &sl); 494 pl->contr->ns->send_packet (sl);
382 sl.free ();
383} 495}
384 496
385/** 497/**
386 * Updates object *op for player *pl. 498 * Updates object *op for player *pl.
387 * 499 *
… …
391 */ 503 */
392 504
393void 505void
394esrv_update_item (int flags, object *pl, object *op) 506esrv_update_item (int flags, object *pl, object *op)
395{ 507{
396 SockList sl;
397
398 /* If we have a request to send the player item, skip a few checks. */ 508 /* If we have a request to send the player item, skip a few checks. */
399 if (op != pl) 509 if (op != pl)
400 { 510 {
401 if (!LOOK_OBJ (op)) 511 if (!op->client_visible ())
402 return; 512 return;
403 /* we remove the check for op->env, because in theory, the object 513 /* we remove the check for op->env, because in theory, the object
404 * is hopefully in the same place, so the client should preserve 514 * is hopefully in the same place, so the client should preserve
405 * order. 515 * order.
406 */ 516 */
407 } 517 }
408 518
519 client *ns = pl->contr->ns;
520 if (!ns)
521 return;
522
409 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 523 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
410 { 524 {
411 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 525 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
412 * this is happening - we can set a breakpoint here in the debugger 526 * this is happening - we can set a breakpoint here in the debugger
413 * and track back the call. 527 * and track back the call.
414 */ 528 */
415 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 529 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
416 } 530 }
417 531
418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 532 packet sl ("upditem");
419 533
420 strcpy ((char *) sl.buf, "upditem "); 534 sl << uint8 (flags);
421 sl.len = strlen ((char *) sl.buf);
422
423 SockList_AddChar (&sl, (char) flags);
424 535
425 if (op->head) 536 if (op->head)
426 op = op->head; 537 op = op->head;
427 538
428 SockList_AddInt (&sl, op->count); 539 sl << uint32 (op->count);
429 540
430 if (flags & UPD_LOCATION) 541 if (flags & UPD_LOCATION)
431 SockList_AddInt (&sl, op->env ? op->env->count : 0); 542 sl << uint32 (op->env ? op->env->count : 0);
432 543
433 if (flags & UPD_FLAGS) 544 if (flags & UPD_FLAGS)
434 SockList_AddInt (&sl, query_flags (op)); 545 sl << uint32 (query_flags (op));
435 546
436 if (flags & UPD_WEIGHT) 547 if (flags & UPD_WEIGHT)
437 { 548 {
438 sint32 weight = WEIGHT (op); 549 sint32 weight = WEIGHT (op);
439 550
440 SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 551 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
552
441 if (pl == op) 553 if (pl == op)
442 {
443 op->contr->last_weight = weight; 554 ns->last_weight = weight;
444 }
445 } 555 }
446 556
447 if (flags & UPD_FACE) 557 if (flags & UPD_FACE)
448 { 558 {
449 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 559 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
450 esrv_send_face (&pl->contr->socket, op->face->number, 0); 560 esrv_send_face (ns, op->face->number, 0);
451 SockList_AddInt (&sl, op->face->number); 561
562 sl << uint32 (op->face->number);
452 } 563 }
453 564
454 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
455 { 566 {
456 int len; 567 int len;
… …
473 } 584 }
474 585
475 strncpy (item_n + len + 1, item_p, 127); 586 strncpy (item_n + len + 1, item_p, 127);
476 item_n[254] = 0; 587 item_n[254] = 0;
477 len += strlen (item_n + 1 + len) + 1; 588 len += strlen (item_n + 1 + len) + 1;
478 SockList_AddChar (&sl, (char) len); 589
479 memcpy (sl.buf + sl.len, item_n, len); 590 sl << data8 (item_n, len);
480 sl.len += len;
481 } 591 }
482 592
483 if (flags & UPD_ANIM) 593 if (flags & UPD_ANIM)
484 SockList_AddShort (&sl, op->animation_id); 594 sl << uint16 (op->animation_id);
485 595
486 if (flags & UPD_ANIMSPEED) 596 if (flags & UPD_ANIMSPEED)
487 { 597 {
488 int anim_speed = 0; 598 int anim_speed = 0;
489 599
… …
498 else if (FABS (op->speed) >= 1.0) 608 else if (FABS (op->speed) >= 1.0)
499 anim_speed = 1; 609 anim_speed = 1;
500 else 610 else
501 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / FABS (op->speed));
502 } 612 }
613
503 if (anim_speed > 255) 614 if (anim_speed > 255)
504 anim_speed = 255; 615 anim_speed = 255;
505 } 616 }
506 SockList_AddChar (&sl, (char) anim_speed); 617
618 sl << uint8 (anim_speed);
507 } 619 }
620
508 if (flags & UPD_NROF) 621 if (flags & UPD_NROF)
509 SockList_AddInt (&sl, op->nrof); 622 sl << uint32 (op->nrof);
510 623
511 Send_With_Handling (&pl->contr->socket, &sl); 624 pl->contr->ns->send_packet (sl);
512 sl.free ();
513} 625}
514 626
515/** 627/**
516 * Sends item's info to player. 628 * Sends item's info to player.
517 */ 629 */
518void 630void
519esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
520{ 632{
521 SockList sl;
522
523 /* If this is not the player object, do some more checks */ 633 /* If this is not the player object, do some more checks */
524 if (op != pl) 634 if (op != pl)
525 { 635 {
526 /* We only send 'visibile' objects to the client */ 636 /* We only send 'visibile' objects to the client */
527 if (!LOOK_OBJ (op)) 637 if (!op->client_visible ())
528 return; 638 return;
639
529 /* if the item is on the ground, mark that the look needs to 640 /* if the item is on the ground, mark that the look needs to
530 * be updated. 641 * be updated.
531 */ 642 */
532 if (!op->env) 643 if (!op->env)
533 { 644 {
534 pl->contr->socket.update_look = 1; 645 pl->contr->ns->floorbox_update ();
535 return; 646 return;
536 } 647 }
537 } 648 }
538 649
539 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 650 packet sl;
540 651
541 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 652 sl.printf ("item%d ", pl->contr->ns->itemcmd);
542 sl.len = strlen ((char *) sl.buf);
543 653
544 if (op->head) 654 if (op->head)
545 op = op->head; 655 op = op->head;
546 656
547 SockList_AddInt (&sl, op->env ? op->env->count : 0); 657 sl << uint32 (op->env ? op->env->count : 0);
548 658
549 add_object_to_socklist (pl->contr->socket, sl, op); 659 add_object_to_socklist (*pl->contr->ns, sl, op);
550 660
551 Send_With_Handling (&pl->contr->socket, &sl); 661 pl->contr->ns->send_packet (sl);
552 SET_FLAG (op, FLAG_CLIENT_SENT); 662 SET_FLAG (op, FLAG_CLIENT_SENT);
553
554 sl.free ();
555} 663}
556 664
557/** 665/**
558 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
559 * command with a -1 location. 667 * command with a -1 location.
560 */ 668 */
561 669
562void 670void
563esrv_del_item (player *pl, int tag) 671esrv_del_item (player *pl, int tag)
564{ 672{
565 SockList sl; 673 packet sl ("delitem");
566 674
567 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 675 sl << uint32 (tag);
568 676
569 strcpy ((char *) sl.buf, "delitem "); 677 pl->ns->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} 678}
576 679
577 680
578/******************************************************************************* 681/*******************************************************************************
579 * 682 *
… …
600 else if (op->type == CONTAINER && pl->container == op) 703 else if (op->type == CONTAINER && pl->container == op)
601 for (tmp = op->inv; tmp; tmp = tmp->below) 704 for (tmp = op->inv; tmp; tmp = tmp->below)
602 if (tmp->count == count) 705 if (tmp->count == count)
603 return tmp; 706 return tmp;
604 707
605 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 708 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
606 if (op->head != NULL && op->head->count == count) 709 if (op->head && op->head->count == count)
607 return op; 710 return op;
608 else if (op->count == count) 711 else if (op->count == count)
609 return op; 712 return op;
610 else if (op->type == CONTAINER && pl->container == op) 713 else if (op->type == CONTAINER && pl->container == op)
611 for (tmp = op->inv; tmp; tmp = tmp->below) 714 for (tmp = op->inv; tmp; tmp = tmp->below)
612 if (tmp->count == count) 715 if (tmp->count == count)
613 return tmp; 716 return tmp;
614 717
615 return NULL; 718 return 0;
616} 719}
617 720
618 721
619/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
620void 723void
… …
635 } 738 }
636 739
637 examine (pl->ob, op); 740 examine (pl->ob, op);
638} 741}
639 742
640/** Client wants to apply some object. Lets do so. */ 743/** Client wants to apply some object. Lets do so. */
641void 744void
642ApplyCmd (char *buf, int len, player *pl) 745ApplyCmd (char *buf, int len, player *pl)
643{ 746{
644 tag_t tag = atoi (buf); 747 tag_t tag = atoi (buf);
645 748
… …
650 return; 753 return;
651 754
652 /* If the high bit is set, player applied a pseudo object. */ 755 /* If the high bit is set, player applied a pseudo object. */
653 if (tag & 0x80000000) 756 if (tag & 0x80000000)
654 { 757 {
655 pl->socket.look_position = tag & 0x7fffffff; 758 pl->ns->look_position = tag & 0x7fffffff;
656 pl->socket.update_look = 1; 759 pl->ns->floorbox_update ();
657 return; 760 return;
658 } 761 }
659 762
660 object *op = esrv_get_ob_from_count (pl->ob, tag); 763 object *op = esrv_get_ob_from_count (pl->ob, tag);
661 764
… …
666 } 769 }
667 770
668 player_apply (pl->ob, op, 0, 0); 771 player_apply (pl->ob, op, 0, 0);
669} 772}
670 773
671/** Client wants to apply some object. Lets do so. */ 774/** Client wants to lock some object. Lets do so. */
672void 775void
673LockItem (uint8 *data, int len, player *pl) 776LockItem (char *data, int len, player *pl)
674{ 777{
675 int flag = data[0]; 778 int flag = data[0];
676 tag_t tag = net_uint32 (data + 1); 779 tag_t tag = net_uint32 ((uint8 *)data + 1);
677 object *op = esrv_get_ob_from_count (pl->ob, tag); 780 object *op = esrv_get_ob_from_count (pl->ob, tag);
678 781
679 if (!op) 782 if (!op)
680 { 783 {
681 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 784 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
688 SET_FLAG (op, FLAG_INV_LOCKED); 791 SET_FLAG (op, FLAG_INV_LOCKED);
689 792
690 esrv_update_item (UPD_FLAGS, pl->ob, op); 793 esrv_update_item (UPD_FLAGS, pl->ob, op);
691} 794}
692 795
693/** Client wants to apply some object. Lets do so. */ 796/** Client wants to mark some object. Lets do so. */
694void 797void
695MarkItem (uint8 * data, int len, player *pl) 798MarkItem (char *data, int len, player *pl)
696{ 799{
697 tag_t tag = net_uint32 (data); 800 tag_t tag = net_uint32 ((uint8 *)data);
698 object *op = esrv_get_ob_from_count (pl->ob, tag); 801 object *op = esrv_get_ob_from_count (pl->ob, tag);
699 802
700 if (!op) 803 if (!op)
701 { 804 {
702 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
729 832
730 m = get_map_from_coord (op->map, &x, &y); 833 m = get_map_from_coord (op->map, &x, &y);
731 if (!m) 834 if (!m)
732 return; 835 return;
733 836
734 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 837 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
735 838
736 for (; tmp != NULL; tmp = tmp->below) 839 for (; tmp != NULL; tmp = tmp->below)
737 { 840 {
738 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
739 continue; 842 continue;
… …
786 { 889 {
787 return; 890 return;
788 } 891 }
789 dy = atoi (cp); 892 dy = atoi (cp);
790 893
791 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 894 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
792 return; 895 return;
793 896
794 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
795 return; 898 return;
796 899
797 look_at (pl->ob, dx, dy); 900 look_at (pl->ob, dx, dy);
798} 901}
799 902
… …
810 return; 913 return;
811 } 914 }
812 915
813 if (!to) 916 if (!to)
814 { /* drop it to the ground */ 917 { /* drop it to the ground */
815
816/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818 if (op->map && !op->env) 918 if (op->map && !op->env)
819 {
820
821/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822 return; 919 return;
823 } 920
824 /* If it is an active container, then we should drop all objects 921 /* If it is an active container, then we should drop all objects
825 * in the container and not the container itself. 922 * in the container and not the container itself.
826 */ 923 */
827 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 924 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828 { 925 {
… …
831 for (current = op->inv; current != NULL; current = next) 928 for (current = op->inv; current != NULL; current = next)
832 { 929 {
833 next = current->below; 930 next = current->below;
834 drop_object (pl, current, 0); 931 drop_object (pl, current, 0);
835 } 932 }
933
836 esrv_update_item (UPD_WEIGHT, pl, op); 934 esrv_update_item (UPD_WEIGHT, pl, op);
837 } 935 }
838 else 936 else
839 {
840 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
841 } 938
842 return; 939 return;
843 } 940 }
844 else if (to == pl->count) 941 else if (to == pl->count)
845 { /* pick it up to the inventory */ 942 { /* pick it up to the inventory */
846 /* return if player has already picked it up */ 943 /* return if player has already picked it up */
… …
849 946
850 pl->contr->count = nrof; 947 pl->contr->count = nrof;
851 pick_up (pl, op); 948 pick_up (pl, op);
852 return; 949 return;
853 } 950 }
951
854 env = esrv_get_ob_from_count (pl, to); 952 env = esrv_get_ob_from_count (pl, to);
855 if (!env) 953 if (!env)
856 { 954 {
857 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 955 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858 return; 956 return;
859 } 957 }
958
860 /* put_object_in_sack presumes that necessary sanity checking 959 /* put_object_in_sack presumes that necessary sanity checking
861 * has already been done (eg, it can be picked up and fits in 960 * has already been done (eg, it can be picked up and fits in
862 * in a sack, so check for those things. We should also check 961 * in a sack, so check for those things. We should also check
863 * an make sure env is in fact a container for that matter. 962 * an make sure env is in fact a container for that matter.
864 */ 963 */
865 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
866 {
867 put_object_in_sack (pl, env, op, nrof); 965 put_object_in_sack (pl, env, op, nrof);
868 }
869} 966}
967

Diff Legend

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