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

Diff Legend

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