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.19 by root, Thu Dec 14 04:30:33 2006 UTC vs.
Revision 1.39 by root, Mon Feb 26 20:36:15 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
… …
164 { 304 {
165 if (head->anim_speed) 305 if (head->anim_speed)
166 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
167 else 307 else
168 { 308 {
169 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
170 anim_speed = 255; 310 anim_speed = 255;
171 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
172 anim_speed = 1; 312 anim_speed = 1;
173 else 313 else
174 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
175 } 315 }
176 316
177 if (anim_speed > 255) 317 if (anim_speed > 255)
178 anim_speed = 255; 318 anim_speed = 255;
179 } 319 }
… …
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 (player %s)\n", &pl->name);
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.length () >= (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; 453 if (!pl->contr->ns)//D
454 return;
455
321 int got_one = 0; 456 int got_one = 0;
322 457
458 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
459
323 packet sl; 460 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); 461 sl.printf ("item%d ", pl->contr->ns->itemcmd);
330 462
331 sl << uint32 (op->count); 463 sl << uint32 (op->count);
332 464
333 for (tmp = op->inv; tmp; tmp = tmp->below) 465 for (object *tmp = op->inv; tmp; tmp = tmp->below)
334 { 466 {
335 object *head; 467 object *head;
336 468
337 if (tmp->head) 469 if (tmp->head)
338 head = tmp->head; 470 head = tmp->head;
339 else 471 else
340 head = tmp; 472 head = tmp;
341 473
342 if (LOOK_OBJ (head)) 474 if (head->client_visible ())
343 { 475 {
344 add_object_to_socklist (*pl->contr->socket, sl, head); 476 add_object_to_socklist (*pl->contr->ns, sl, head);
345 477
346 got_one++; 478 got_one++;
347 479
348 /* IT is possible for players to accumulate a huge amount of 480 /* IT is possible for players to accumulate a huge amount of
349 * items (especially with some of the bags out there) to 481 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 482 * overflow the buffer. IF so, send multiple item commands.
351 */ 483 */
352 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
353 { 485 {
354 Send_With_Handling (pl->contr->socket, &sl); 486 pl->contr->ns->send_packet (sl);
355 487
356 sl.reset (); 488 sl.reset ();
357 sl.printf ("item%d ", pl->contr->socket->itemcmd); 489 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 sl << uint32 (op->count); 490 sl << uint32 (op->count);
359 got_one = 0; 491 got_one = 0;
360 } 492 }
361 } /* If LOOK_OBJ() */ 493 }
362 } 494 }
363 495
364 if (got_one) 496 if (got_one)
365 Send_With_Handling (pl->contr->socket, &sl); 497 pl->contr->ns->send_packet (sl);
366
367} 498}
368 499
369/** 500/**
370 * Updates object *op for player *pl. 501 * Updates object *op for player *pl.
371 * 502 *
372 * flags is a list of values to update 503 * flags is a list of values to update
373 * to the client (as defined in newclient.h - might as well use the 504 * to the client (as defined in newclient.h - might as well use the
374 * same value both places. 505 * same value both places.
375 */ 506 */
376
377void 507void
378esrv_update_item (int flags, object *pl, object *op) 508esrv_update_item (int flags, object *pl, object *op)
379{ 509{
380 /* If we have a request to send the player item, skip a few checks. */ 510 /* If we have a request to send the player item, skip a few checks. */
381 if (op != pl) 511 if (op != pl)
382 { 512 {
383 if (!LOOK_OBJ (op)) 513 if (!op->client_visible ())
384 return; 514 return;
385 /* we remove the check for op->env, because in theory, the object 515 /* we remove the check for op->env, because in theory, the object
386 * is hopefully in the same place, so the client should preserve 516 * is hopefully in the same place, so the client should preserve
387 * order. 517 * order.
388 */ 518 */
389 } 519 }
390 520
521 client *ns = pl->contr->ns;
522 if (!ns)
523 return;
524
391 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
392 { 526 {
393 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
394 * this is happening - we can set a breakpoint here in the debugger 528 * this is happening - we can set a breakpoint here in the debugger
395 * and track back the call. 529 * and track back the call.
396 */ 530 */
397 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 531 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
398 } 532 }
399 533
400 packet sl; 534 packet sl ("upditem");
401 535
402 sl << "upditem "
403 << uint8 (flags); 536 sl << uint8 (flags);
404 537
405 if (op->head) 538 if (op->head)
406 op = op->head; 539 op = op->head;
407 540
408 sl << uint32 (op->count); 541 sl << uint32 (op->count);
… …
418 sint32 weight = WEIGHT (op); 551 sint32 weight = WEIGHT (op);
419 552
420 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
421 554
422 if (pl == op) 555 if (pl == op)
423 op->contr->last_weight = weight; 556 ns->last_weight = weight;
424 } 557 }
425 558
426 if (flags & UPD_FACE) 559 if (flags & UPD_FACE)
427 { 560 {
428 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 561 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE))
429 esrv_send_face (pl->contr->socket, op->face->number, 0); 562 esrv_send_face (ns, op->face->number, 0);
430 563
431 sl << uint32 (op->face->number); 564 sl << uint32 (op->face->number);
432 } 565 }
433 566
434 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
… …
470 { 603 {
471 if (op->anim_speed) 604 if (op->anim_speed)
472 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
473 else 606 else
474 { 607 {
475 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
476 anim_speed = 255; 609 anim_speed = 255;
477 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
478 anim_speed = 1; 611 anim_speed = 1;
479 else 612 else
480 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
481 } 614 }
482 615
483 if (anim_speed > 255) 616 if (anim_speed > 255)
484 anim_speed = 255; 617 anim_speed = 255;
485 } 618 }
… …
488 } 621 }
489 622
490 if (flags & UPD_NROF) 623 if (flags & UPD_NROF)
491 sl << uint32 (op->nrof); 624 sl << uint32 (op->nrof);
492 625
493 Send_With_Handling (pl->contr->socket, &sl); 626 pl->contr->ns->send_packet (sl);
494} 627}
495 628
496/** 629/**
497 * Sends item's info to player. 630 * Sends item's info to player.
498 */ 631 */
499void 632void
500esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
501{ 634{
635 if (!pl->contr->ns)
636 return;
637
502 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
503 if (op != pl) 639 if (op != pl)
504 { 640 {
505 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
506 if (!LOOK_OBJ (op)) 642 if (!op->client_visible ())
507 return; 643 return;
644
508 /* if the item is on the ground, mark that the look needs to 645 /* if the item is on the ground, mark that the look needs to
509 * be updated. 646 * be updated.
510 */ 647 */
511 if (!op->env) 648 if (!op->env)
512 { 649 {
513 pl->contr->socket->update_look = 1; 650 pl->contr->ns->floorbox_update ();
514 return; 651 return;
515 } 652 }
516 } 653 }
517 654
518 packet sl; 655 packet sl;
519 656
520 sl.printf ("item%d ", pl->contr->socket->itemcmd); 657 sl.printf ("item%d ", pl->contr->ns->itemcmd);
521 658
522 if (op->head) 659 if (op->head)
523 op = op->head; 660 op = op->head;
524 661
525 sl << uint32 (op->env ? op->env->count : 0); 662 sl << uint32 (op->env ? op->env->count : 0);
526 663
527 add_object_to_socklist (*pl->contr->socket, sl, op); 664 add_object_to_socklist (*pl->contr->ns, sl, op);
528 665
529 Send_With_Handling (pl->contr->socket, &sl); 666 pl->contr->ns->send_packet (sl);
530 SET_FLAG (op, FLAG_CLIENT_SENT); 667 SET_FLAG (op, FLAG_CLIENT_SENT);
531
532} 668}
533 669
534/** 670/**
535 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
536 * command with a -1 location. 672 * command with a -1 location.
537 */ 673 */
538
539void 674void
540esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
541{ 676{
542 packet sl; 677 if (!pl->ns)
678 return;
543 679
544 sl << "delitem " 680 packet sl ("delitem");
681
545 << uint32 (tag); 682 sl << uint32 (tag);
546 683
547 Send_With_Handling (pl->socket, &sl); 684 pl->ns->send_packet (sl);
548} 685}
549 686
550 687
551/******************************************************************************* 688/*******************************************************************************
552 * 689 *
… …
573 else if (op->type == CONTAINER && pl->container == op) 710 else if (op->type == CONTAINER && pl->container == op)
574 for (tmp = op->inv; tmp; tmp = tmp->below) 711 for (tmp = op->inv; tmp; tmp = tmp->below)
575 if (tmp->count == count) 712 if (tmp->count == count)
576 return tmp; 713 return tmp;
577 714
578 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 715 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
579 if (op->head != NULL && op->head->count == count) 716 if (op->head && op->head->count == count)
580 return op; 717 return op;
581 else if (op->count == count) 718 else if (op->count == count)
582 return op; 719 return op;
583 else if (op->type == CONTAINER && pl->container == op) 720 else if (op->type == CONTAINER && pl->container == op)
584 for (tmp = op->inv; tmp; tmp = tmp->below) 721 for (tmp = op->inv; tmp; tmp = tmp->below)
585 if (tmp->count == count) 722 if (tmp->count == count)
586 return tmp; 723 return tmp;
587 724
588 return NULL; 725 return 0;
589} 726}
590 727
591 728
592/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
593void 730void
… …
608 } 745 }
609 746
610 examine (pl->ob, op); 747 examine (pl->ob, op);
611} 748}
612 749
613/** Client wants to apply some object. Lets do so. */ 750/** Client wants to apply some object. Lets do so. */
614void 751void
615ApplyCmd (char *buf, int len, player *pl) 752ApplyCmd (char *buf, int len, player *pl)
616{ 753{
617 tag_t tag = atoi (buf); 754 tag_t tag = atoi (buf);
618 755
… …
623 return; 760 return;
624 761
625 /* If the high bit is set, player applied a pseudo object. */ 762 /* If the high bit is set, player applied a pseudo object. */
626 if (tag & 0x80000000) 763 if (tag & 0x80000000)
627 { 764 {
628 pl->socket->look_position = tag & 0x7fffffff; 765 pl->ns->look_position = tag & 0x7fffffff;
629 pl->socket->update_look = 1; 766 pl->ns->floorbox_update ();
630 return; 767 return;
631 } 768 }
632 769
633 object *op = esrv_get_ob_from_count (pl->ob, tag); 770 object *op = esrv_get_ob_from_count (pl->ob, tag);
634 771
… …
639 } 776 }
640 777
641 player_apply (pl->ob, op, 0, 0); 778 player_apply (pl->ob, op, 0, 0);
642} 779}
643 780
644/** Client wants to apply some object. Lets do so. */ 781/** Client wants to lock some object. Lets do so. */
645void 782void
646LockItem (uint8 *data, int len, player *pl) 783LockItem (char *data, int len, player *pl)
647{ 784{
648 int flag = data[0]; 785 int flag = data[0];
649 tag_t tag = net_uint32 (data + 1); 786 tag_t tag = net_uint32 ((uint8 *)data + 1);
650 object *op = esrv_get_ob_from_count (pl->ob, tag); 787 object *op = esrv_get_ob_from_count (pl->ob, tag);
651 788
652 if (!op) 789 if (!op)
653 { 790 {
654 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 791 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
661 SET_FLAG (op, FLAG_INV_LOCKED); 798 SET_FLAG (op, FLAG_INV_LOCKED);
662 799
663 esrv_update_item (UPD_FLAGS, pl->ob, op); 800 esrv_update_item (UPD_FLAGS, pl->ob, op);
664} 801}
665 802
666/** Client wants to apply some object. Lets do so. */ 803/** Client wants to mark some object. Lets do so. */
667void 804void
668MarkItem (uint8 * data, int len, player *pl) 805MarkItem (char *data, int len, player *pl)
669{ 806{
670 tag_t tag = net_uint32 (data); 807 tag_t tag = net_uint32 ((uint8 *)data);
671 object *op = esrv_get_ob_from_count (pl->ob, tag); 808 object *op = esrv_get_ob_from_count (pl->ob, tag);
672 809
673 if (!op) 810 if (!op)
674 { 811 {
675 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 812 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
702 839
703 m = get_map_from_coord (op->map, &x, &y); 840 m = get_map_from_coord (op->map, &x, &y);
704 if (!m) 841 if (!m)
705 return; 842 return;
706 843
707 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 844 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
708 845
709 for (; tmp != NULL; tmp = tmp->below) 846 for (; tmp != NULL; tmp = tmp->below)
710 { 847 {
711 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 848 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
712 continue; 849 continue;
… …
743 else 880 else
744 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 881 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
745 } 882 }
746} 883}
747 884
748
749
750/** Client wants to look at some object. Lets do so. */ 885/** Client wants to look at some object. Lets do so. */
751void 886void
752LookAt (char *buf, int len, player *pl) 887LookAt (char *buf, int len, player *pl)
753{ 888{
754 int dx, dy; 889 int dx, dy;
… …
759 { 894 {
760 return; 895 return;
761 } 896 }
762 dy = atoi (cp); 897 dy = atoi (cp);
763 898
764 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 899 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
765 return; 900 return;
766 901
767 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 902 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
768 return; 903 return;
769 904
770 look_at (pl->ob, dx, dy); 905 look_at (pl->ob, dx, dy);
771} 906}
772 907
… …
802 } 937 }
803 938
804 esrv_update_item (UPD_WEIGHT, pl, op); 939 esrv_update_item (UPD_WEIGHT, pl, op);
805 } 940 }
806 else 941 else
807 {
808 drop_object (pl, op, nrof); 942 drop_object (pl, op, nrof);
809 } 943
810 return; 944 return;
811 } 945 }
812 else if (to == pl->count) 946 else if (to == pl->count)
813 { /* pick it up to the inventory */ 947 { /* pick it up to the inventory */
814 /* return if player has already picked it up */ 948 /* return if player has already picked it up */
… …
831 * has already been done (eg, it can be picked up and fits in 965 * has already been done (eg, it can be picked up and fits in
832 * in a sack, so check for those things. We should also check 966 * in a sack, so check for those things. We should also check
833 * an make sure env is in fact a container for that matter. 967 * an make sure env is in fact a container for that matter.
834 */ 968 */
835 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 969 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
836 {
837 put_object_in_sack (pl, env, op, nrof); 970 put_object_in_sack (pl, env, op, nrof);
838 }
839} 971}
840 972

Diff Legend

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