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.47 by root, Tue Jun 5 13:05:03 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * 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 along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20 21 *
21 The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors 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
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
42 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 ns.send_face (head->face);
128 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
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 ns.send_animation (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 (player *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
340 object *ob = pl->ob;
341
202 if (!pl->contr->socket->update_look) 342 if (!pl->ns->update_look)
203 { 343 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
205 return; 345 return;
206 } 346 }
207 else 347 else
208 pl->contr->socket->update_look = 0; 348 pl->ns->update_look = 0;
209 349
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (ob, FLAG_REMOVED)
211 || !pl->map 351 || !ob->map
212 || pl->map->in_memory != MAP_IN_MEMORY 352 || ob->map->in_memory != MAP_IN_MEMORY
213 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (ob->map, ob->x, ob->y))
214 return; 354 return;
215 355
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 356 pl->ns->send_packet ("delinv 0");
217 ;
218 357
219 packet sl; 358 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 359 sl.printf ("item%d ", pl->ns->itemcmd);
224 360
225 sl << uint32 (0); 361 sl << uint32 (0);
226 362
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 363 pl->ns->send_face (empty_face);
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 364 pl->ns->flush_fx ();
229 365
230 if (pl->contr->socket->look_position) 366 if (pl->ns->look_position)
231 { 367 {
232 char buf[80]; 368 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS); 369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
234 370
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
236 << uint32 (0) 372 << uint32 (0)
237 << sint32 (-1) 373 << sint32 (-1)
238 << uint32 (empty_face->number) 374 << uint32 (empty_face)
239 << data8 (buf) 375 << data8 (buf)
240 << uint16 (0) 376 << uint16 (0)
241 << uint8 (0) 377 << uint8 (0)
242 << uint32 (0); 378 << uint32 (0);
243 379
244 if (pl->contr->socket->itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
245 sl << uint16 (0); 381 sl << uint16 (0);
246 } 382 }
247 383
384 object *tmp = ob->ms ().top;
248 for (last = NULL; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
249 { 386 {
250 object *head; 387 object *head;
251 388
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
253 { 390 {
254 last = tmp->below; /* assumes double floor mode */ 391 last = tmp->below; /* assumes double floor mode */
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
256 last = last->below; 393 last = last->below;
257 } 394 }
258 395
259 if (LOOK_OBJ (tmp)) 396 if (tmp->client_visible ())
260 { 397 {
261 if (++start_look < pl->contr->socket->look_position) 398 if (++start_look < pl->ns->look_position)
262 continue; 399 continue;
263 400
264 end_look++; 401 end_look++;
265 402
266 if (end_look > NUM_LOOK_OBJECTS) 403 if (end_look > FLOORBOX_PAGESIZE)
267 { 404 {
268 /* What we basically do is make a 'fake' object - when the user applies it, 405 /* 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. 406 * we notice the special tag the object has, and act accordingly.
270 */ 407 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS)) 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
272 << uint32 (0) 409 << uint32 (0)
273 << uint32 ((uint32) - 1) 410 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number) 411 << uint32 (empty_face)
275 << data8 ("Apply this to see next group of items") 412 << data8 ("Apply this to see next group of items")
276 << uint16 (0) 413 << uint16 (0)
277 << uint8 (0) 414 << uint8 (0)
278 << uint32 (0); 415 << uint32 (0);
279 416
280 if (pl->contr->socket->itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
281 sl << uint16 (0); 418 sl << uint16 (0);
282 419
283 break; 420 break;
284 } 421 }
285 422
286 if (tmp->head) 423 if (tmp->head)
287 head = tmp->head; 424 head = tmp->head;
288 else 425 else
289 head = tmp; 426 head = tmp;
290 427
291 add_object_to_socklist (*pl->contr->socket, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
292 got_one++; 429 got_one++;
293 430
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 { 432 {
296 pl->contr->socket->send_packet (sl); 433 pl->ns->send_packet (sl);
297 434
298 sl.reset (); 435 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
300 sl << uint32 (0); 437 sl << uint32 (0);
301 got_one = 0; 438 got_one = 0;
302 } 439 }
303 } /* If LOOK_OBJ() */ 440 }
304 } 441 }
305 442
306 if (got_one) 443 if (got_one)
307 pl->contr->socket->send_packet (sl); 444 pl->ns->send_packet (sl);
308 445
309} 446}
310 447
311/** 448/**
312 * Sends whole inventory. 449 * Sends whole inventory.
313 */ 450 */
314void 451void
315esrv_send_inventory (object *pl, object *op) 452esrv_send_inventory (object *pl, object *op)
316{ 453{
317 object *tmp; 454 if (!pl->contr->ns)//D
455 return;
456
318 int got_one = 0; 457 int got_one = 0;
319 458
459 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
460
320 packet sl; 461 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); 462 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 463
328 sl << uint32 (op->count); 464 sl << uint32 (op->count);
329 465
330 for (tmp = op->inv; tmp; tmp = tmp->below) 466 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 467 {
332 object *head; 468 object *head;
333 469
334 if (tmp->head) 470 if (tmp->head)
335 head = tmp->head; 471 head = tmp->head;
336 else 472 else
337 head = tmp; 473 head = tmp;
338 474
339 if (LOOK_OBJ (head)) 475 if (head->client_visible ())
340 { 476 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 477 add_object_to_socklist (*pl->contr->ns, sl, head);
342 478
343 got_one++; 479 got_one++;
344 480
345 /* IT is possible for players to accumulate a huge amount of 481 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 482 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 483 * overflow the buffer. IF so, send multiple item commands.
348 */ 484 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
350 { 486 {
351 pl->contr->socket->send_packet (sl); 487 pl->contr->ns->send_packet (sl);
352 488
353 sl.reset (); 489 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 491 sl << uint32 (op->count);
356 got_one = 0; 492 got_one = 0;
357 } 493 }
358 } /* If LOOK_OBJ() */ 494 }
359 } 495 }
360 496
361 if (got_one) 497 if (got_one)
362 pl->contr->socket->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
363
364} 499}
365 500
366/** 501/**
367 * Updates object *op for player *pl. 502 * Updates object *op for player *pl.
368 * 503 *
369 * flags is a list of values to update 504 * flags is a list of values to update
370 * to the client (as defined in newclient.h - might as well use the 505 * to the client (as defined in newclient.h - might as well use the
371 * same value both places. 506 * same value both places.
372 */ 507 */
373
374void 508void
375esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
376{ 510{
377 /* 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. */
378 if (op != pl) 512 if (op != pl)
379 { 513 {
380 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
381 return; 515 return;
382 /* 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
383 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
384 * order. 518 * order.
385 */ 519 */
386 } 520 }
387 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
388 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
389 { 527 {
390 /* 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
391 * 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
392 * and track back the call. 530 * and track back the call.
393 */ 531 */
394 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);
395 } 533 }
396 534
397 packet sl; 535 packet sl ("upditem");
398 536
399 sl << "upditem "
400 << uint8 (flags); 537 sl << uint8 (flags);
401 538
402 if (op->head) 539 if (op->head)
403 op = op->head; 540 op = op->head;
404 541
405 sl << uint32 (op->count); 542 sl << uint32 (op->count);
… …
415 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
416 553
417 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
418 555
419 if (pl == op) 556 if (pl == op)
420 op->contr->last_weight = weight; 557 ns->last_weight = weight;
421 } 558 }
422 559
423 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
424 { 561 {
425 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 ns->send_face (op->face);
426 esrv_send_face (pl->contr->socket, op->face->number, 0); 563 ns->flush_fx ();
427
428 sl << uint32 (op->face->number); 564 sl << uint32 (op->face);
429 } 565 }
430 566
431 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
432 { 568 {
433 int len; 569 int len;
… …
467 { 603 {
468 if (op->anim_speed) 604 if (op->anim_speed)
469 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
470 else 606 else
471 { 607 {
472 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
473 anim_speed = 255; 609 anim_speed = 255;
474 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
475 anim_speed = 1; 611 anim_speed = 1;
476 else 612 else
477 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
478 } 614 }
479 615
480 if (anim_speed > 255) 616 if (anim_speed > 255)
481 anim_speed = 255; 617 anim_speed = 255;
482 } 618 }
… …
485 } 621 }
486 622
487 if (flags & UPD_NROF) 623 if (flags & UPD_NROF)
488 sl << uint32 (op->nrof); 624 sl << uint32 (op->nrof);
489 625
490 pl->contr->socket->send_packet (sl); 626 pl->contr->ns->send_packet (sl);
491} 627}
492 628
493/** 629/**
494 * Sends item's info to player. 630 * Sends item's info to player.
495 */ 631 */
496void 632void
497esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
498{ 634{
635 if (!pl->contr->ns)
636 return;
637
499 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
500 if (op != pl) 639 if (op != pl)
501 { 640 {
502 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
503 if (!LOOK_OBJ (op)) 642 if (!op->client_visible ())
504 return; 643 return;
644
505 /* 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
506 * be updated. 646 * be updated.
507 */ 647 */
508 if (!op->env) 648 if (!op->env)
509 { 649 {
510 pl->contr->socket->update_look = 1; 650 pl->contr->ns->floorbox_update ();
511 return; 651 return;
512 } 652 }
513 } 653 }
514 654
515 packet sl; 655 packet sl;
516 656
517 sl.printf ("item%d ", pl->contr->socket->itemcmd); 657 sl.printf ("item%d ", pl->contr->ns->itemcmd);
518 658
519 if (op->head) 659 if (op->head)
520 op = op->head; 660 op = op->head;
521 661
522 sl << uint32 (op->env ? op->env->count : 0); 662 sl << uint32 (op->env ? op->env->count : 0);
523 663
524 add_object_to_socklist (*pl->contr->socket, sl, op); 664 add_object_to_socklist (*pl->contr->ns, sl, op);
525 665
526 pl->contr->socket->send_packet (sl); 666 pl->contr->ns->send_packet (sl);
527 SET_FLAG (op, FLAG_CLIENT_SENT); 667 SET_FLAG (op, FLAG_CLIENT_SENT);
528
529} 668}
530 669
531/** 670/**
532 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
533 * command with a -1 location. 672 * command with a -1 location.
534 */ 673 */
535
536void 674void
537esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
538{ 676{
539 packet sl; 677 if (!pl->ns)
678 return;
540 679
541 sl << "delitem " 680 packet sl ("delitem");
681
542 << uint32 (tag); 682 sl << uint32 (tag);
543 683
544 pl->socket->send_packet (sl); 684 pl->ns->send_packet (sl);
545} 685}
546 686
547 687
548/******************************************************************************* 688/*******************************************************************************
549 * 689 *
… …
553 693
554/** 694/**
555 * Takes a player and object count (tag) and returns the actual object 695 * Takes a player and object count (tag) and returns the actual object
556 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
557 */ 697 */
558
559object * 698object *
560esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
561{ 700{
562 object *op, *tmp;
563
564 if (pl->count == count) 701 if (pl->count == count)
565 return pl; 702 return pl;
566 703
567 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
568 if (op->count == count) 705 if (op->count == count)
569 return op; 706 return op;
570 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
571 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
572 if (tmp->count == count) 709 if (tmp->count == count)
573 return tmp; 710 return tmp;
574 711
575 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 712 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
576 if (op->head != NULL && op->head->count == count) 713 if (op->head && op->head->count == count)
577 return op; 714 return op;
578 else if (op->count == count) 715 else if (op->count == count)
579 return op; 716 return op;
580 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
581 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
582 if (tmp->count == count) 719 if (tmp->count == count)
583 return tmp; 720 return tmp;
584 721
722#if 0
723 /* If the high bit is set, player examined a pseudo object. */
724 if (count & 0x80000000)
725 return 0;
726#endif
727
585 return NULL; 728 return 0;
586} 729}
587
588 730
589/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
590void 732void
591ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
592{ 734{
593 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
594 736
595 /* If the high bit is set, player examined a pseudo object. */
596 if (tag & 0x80000000)
597 return;
598
599 object *op = esrv_get_ob_from_count (pl->ob, tag); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
600 738
601 if (!op) 739 if (!op)
602 { 740 {
603 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
605 } 743 }
606 744
607 examine (pl->ob, op); 745 examine (pl->ob, op);
608} 746}
609 747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (char *buf, int len, player *pl)
751{
752 tag_t tag = atoi (buf);
753
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 {
756 std::string s = op->describe (pl->ob);
757
758 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str ();
760
761 pl->ns->send_packet (sl);
762 }
763}
764
610/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
611void 766void
612ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
613{ 768{
614 tag_t tag = atoi (buf); 769 tag_t tag = atoi (buf);
615 770
… …
620 return; 775 return;
621 776
622 /* If the high bit is set, player applied a pseudo object. */ 777 /* If the high bit is set, player applied a pseudo object. */
623 if (tag & 0x80000000) 778 if (tag & 0x80000000)
624 { 779 {
625 pl->socket->look_position = tag & 0x7fffffff; 780 pl->ns->look_position = tag & 0x7fffffff;
626 pl->socket->update_look = 1; 781 pl->ns->floorbox_update ();
627 return; 782 return;
628 } 783 }
629 784
630 object *op = esrv_get_ob_from_count (pl->ob, tag); 785 object *op = esrv_get_ob_from_count (pl->ob, tag);
631 786
… …
636 } 791 }
637 792
638 player_apply (pl->ob, op, 0, 0); 793 player_apply (pl->ob, op, 0, 0);
639} 794}
640 795
641/** Client wants to apply some object. Lets do so. */ 796/** Client wants to lock some object. Lets do so. */
642void 797void
643LockItem (char *data, int len, player *pl) 798LockItem (char *data, int len, player *pl)
644{ 799{
645 int flag = data[0]; 800 int flag = data[0];
646 tag_t tag = net_uint32 ((uint8 *)data + 1); 801 tag_t tag = net_uint32 ((uint8 *)data + 1);
… …
658 SET_FLAG (op, FLAG_INV_LOCKED); 813 SET_FLAG (op, FLAG_INV_LOCKED);
659 814
660 esrv_update_item (UPD_FLAGS, pl->ob, op); 815 esrv_update_item (UPD_FLAGS, pl->ob, op);
661} 816}
662 817
663/** Client wants to apply some object. Lets do so. */ 818/** Client wants to mark some object. Lets do so. */
664void 819void
665MarkItem (char *data, int len, player *pl) 820MarkItem (char *data, int len, player *pl)
666{ 821{
667 tag_t tag = net_uint32 ((uint8 *)data); 822 tag_t tag = net_uint32 ((uint8 *)data);
668 object *op = esrv_get_ob_from_count (pl->ob, tag); 823 object *op = esrv_get_ob_from_count (pl->ob, tag);
… …
681 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
682 * 837 *
683 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
684 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
685 */ 840 */
686void 841static void
687look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
688{ 843{
689 object *tmp; 844 object *ob = pl->ob;
845
846 maptile *m = pl->observe->map;
847 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy;
849
850 if (!xy_normalise (m, x, y))
851 {
852 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
853 return;
854 }
855
690 int flag = 0; 856 int flag = 0;
691 sint16 x, y;
692 maptile *m;
693 857
694 x = op->x + dx; 858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
695 y = op->y + dy;
696
697 if (out_of_map (op->map, x, y))
698 return;
699
700 m = get_map_from_coord (op->map, &x, &y);
701 if (!m)
702 return;
703
704 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
705
706 for (; tmp != NULL; tmp = tmp->below)
707 { 859 {
708 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
709 continue; 861 continue;
710 862
711 if (!flag) 863 if (!flag)
712 { 864 {
713 if (dx || dy) 865 if (dx || dy)
714 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 866 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
715 else 867 else
716 {
717 clear_win_info (op);
718 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 868 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
719 } 869
720 flag = 1; 870 flag = 1;
721 } 871 }
722 872
723 if (QUERY_FLAG (op, FLAG_WIZ)) 873 if (QUERY_FLAG (ob, FLAG_WIZ))
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
725 else 875 else
726 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
727 877
728 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
729 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) 879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
730 inventory (op, tmp->head == NULL ? tmp : tmp->head); 880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
731 881
732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
733 break; 883 break;
734 } 884 }
735 885
736 if (!flag) 886 if (!flag)
737 { 887 {
738 if (dx || dy) 888 if (dx || dy)
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
740 else 890 else
741 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
742 } 892 }
743} 893}
744
745
746 894
747/** Client wants to look at some object. Lets do so. */ 895/** Client wants to look at some object. Lets do so. */
748void 896void
749LookAt (char *buf, int len, player *pl) 897LookAt (char *buf, int len, player *pl)
750{ 898{
751 int dx, dy; 899 int dx, dy;
752 char *cp; 900 char *cp;
753 901
754 dx = atoi (buf); 902 dx = atoi (buf);
755 if (!(cp = strchr (buf, ' '))) 903 if (!(cp = strchr (buf, ' ')))
756 {
757 return; 904 return;
758 } 905
759 dy = atoi (cp); 906 dy = atoi (cp);
760
761 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 907 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
762 return; 908 return;
763 909
764 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 910 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
765 return; 911 return;
766 912
767 look_at (pl->ob, dx, dy); 913 look_at (pl, dx, dy);
768} 914}
769 915
770/** Move an object to a new location */ 916/** Move an object to a new location */
771void 917void
772esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 918esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
799 } 945 }
800 946
801 esrv_update_item (UPD_WEIGHT, pl, op); 947 esrv_update_item (UPD_WEIGHT, pl, op);
802 } 948 }
803 else 949 else
804 {
805 drop_object (pl, op, nrof); 950 drop_object (pl, op, nrof);
806 } 951
807 return; 952 return;
808 } 953 }
809 else if (to == pl->count) 954 else if (to == pl->count)
810 { /* pick it up to the inventory */ 955 { /* pick it up to the inventory */
811 /* return if player has already picked it up */ 956 /* return if player has already picked it up */
… …
828 * has already been done (eg, it can be picked up and fits in 973 * 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 974 * 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. 975 * an make sure env is in fact a container for that matter.
831 */ 976 */
832 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 977 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); 978 put_object_in_sack (pl, env, op, nrof);
835 }
836} 979}
837 980

Diff Legend

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