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.31 by root, Mon Jan 8 18:18:36 2007 UTC vs.
Revision 1.77 by root, Mon Jan 12 03:40:21 2009 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 7 *
8 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
9 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
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your option) any later version.
12 12 *
13 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,
14 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 GNU General Public License for more details. 16 * GNU General Public License for more details.
17 17 *
18 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
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The author can be reached via e-mail to <crossfire@schmorp.de>
23*/ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client/server logic. 26 * Client/server logic.
28 * 27 *
29 * \date 2003-12-02 28 * \date 2003-12-02
30 * 29 *
31 * This containes item logic for client/server. It doesn't contain 30 * This contains item logic for client/server. It doesn't contain
32 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
33 * the logic for what items should be sent. 32 * the logic for what items should be sent.
34 */ 33 */
35 34
36#include <global.h> 35#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
38#include <sproto.h> 37#include <sproto.h>
39 38
40/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
41#define MAXITEMLEN 300 40#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
182 41
183/******************************************************************************* 42/*******************************************************************************
184 * 43 *
185 * Functions related to sending object data to the client. 44 * Functions related to sending object data to the client.
186 * 45 *
… …
194query_flags (object *op) 53query_flags (object *op)
195{ 54{
196 unsigned int flags = 0; 55 unsigned int flags = 0;
197 56
198 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
199 {
200 switch (op->type) 58 switch (op->type)
201 { 59 {
202 case BOW: 60 case BOW:
203 case WAND: 61 case WAND:
204 case ROD: 62 case ROD:
205 case HORN: 63 case HORN:
206 flags = a_readied; 64 flags = a_readied;
207 break; 65 break;
208 case WEAPON: 66 case WEAPON:
209 flags = a_wielded; 67 flags = a_wielded;
210 break; 68 break;
211 case SKILL: 69 case SKILL:
212 case ARMOUR: 70 case ARMOUR:
213 case HELMET: 71 case HELMET:
214 case SHIELD: 72 case SHIELD:
215 case RING: 73 case RING:
216 case BOOTS: 74 case BOOTS:
217 case GLOVES: 75 case GLOVES:
218 case AMULET: 76 case AMULET:
219 case GIRDLE: 77 case GIRDLE:
220 case BRACERS: 78 case BRACERS:
221 case CLOAK: 79 case CLOAK:
222 flags = a_worn; 80 flags = a_worn;
223 break; 81 break;
224 case CONTAINER: 82 case CONTAINER:
225 flags = a_active; 83 flags = a_active;
226 break; 84 break;
227 default: 85 default:
228 flags = a_applied; 86 flags = a_applied;
229 break; 87 break;
230 } 88 }
231 }
232 89
233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
234 flags |= F_OPEN; 91 flags |= F_OPEN;
235 92
236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
256 * animation of face to the client. 113 * animation of face to the client.
257 */ 114 */
258static void 115static void
259add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
260{ 117{
261 int flags, len, anim_speed;
262 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
263 const char *item_p; 119 const char *item_p;
264 120
265 flags = query_flags (head); 121 int flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 123 flags |= F_NOPICK;
268 124
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 125 ns.send_face (head->face, -50);
270 esrv_send_face (&ns, head->face->number, 0); 126 ns.flush_fx ();
271 127
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 128 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 129 ns.send_animation (head->animation_id);
274 130
275 sl << uint32 (head->count) 131 sl << uint32 (head->count)
276 << uint32 (flags) 132 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278 << uint32 (head->face->number); 134 << uint32 (head->face);
135
136 int len;
279 137
280 if (!head->custom_name) 138 if (!head->custom_name)
281 { 139 {
282 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 141 item_n[127] = 0;
… …
297 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
298 156
299 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
300 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
301 159
302 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
303 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
304 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
305 if (head->anim_speed)
306 anim_speed = head->anim_speed;
307 else
308 {
309 if (FABS (head->speed) < 0.001)
310 anim_speed = 255;
311 else if (FABS (head->speed) >= 1.0)
312 anim_speed = 1;
313 else
314 anim_speed = (int) (1.0 / FABS (head->speed));
315 }
316
317 if (anim_speed > 255)
318 anim_speed = 255;
319 }
320 163
321 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
322 << uint32 (head->nrof); 165 << uint32 (head->nrof);
323 166
324 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
325 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
326
327 SET_FLAG (head, FLAG_CLIENT_SENT);
328} 169}
329 170
171static faceidx
172need_face_now (player *pl, const char *name)
173{
174 faceidx face = face_find (name, empty_face);
175
176 pl->ns->send_face (face, -50);
177 pl->ns->flush_fx ();
178
179 return face;
180}
181
182#define FINGER_UP "finger_up.x11"
183#define FINGER_DOWN "finger_down.x11"
330 184
331/** 185/**
332 * Send the look window. Don't need to do animations here 186 * Send the look window. Don't need to do animations here
333 * This sends all the faces to the client, not just updates. This is 187 * This sends all the faces to the client, not just updates. This is
334 * because object ordering would otherwise be inconsistent. 188 * because object ordering would otherwise be inconsistent.
335 */ 189 */
336void 190void
337esrv_draw_look (object *pl) 191esrv_draw_look (player *pl)
338{ 192{
339 object *tmp, *last; 193 object *ob = pl->ob;
340 int got_one = 0, start_look = 0, end_look = 0;
341 char buf[MAX_BUF];
342 194
343 if (!pl->contr->ns->update_look) 195 if (!pl->ns->update_look)
344 { 196 {
345 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 197 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
346 return; 198 return;
347 } 199 }
348 else 200
349 pl->contr->ns->update_look = 0; 201 pl->ns->update_look = 0;
350 202
351 if (QUERY_FLAG (pl, FLAG_REMOVED) 203 if (QUERY_FLAG (ob, FLAG_REMOVED)
352 || !pl->map 204 || !ob->map
353 || pl->map->in_memory != MAP_IN_MEMORY 205 || ob->map->in_memory != MAP_ACTIVE
354 || out_of_map (pl->map, pl->x, pl->y)) 206 || out_of_map (ob->map, ob->x, ob->y))
355 return; 207 return;
356 208
357 for (tmp = GET_MAP_OB (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above)
358 ;
359
360 pl->contr->ns->send_packet ("delinv 0"); 209 pl->ns->send_packet ("delinv 0");
361 210
362 packet sl; 211 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
364 213
365 sl << uint32 (0); 214 sl << uint32 (0);
366 215
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 216 int start_pos = pl->ns->look_position;
368 esrv_send_face (pl->contr->ns, empty_face->number, 0); 217 bool dirty = false;
369 218
370 if (pl->contr->ns->look_position) 219 mapspace &ms = ob->ms ();
220
221 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
222 // start from the top
223 object *items [FLOORBOX_PAGESIZE];
224 int item_idx = 0, item_cnt = 0;
225 int pos = 0;
226
227 // find our items by walking down
228 object *item = ms.top;
229
230 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
231 {
232 if (!item->client_visible ())
233 continue;
234
235 if (++pos < start_pos)
236 continue;
237
238 // record item
239 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
240 item_cnt++;
241
242 // stop at first floor
243 if (item->flag [FLAG_IS_FLOOR])
244 {
245 // we are finished, don't append "next group of items"
246 // by setting item to ms.bot it becomes zero which is checked after the while loop
247 item = ms.bot;
248 }
371 { 249 }
372 char buf[80];
373 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
374 250
251 // see if there are more if we cared - we ignore invisible objects
252 if (item)
253 {
254 /* What we basically do is make a 'fake' object - when the user applies it,
255 * we notice the special tag the object has, and act accordingly.
256 */
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 257 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
376 << uint32 (0) 258 << uint32 (0)
377 << sint32 (-1) 259 << uint32 ((uint32) - 1)
378 << uint32 (empty_face->number) 260 << uint32 (need_face_now (pl, FINGER_DOWN))
379 << data8 (buf) 261 << data8 ("Apply this to see the items below")
380 << uint16 (0) 262 << uint16 (0)
381 << uint8 (0) 263 << uint8 (0)
382 << uint32 (0); 264 << uint32 (0);
383 265
384 if (pl->contr->ns->itemcmd == 2) 266 if (pl->ns->itemcmd == 2)
385 sl << uint16 (0); 267 sl << uint16 (0);
386 }
387 268
388 for (last = NULL; tmp != last; tmp = tmp->below) 269 dirty = true;
389 { 270 }
390 object *head;
391 271
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 272 // now send out all items in the ring buffer in reverse order
273 while (item_cnt)
274 {
275 --item_cnt;
276 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
277 object *item = items [item_idx];
278
279 add_object_to_socklist (*pl->ns, sl, item->head_ ());
280
281 dirty = true;
282
283 // if packet got too large, send it and begin a new one
284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
393 { 285 {
394 last = tmp->below; /* assumes double floor mode */ 286 pl->ns->send_packet (sl);
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 287
396 last = last->below; 288 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0);
291
292 dirty = false;
397 } 293 }
398
399 if (LOOK_OBJ (tmp))
400 {
401 if (++start_look < pl->contr->ns->look_position)
402 continue;
403
404 end_look++;
405
406 if (end_look > FLOORBOX_PAGESIZE)
407 {
408 /* What we basically do is make a 'fake' object - when the user applies it,
409 * we notice the special tag the object has, and act accordingly.
410 */
411 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
412 << uint32 (0)
413 << uint32 ((uint32) - 1)
414 << uint32 (empty_face->number)
415 << data8 ("Apply this to see next group of items")
416 << uint16 (0)
417 << uint8 (0)
418 << uint32 (0);
419
420 if (pl->contr->ns->itemcmd == 2)
421 sl << uint16 (0);
422
423 break;
424 }
425
426 if (tmp->head)
427 head = tmp->head;
428 else
429 head = tmp;
430
431 add_object_to_socklist (*pl->contr->ns, sl, head);
432 got_one++;
433
434 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
435 {
436 pl->contr->ns->send_packet (sl);
437
438 sl.reset ();
439 sl.printf ("item%d ", pl->contr->ns->itemcmd);
440 sl << uint32 (0);
441 got_one = 0;
442 }
443 }
444 } 294 }
445 295
446 if (got_one) 296 if (start_pos)
297 {
298 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
299 << uint32 (0)
300 << sint32 (-1)
301 << uint32 (need_face_now (pl, FINGER_UP))
302 << data8 ("Apply this to see the items higher up")
303 << uint16 (0)
304 << uint8 (0)
305 << uint32 (0);
306
307 if (pl->ns->itemcmd == 2)
308 sl << uint16 (0);
309
310 dirty = true;
311 }
312
313 if (dirty)
447 pl->contr->ns->send_packet (sl); 314 pl->ns->send_packet (sl);
448
449} 315}
450 316
451/** 317/**
452 * Sends whole inventory. 318 * Sends whole inventory.
453 */ 319 */
454void 320void
455esrv_send_inventory (object *pl, object *op) 321esrv_send_inventory (object *pl, object *op)
456{ 322{
457 object *tmp; 323 if (!pl->contr->ns)//D
324 return;
325
458 int got_one = 0; 326 int got_one = 0;
459
460 327
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 328 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 329
463 packet sl; 330 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 331 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 332
466 sl << uint32 (op->count); 333 sl << uint32 (op->count);
467 334
468 for (tmp = op->inv; tmp; tmp = tmp->below) 335 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 336 {
470 object *head; 337 object *head;
471 338
472 if (tmp->head) 339 if (tmp->head)
473 head = tmp->head; 340 head = tmp->head;
474 else 341 else
475 head = tmp; 342 head = tmp;
476 343
477 if (LOOK_OBJ (head)) 344 if (head->client_visible ())
478 { 345 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 346 add_object_to_socklist (*pl->contr->ns, sl, head);
480 347
481 got_one++; 348 got_one++;
482 349
483 /* IT is possible for players to accumulate a huge amount of 350 /* IT is possible for players to accumulate a huge amount of
484 * items (especially with some of the bags out there) to 351 * items (especially with some of the bags out there) to
485 * overflow the buffer. IF so, send multiple item commands. 352 * overflow the buffer. IF so, send multiple item commands.
486 */ 353 */
487 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 354 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
488 { 355 {
489 pl->contr->ns->send_packet (sl); 356 pl->contr->ns->send_packet (sl);
490 357
491 sl.reset (); 358 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 359 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 360 sl << uint32 (op->count);
494 got_one = 0; 361 got_one = 0;
495 } 362 }
496 } /* If LOOK_OBJ() */ 363 }
497 } 364 }
498 365
499 if (got_one) 366 if (got_one)
500 pl->contr->ns->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
501} 368}
… …
505 * 372 *
506 * flags is a list of values to update 373 * flags is a list of values to update
507 * to the client (as defined in newclient.h - might as well use the 374 * to the client (as defined in newclient.h - might as well use the
508 * same value both places. 375 * same value both places.
509 */ 376 */
510
511void 377void
512esrv_update_item (int flags, object *pl, object *op) 378esrv_update_item (int flags, object *pl, object *op)
513{ 379{
514 /* If we have a request to send the player item, skip a few checks. */ 380 /* If we have a request to send the player item, skip a few checks. */
515 if (op != pl) 381 if (op != pl && !op->client_visible ())
516 {
517 if (!LOOK_OBJ (op))
518 return; 382 return;
519 /* we remove the check for op->env, because in theory, the object
520 * is hopefully in the same place, so the client should preserve
521 * order.
522 */
523 }
524 383
525 client *ns = pl->contr->ns; 384 client *ns = pl->contr->ns;
526 if (!ns) 385 if (!ns)
527 return; 386 return;
528 387
529 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
530 {
531 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
532 * this is happening - we can set a breakpoint here in the debugger
533 * and track back the call.
534 */
535 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
536 }
537
538 packet sl ("upditem"); 388 packet sl ("upditem");
539 389
540 sl << uint8 (flags); 390 sl << uint8 (flags);
541 391
542 if (op->head)
543 op = op->head; 392 op = op->head_ ();
544 393
545 sl << uint32 (op->count); 394 sl << uint32 (op->count);
546 395
547 if (flags & UPD_LOCATION) 396 if (flags & UPD_LOCATION)
548 sl << uint32 (op->env ? op->env->count : 0); 397 sl << uint32 (op->env ? op->env->count : 0);
… …
550 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
551 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
552 401
553 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
554 { 403 {
555 sint32 weight = WEIGHT (op); 404 sint32 weight = op->client_weight ();
556 405
557 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 406 if (op == pl)
558
559 if (pl == op)
560 ns->last_weight = weight; 407 ns->last_weight = weight;
408
409 sl << uint32 (weight);
561 } 410 }
562 411
563 if (flags & UPD_FACE) 412 if (flags & UPD_FACE)
564 { 413 {
565 if (!(ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 414 ns->send_face (op->face, -50);
566 esrv_send_face (ns, op->face->number, 0); 415 ns->flush_fx ();
567
568 sl << uint32 (op->face->number); 416 sl << uint32 (op->face);
569 } 417 }
570 418
571 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
572 { 420 {
573 int len; 421 int len;
574 const char *item_p; 422 const char *item_p;
575 char item_n[MAX_BUF]; 423 char item_n[127 * 2];
576 424
577 if (!op->custom_name) 425 if (!op->custom_name)
578 { 426 {
579 strncpy (item_n, query_base_name (op, 0), 127); 427 len = assign (item_n, query_base_name (op, 0), 127);
580 item_n[127] = 0;
581 len = strlen (item_n);
582 item_p = query_base_name (op, 1); 428 item_p = query_base_name (op, 1);
583 } 429 }
584 else 430 else
585 { 431 {
586 strncpy (item_n, op->custom_name, 127); 432 len = assign (item_n, &op->custom_name, 127);
587 item_n[127] = 0;
588 len = strlen (item_n);
589 item_p = op->custom_name; 433 item_p = &op->custom_name;
590 } 434 }
591 435
592 strncpy (item_n + len + 1, item_p, 127); 436 len += assign (item_n + len, item_p, 127);
593 item_n[254] = 0;
594 len += strlen (item_n + 1 + len) + 1;
595 437
596 sl << data8 (item_n, len); 438 sl << data8 (item_n, len);
597 } 439 }
598 440
599 if (flags & UPD_ANIM) 441 if (flags & UPD_ANIM)
… …
607 { 449 {
608 if (op->anim_speed) 450 if (op->anim_speed)
609 anim_speed = op->anim_speed; 451 anim_speed = op->anim_speed;
610 else 452 else
611 { 453 {
612 if (FABS (op->speed) < 0.001) 454 if (fabs (op->speed) < 0.001)
613 anim_speed = 255; 455 anim_speed = 255;
614 else if (FABS (op->speed) >= 1.0) 456 else if (fabs (op->speed) >= 1.0)
615 anim_speed = 1; 457 anim_speed = 1;
616 else 458 else
617 anim_speed = (int) (1.0 / FABS (op->speed)); 459 anim_speed = (int) (1.0 / fabs (op->speed));
618 } 460 }
619 461
620 if (anim_speed > 255) 462 if (anim_speed > 255)
621 anim_speed = 255; 463 anim_speed = 255;
622 } 464 }
… …
634 * Sends item's info to player. 476 * Sends item's info to player.
635 */ 477 */
636void 478void
637esrv_send_item (object *pl, object *op) 479esrv_send_item (object *pl, object *op)
638{ 480{
639 /* If this is not the player object, do some more checks */ 481 if (!pl->contr->ns)
640 if (op != pl)
641 {
642 /* We only send 'visibile' objects to the client */
643 if (!LOOK_OBJ (op))
644 return; 482 return;
645 /* if the item is on the ground, mark that the look needs to 483
646 * be updated. 484 /* We only send 'visible' objects to the client, and sometimes the player */
647 */ 485 if (!op->client_visible () && op->type != PLAYER)
648 if (!op->env)
649 {
650 pl->contr->ns->floorbox_update ();
651 return; 486 return;
652 }
653 }
654 487
655 packet sl; 488 packet sl;
656 489
657 sl.printf ("item%d ", pl->contr->ns->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
658 491
659 if (op->head)
660 op = op->head; 492 op = op->head_ ();
661 493
662 sl << uint32 (op->env ? op->env->count : 0); 494 sl << uint32 (op->env ? op->env->count : 0);
663 495
664 add_object_to_socklist (*pl->contr->ns, sl, op); 496 add_object_to_socklist (*pl->contr->ns, sl, op);
665 497
666 pl->contr->ns->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 499}
669 500
670/** 501/**
671 * Tells the client to delete an item. Uses the item 502 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 503 */
674
675void 504void
676esrv_del_item (player *pl, int tag) 505esrv_del_item (player *pl, int tag)
677{ 506{
507 if (!pl->ns)
508 return;
509
678 packet sl ("delitem"); 510 packet sl ("delitem");
679 511
680 sl << uint32 (tag); 512 sl << uint32 (tag);
681 513
682 pl->ns->send_packet (sl); 514 pl->ns->send_packet (sl);
… …
691 523
692/** 524/**
693 * Takes a player and object count (tag) and returns the actual object 525 * Takes a player and object count (tag) and returns the actual object
694 * pointer, or null if it can't be found. 526 * pointer, or null if it can't be found.
695 */ 527 */
696
697object * 528object *
698esrv_get_ob_from_count (object *pl, tag_t count) 529esrv_get_ob_from_count (object *pl, tag_t count)
699{ 530{
700 object *op, *tmp;
701
702 if (pl->count == count) 531 if (pl->count == count)
703 return pl; 532 return pl;
704 533
705 for (op = pl->inv; op; op = op->below) 534 for (object *op = pl->inv; op; op = op->below)
706 if (op->count == count) 535 if (op->count == count)
707 return op; 536 return op;
708 else if (op->type == CONTAINER && pl->container == op) 537 else if (op->type == CONTAINER && pl->container == op)
709 for (tmp = op->inv; tmp; tmp = tmp->below) 538 for (object *tmp = op->inv; tmp; tmp = tmp->below)
710 if (tmp->count == count) 539 if (tmp->count == count)
711 return tmp; 540 return tmp;
712 541
713 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 542 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
714 if (op->head && op->head->count == count) 543 if (op->head && op->head->count == count)
715 return op; 544 return op;
716 else if (op->count == count) 545 else if (op->count == count)
717 return op; 546 return op;
718 else if (op->type == CONTAINER && pl->container == op) 547 else if (op->type == CONTAINER && pl->container == op)
719 for (tmp = op->inv; tmp; tmp = tmp->below) 548 for (object *tmp = op->inv; tmp; tmp = tmp->below)
720 if (tmp->count == count) 549 if (tmp->count == count)
721 return tmp; 550 return tmp;
722 551
552#if 0
553 /* If the high bit is set, player examined a pseudo object. */
554 if (count & 0x80000000)
555 return 0;
556#endif
557
723 return 0; 558 return 0;
724} 559}
725 560
726
727/** Client wants to examine some object. So lets do so. */ 561/** Client wants to examine some object. So lets do so. */
728void 562void
729ExamineCmd (char *buf, int len, player *pl) 563ExamineCmd (char *buf, int len, player *pl)
730{ 564{
731 tag_t tag = atoi (buf); 565 tag_t tag = atoi (buf);
732 566
733 /* If the high bit is set, player examined a pseudo object. */ 567 /* If the high bit is set, player applied a pseudo object. */
734 if (tag & 0x80000000) 568 if (tag & 0x80000000)
569 {
570 pl->ns->look_position = tag & 0x7fffffff;
571 pl->ns->floorbox_update ();
735 return; 572 return;
573 }
736 574
737 object *op = esrv_get_ob_from_count (pl->ob, tag); 575 object *op = esrv_get_ob_from_count (pl->ob, tag);
738 576
739 if (!op) 577 if (!op)
740 { 578 {
… …
743 } 581 }
744 582
745 examine (pl->ob, op); 583 examine (pl->ob, op);
746} 584}
747 585
586/** Client wants to examine some object. So lets do so. */
587void
588ExCmd (char *buf, int len, player *pl)
589{
590 tag_t tag = atoi (buf);
591
592 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
593 {
594 std::string s = op->describe (pl->ob);
595
596 packet sl ("ex");
597 sl << ber32 (tag)
598 << data (*pl->expand_cfpod (s.c_str ()));
599
600 pl->ns->send_packet (sl);
601 }
602}
603
748/** Client wants to apply some object. Lets do so. */ 604/** Client wants to apply some object. Lets do so. */
749void 605void
750ApplyCmd (char *buf, int len, player *pl) 606ApplyCmd (char *buf, int len, player *pl)
751{ 607{
752 tag_t tag = atoi (buf); 608 tag_t tag = atoi (buf);
753
754 /* sort of a hack, but if the player saves and the player then manually
755 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
756 */
757 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
758 return;
759 609
760 /* If the high bit is set, player applied a pseudo object. */ 610 /* If the high bit is set, player applied a pseudo object. */
761 if (tag & 0x80000000) 611 if (tag & 0x80000000)
762 { 612 {
763 pl->ns->look_position = tag & 0x7fffffff; 613 pl->ns->look_position = tag & 0x7fffffff;
… …
784 tag_t tag = net_uint32 ((uint8 *)data + 1); 634 tag_t tag = net_uint32 ((uint8 *)data + 1);
785 object *op = esrv_get_ob_from_count (pl->ob, tag); 635 object *op = esrv_get_ob_from_count (pl->ob, tag);
786 636
787 if (!op) 637 if (!op)
788 { 638 {
789 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 639 pl->failmsg ("Could not find object to lock/unlock");
790 return; 640 return;
791 } 641 }
792 642
793 if (!flag) 643 if (!flag)
794 CLEAR_FLAG (op, FLAG_INV_LOCKED); 644 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
805 tag_t tag = net_uint32 ((uint8 *)data); 655 tag_t tag = net_uint32 ((uint8 *)data);
806 object *op = esrv_get_ob_from_count (pl->ob, tag); 656 object *op = esrv_get_ob_from_count (pl->ob, tag);
807 657
808 if (!op) 658 if (!op)
809 { 659 {
810 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 660 pl->failmsg ("Could not find object to mark");
811 return; 661 return;
812 } 662 }
813 663
814 pl->mark = op; 664 pl->mark = op;
815 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 665 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
816} 666}
817 667
818/** 668/**
819 * look_at prints items on the specified square. 669 * look_at prints items on the specified square.
820 * 670 *
821 * [ removed EARTHWALL check and added check for containers inventory. 671 * [ removed EARTHWALL check and added check for containers inventory.
822 * Tero.Haatanen@lut.fi ] 672 * Tero.Haatanen@lut.fi ]
823 */ 673 */
824void 674static void
825look_at (object *op, int dx, int dy) 675look_at (player *pl, int dx, int dy)
826{ 676{
827 object *tmp; 677 dynbuf_text buf;
828 int flag = 0; 678 object *ob = pl->ob;
829 sint16 x, y;
830 maptile *m;
831 679
832 x = op->x + dx; 680 if (!pl->observe->map)
833 y = op->y + dy;
834
835 if (out_of_map (op->map, x, y))
836 return; 681 return;
837 682
838 m = get_map_from_coord (op->map, &x, &y); 683 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
839 if (!m) 684
685 mapxy pos (pl->observe);
686 pos.move (dx, dy);
687
688 if (wiz)
689 {
690 if (pos.normalise ())
691 {
692 mapspace &ms = *pos;
693 ms.update ();
694
695 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
696 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
697 &pos.m->path, pos.x, pos.y, dx, dy,
698 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
699 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
700 );
701 }
702 else
703 buf << "off-map\n\n";
704 }
705
706 int darkness = pl->blocked_los (dx, dy);
707
708 if (darkness == LOS_BLOCKED)
709 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
710 else if (darkness == LOS_MAX)
711 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
712 else
713 {
714 if (pos.normalise ())
715 for (object *tmp = pos->top; tmp; tmp = tmp->below)
716 {
717 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
718 continue;
719
720 if (wiz)
721 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
722 else
723 buf.printf (" - %s.\n", query_name (tmp));
724
725 object *head = tmp->head_ ();
726
727 if (head->inv)
728 if ((head->type != CONTAINER && head->type != FLESH)
729 || QUERY_FLAG (ob, FLAG_WIZ))
730 buf << head->query_inventory (ob, " ");
731
732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
733 break;
734 }
735 }
736
737 if (buf.empty ())
738 buf << "You see nothing there.";
739
740 pl->infobox (MSG_CHANNEL ("lookat"), buf);
741}
742
743/** Client wants to look at some object. Lets do so. */
744void
745LookAt (char *buf, int len, player *pl)
746{
747 char *cp;
748
749 int dx = atoi (buf);
750 if (!(cp = strchr (buf, ' ')))
840 return; 751 return;
841 752
842 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
843
844 for (; tmp != NULL; tmp = tmp->below)
845 {
846 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
847 continue;
848
849 if (!flag)
850 {
851 if (dx || dy)
852 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
853 else
854 {
855 clear_win_info (op);
856 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
857 }
858 flag = 1;
859 }
860
861 if (QUERY_FLAG (op, FLAG_WIZ))
862 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
863 else
864 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
865
866 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
867 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
868 inventory (op, tmp->head == NULL ? tmp : tmp->head);
869
870 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
871 break;
872 }
873
874 if (!flag)
875 {
876 if (dx || dy)
877 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
878 else
879 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
880 }
881}
882
883
884
885/** Client wants to look at some object. Lets do so. */
886void
887LookAt (char *buf, int len, player *pl)
888{
889 int dx, dy;
890 char *cp;
891
892 dx = atoi (buf);
893 if (!(cp = strchr (buf, ' ')))
894 {
895 return;
896 }
897 dy = atoi (cp); 753 int dy = atoi (cp);
898 754
899 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2)
900 return;
901
902 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
903 return;
904
905 look_at (pl->ob, dx, dy); 755 look_at (pl, dx, dy);
906} 756}
907 757
908/** Move an object to a new location */ 758/** Move an object to a new location */
909void 759void
910esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 760esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
911{ 761{
912 object *op, *env;
913
914 op = esrv_get_ob_from_count (pl, tag); 762 object *op = esrv_get_ob_from_count (pl, tag);
915 if (!op) 763 if (!op)
916 { 764 {
917 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 765 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
918 return; 766 return;
919 } 767 }
… …
926 /* If it is an active container, then we should drop all objects 774 /* If it is an active container, then we should drop all objects
927 * in the container and not the container itself. 775 * in the container and not the container itself.
928 */ 776 */
929 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 777 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
930 { 778 {
931 object *current, *next; 779 int cnt = MAX_ITEM_PER_DROP;
932 780
933 for (current = op->inv; current != NULL; current = next) 781 for (object *current = op->inv; current && cnt--; )
934 { 782 {
935 next = current->below; 783 object *next = current->below;
936 drop_object (pl, current, 0); 784 drop_object (pl, current, 0);
785 current = next;
937 } 786 }
938 787
939 esrv_update_item (UPD_WEIGHT, pl, op); 788 if (cnt <= 0)
789 op->failmsg ("Only dropped some items, can't drop that many items at once.");
940 } 790 }
941 else 791 else
942 drop_object (pl, op, nrof); 792 drop_object (pl, op, nrof);
943 793
944 return; 794 return;
… …
952 pl->contr->count = nrof; 802 pl->contr->count = nrof;
953 pick_up (pl, op); 803 pick_up (pl, op);
954 return; 804 return;
955 } 805 }
956 806
957 env = esrv_get_ob_from_count (pl, to); 807 object *env = esrv_get_ob_from_count (pl, to);
958 if (!env) 808 if (!env)
959 { 809 {
960 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 810 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
961 return; 811 return;
962 } 812 }
… …
964 /* put_object_in_sack presumes that necessary sanity checking 814 /* put_object_in_sack presumes that necessary sanity checking
965 * has already been done (eg, it can be picked up and fits in 815 * has already been done (eg, it can be picked up and fits in
966 * in a sack, so check for those things. We should also check 816 * in a sack, so check for those things. We should also check
967 * an make sure env is in fact a container for that matter. 817 * an make sure env is in fact a container for that matter.
968 */ 818 */
969 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 819 if (env->type == CONTAINER
820 && can_pick (pl, op)
821 && sack_can_hold (pl, env, op, nrof))
970 put_object_in_sack (pl, env, op, nrof); 822 put_object_in_sack (pl, env, op, nrof);
971} 823}
972 824

Diff Legend

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