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.16 by root, Thu Dec 14 01:21:58 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 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 (NewSocket &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 {
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369
234 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 370 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
235 << uint32 (0) 371 << uint32 (0)
236 << sint32 (-1) 372 << sint32 (-1)
237 << uint32 (empty_face->number); 373 << uint32 (empty_face->number)
238 374 << data8 (buf)
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241 sl << uint16 (0) 375 << uint16 (0)
242 << uint8 (0) 376 << uint8 (0)
243 << uint32 (0); 377 << uint32 (0);
244 378
245 if (pl->contr->socket.itemcmd == 2) 379 if (pl->contr->ns->itemcmd == 2)
246 sl << uint16 (0); 380 sl << uint16 (0);
247 } 381 }
248 382
383 object *tmp = pl->ms ().top;
249 for (last = NULL; tmp != last; tmp = tmp->below) 384 for (object *last = 0; tmp != last; tmp = tmp->below)
250 { 385 {
251 object *head; 386 object *head;
252 387
253 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
254 { 389 {
255 last = tmp->below; /* assumes double floor mode */ 390 last = tmp->below; /* assumes double floor mode */
256 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
257 last = last->below; 392 last = last->below;
258 } 393 }
259 394
260 if (LOOK_OBJ (tmp)) 395 if (tmp->client_visible ())
261 { 396 {
262 if (++start_look < pl->contr->socket.look_position) 397 if (++start_look < pl->contr->ns->look_position)
263 continue; 398 continue;
264 399
265 end_look++; 400 end_look++;
266 401
267 if (end_look > NUM_LOOK_OBJECTS) 402 if (end_look > FLOORBOX_PAGESIZE)
268 { 403 {
269 /* 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,
270 * we notice the special tag the object has, and act accordingly. 405 * we notice the special tag the object has, and act accordingly.
271 */ 406 */
272 sl << uint32 (0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)) 407 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
273 << uint32 (0) 408 << uint32 (0)
274 << uint32 ((uint32) - 1) 409 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number); 410 << uint32 (empty_face->number)
276 411 << data8 ("Apply this to see next group of items")
277 sl.printf ("Click here to see next group of items");
278
279 sl << uint16 (0) 412 << uint16 (0)
280 << uint8 (0) 413 << uint8 (0)
281 << uint32 (0); 414 << uint32 (0);
282 415
283 if (pl->contr->socket.itemcmd == 2) 416 if (pl->contr->ns->itemcmd == 2)
284 sl << uint16 (0); 417 sl << uint16 (0);
285 418
286 break; 419 break;
287 } 420 }
288 421
289 if (tmp->head) 422 if (tmp->head)
290 head = tmp->head; 423 head = tmp->head;
291 else 424 else
292 head = tmp; 425 head = tmp;
293 426
294 add_object_to_socklist (pl->contr->socket, sl, head); 427 add_object_to_socklist (*pl->contr->ns, sl, head);
295 got_one++; 428 got_one++;
296 429
297 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 { 431 {
299 Send_With_Handling (&pl->contr->socket, &sl); 432 pl->contr->ns->send_packet (sl);
300 433
301 sl.reset (); 434 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket.itemcmd); 435 sl.printf ("item%d ", pl->contr->ns->itemcmd);
303 sl << uint32 (0); 436 sl << uint32 (0);
304 got_one = 0; 437 got_one = 0;
305 } 438 }
306 } /* If LOOK_OBJ() */ 439 }
307 } 440 }
308 441
309 if (got_one) 442 if (got_one)
310 Send_With_Handling (&pl->contr->socket, &sl); 443 pl->contr->ns->send_packet (sl);
311 444
312} 445}
313 446
314/** 447/**
315 * Sends whole inventory. 448 * Sends whole inventory.
316 */ 449 */
317void 450void
318esrv_send_inventory (object *pl, object *op) 451esrv_send_inventory (object *pl, object *op)
319{ 452{
320 object *tmp;
321 int got_one = 0; 453 int got_one = 0;
322 454
455 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
456
323 packet sl; 457 packet sl;
324
325 sl.printf ("delinv %d", op->count);
326 Send_With_Handling (&pl->contr->socket, &sl);
327
328 sl.reset ();
329 sl.printf ("item%d ", pl->contr->socket.itemcmd); 458 sl.printf ("item%d ", pl->contr->ns->itemcmd);
330 459
331 sl << uint32 (op->count); 460 sl << uint32 (op->count);
332 461
333 for (tmp = op->inv; tmp; tmp = tmp->below) 462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
334 { 463 {
335 object *head; 464 object *head;
336 465
337 if (tmp->head) 466 if (tmp->head)
338 head = tmp->head; 467 head = tmp->head;
339 else 468 else
340 head = tmp; 469 head = tmp;
341 470
342 if (LOOK_OBJ (head)) 471 if (head->client_visible ())
343 { 472 {
344 add_object_to_socklist (pl->contr->socket, sl, head); 473 add_object_to_socklist (*pl->contr->ns, sl, head);
345 474
346 got_one++; 475 got_one++;
347 476
348 /* IT is possible for players to accumulate a huge amount of 477 /* IT is possible for players to accumulate a huge amount of
349 * items (especially with some of the bags out there) to 478 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 479 * overflow the buffer. IF so, send multiple item commands.
351 */ 480 */
352 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 481 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
353 { 482 {
354 Send_With_Handling (&pl->contr->socket, &sl); 483 pl->contr->ns->send_packet (sl);
484
485 sl.reset ();
355 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 486 sl.printf ("item%d ", pl->contr->ns->itemcmd);
356 sl.len = strlen ((char *) sl.buf);
357 sl << uint32 (op->count); 487 sl << uint32 (op->count);
358 got_one = 0; 488 got_one = 0;
359 } 489 }
360 } /* If LOOK_OBJ() */ 490 }
361 } 491 }
362 492
363 if (got_one) 493 if (got_one)
364 Send_With_Handling (&pl->contr->socket, &sl); 494 pl->contr->ns->send_packet (sl);
365
366} 495}
367 496
368/** 497/**
369 * Updates object *op for player *pl. 498 * Updates object *op for player *pl.
370 * 499 *
… …
377esrv_update_item (int flags, object *pl, object *op) 506esrv_update_item (int flags, object *pl, object *op)
378{ 507{
379 /* 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. */
380 if (op != pl) 509 if (op != pl)
381 { 510 {
382 if (!LOOK_OBJ (op)) 511 if (!op->client_visible ())
383 return; 512 return;
384 /* 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
385 * is hopefully in the same place, so the client should preserve 514 * is hopefully in the same place, so the client should preserve
386 * order. 515 * order.
387 */ 516 */
388 } 517 }
389 518
519 client *ns = pl->contr->ns;
520 if (!ns)
521 return;
522
390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 523 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
391 { 524 {
392 /* 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
393 * 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
394 * and track back the call. 527 * and track back the call.
395 */ 528 */
396 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);
397 } 530 }
398 531
399 packet sl; 532 packet sl ("upditem");
400 533
401 sl << "upditem "
402 << uint8 (flags); 534 sl << uint8 (flags);
403 535
404 if (op->head) 536 if (op->head)
405 op = op->head; 537 op = op->head;
406 538
407 sl << uint32 (op->count); 539 sl << uint32 (op->count);
… …
417 sint32 weight = WEIGHT (op); 549 sint32 weight = WEIGHT (op);
418 550
419 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 551 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
420 552
421 if (pl == op) 553 if (pl == op)
422 op->contr->last_weight = weight; 554 ns->last_weight = weight;
423 } 555 }
424 556
425 if (flags & UPD_FACE) 557 if (flags & UPD_FACE)
426 { 558 {
427 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 559 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
428 esrv_send_face (&pl->contr->socket, op->face->number, 0); 560 esrv_send_face (ns, op->face->number, 0);
429 561
430 sl << uint32 (op->face->number); 562 sl << uint32 (op->face->number);
431 } 563 }
432 564
433 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
… …
487 } 619 }
488 620
489 if (flags & UPD_NROF) 621 if (flags & UPD_NROF)
490 sl << uint32 (op->nrof); 622 sl << uint32 (op->nrof);
491 623
492 Send_With_Handling (&pl->contr->socket, &sl); 624 pl->contr->ns->send_packet (sl);
493} 625}
494 626
495/** 627/**
496 * Sends item's info to player. 628 * Sends item's info to player.
497 */ 629 */
… …
500{ 632{
501 /* If this is not the player object, do some more checks */ 633 /* If this is not the player object, do some more checks */
502 if (op != pl) 634 if (op != pl)
503 { 635 {
504 /* We only send 'visibile' objects to the client */ 636 /* We only send 'visibile' objects to the client */
505 if (!LOOK_OBJ (op)) 637 if (!op->client_visible ())
506 return; 638 return;
639
507 /* 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
508 * be updated. 641 * be updated.
509 */ 642 */
510 if (!op->env) 643 if (!op->env)
511 { 644 {
512 pl->contr->socket.update_look = 1; 645 pl->contr->ns->floorbox_update ();
513 return; 646 return;
514 } 647 }
515 } 648 }
516 649
517 packet sl; 650 packet sl;
518 651
519 sl.printf ("item%d ", pl->contr->socket.itemcmd); 652 sl.printf ("item%d ", pl->contr->ns->itemcmd);
520 653
521 if (op->head) 654 if (op->head)
522 op = op->head; 655 op = op->head;
523 656
524 sl << uint32 (op->env ? op->env->count : 0); 657 sl << uint32 (op->env ? op->env->count : 0);
525 658
526 add_object_to_socklist (pl->contr->socket, sl, op); 659 add_object_to_socklist (*pl->contr->ns, sl, op);
527 660
528 Send_With_Handling (&pl->contr->socket, &sl); 661 pl->contr->ns->send_packet (sl);
529 SET_FLAG (op, FLAG_CLIENT_SENT); 662 SET_FLAG (op, FLAG_CLIENT_SENT);
530
531} 663}
532 664
533/** 665/**
534 * Tells the client to delete an item. Uses the item 666 * Tells the client to delete an item. Uses the item
535 * command with a -1 location. 667 * command with a -1 location.
536 */ 668 */
537 669
538void 670void
539esrv_del_item (player *pl, int tag) 671esrv_del_item (player *pl, int tag)
540{ 672{
541 packet sl; 673 packet sl ("delitem");
542 674
543 sl << "delitem "
544 << uint32 (tag); 675 sl << uint32 (tag);
545 676
546 Send_With_Handling (&pl->socket, &sl); 677 pl->ns->send_packet (sl);
547} 678}
548 679
549 680
550/******************************************************************************* 681/*******************************************************************************
551 * 682 *
… …
572 else if (op->type == CONTAINER && pl->container == op) 703 else if (op->type == CONTAINER && pl->container == op)
573 for (tmp = op->inv; tmp; tmp = tmp->below) 704 for (tmp = op->inv; tmp; tmp = tmp->below)
574 if (tmp->count == count) 705 if (tmp->count == count)
575 return tmp; 706 return tmp;
576 707
577 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)
578 if (op->head != NULL && op->head->count == count) 709 if (op->head && op->head->count == count)
579 return op; 710 return op;
580 else if (op->count == count) 711 else if (op->count == count)
581 return op; 712 return op;
582 else if (op->type == CONTAINER && pl->container == op) 713 else if (op->type == CONTAINER && pl->container == op)
583 for (tmp = op->inv; tmp; tmp = tmp->below) 714 for (tmp = op->inv; tmp; tmp = tmp->below)
584 if (tmp->count == count) 715 if (tmp->count == count)
585 return tmp; 716 return tmp;
586 717
587 return NULL; 718 return 0;
588} 719}
589 720
590 721
591/** Client wants to examine some object. So lets do so. */ 722/** Client wants to examine some object. So lets do so. */
592void 723void
… …
607 } 738 }
608 739
609 examine (pl->ob, op); 740 examine (pl->ob, op);
610} 741}
611 742
612/** Client wants to apply some object. Lets do so. */ 743/** Client wants to apply some object. Lets do so. */
613void 744void
614ApplyCmd (char *buf, int len, player *pl) 745ApplyCmd (char *buf, int len, player *pl)
615{ 746{
616 tag_t tag = atoi (buf); 747 tag_t tag = atoi (buf);
617 748
… …
622 return; 753 return;
623 754
624 /* If the high bit is set, player applied a pseudo object. */ 755 /* If the high bit is set, player applied a pseudo object. */
625 if (tag & 0x80000000) 756 if (tag & 0x80000000)
626 { 757 {
627 pl->socket.look_position = tag & 0x7fffffff; 758 pl->ns->look_position = tag & 0x7fffffff;
628 pl->socket.update_look = 1; 759 pl->ns->floorbox_update ();
629 return; 760 return;
630 } 761 }
631 762
632 object *op = esrv_get_ob_from_count (pl->ob, tag); 763 object *op = esrv_get_ob_from_count (pl->ob, tag);
633 764
… …
638 } 769 }
639 770
640 player_apply (pl->ob, op, 0, 0); 771 player_apply (pl->ob, op, 0, 0);
641} 772}
642 773
643/** Client wants to apply some object. Lets do so. */ 774/** Client wants to lock some object. Lets do so. */
644void 775void
645LockItem (uint8 *data, int len, player *pl) 776LockItem (char *data, int len, player *pl)
646{ 777{
647 int flag = data[0]; 778 int flag = data[0];
648 tag_t tag = net_uint32 (data + 1); 779 tag_t tag = net_uint32 ((uint8 *)data + 1);
649 object *op = esrv_get_ob_from_count (pl->ob, tag); 780 object *op = esrv_get_ob_from_count (pl->ob, tag);
650 781
651 if (!op) 782 if (!op)
652 { 783 {
653 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");
… …
660 SET_FLAG (op, FLAG_INV_LOCKED); 791 SET_FLAG (op, FLAG_INV_LOCKED);
661 792
662 esrv_update_item (UPD_FLAGS, pl->ob, op); 793 esrv_update_item (UPD_FLAGS, pl->ob, op);
663} 794}
664 795
665/** Client wants to apply some object. Lets do so. */ 796/** Client wants to mark some object. Lets do so. */
666void 797void
667MarkItem (uint8 * data, int len, player *pl) 798MarkItem (char *data, int len, player *pl)
668{ 799{
669 tag_t tag = net_uint32 (data); 800 tag_t tag = net_uint32 ((uint8 *)data);
670 object *op = esrv_get_ob_from_count (pl->ob, tag); 801 object *op = esrv_get_ob_from_count (pl->ob, tag);
671 802
672 if (!op) 803 if (!op)
673 { 804 {
674 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");
… …
701 832
702 m = get_map_from_coord (op->map, &x, &y); 833 m = get_map_from_coord (op->map, &x, &y);
703 if (!m) 834 if (!m)
704 return; 835 return;
705 836
706 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);
707 838
708 for (; tmp != NULL; tmp = tmp->below) 839 for (; tmp != NULL; tmp = tmp->below)
709 { 840 {
710 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 841 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
711 continue; 842 continue;
… …
758 { 889 {
759 return; 890 return;
760 } 891 }
761 dy = atoi (cp); 892 dy = atoi (cp);
762 893
763 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)
764 return; 895 return;
765 896
766 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])
767 return; 898 return;
768 899
769 look_at (pl->ob, dx, dy); 900 look_at (pl->ob, dx, dy);
770} 901}
771 902
… …
801 } 932 }
802 933
803 esrv_update_item (UPD_WEIGHT, pl, op); 934 esrv_update_item (UPD_WEIGHT, pl, op);
804 } 935 }
805 else 936 else
806 {
807 drop_object (pl, op, nrof); 937 drop_object (pl, op, nrof);
808 } 938
809 return; 939 return;
810 } 940 }
811 else if (to == pl->count) 941 else if (to == pl->count)
812 { /* pick it up to the inventory */ 942 { /* pick it up to the inventory */
813 /* return if player has already picked it up */ 943 /* return if player has already picked it up */
… …
830 * 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
831 * 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
832 * 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.
833 */ 963 */
834 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))
835 {
836 put_object_in_sack (pl, env, op, nrof); 965 put_object_in_sack (pl, env, op, nrof);
837 }
838} 966}
839 967

Diff Legend

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