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

Diff Legend

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