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.48 by root, Fri Jun 8 09:18:31 2007 UTC vs.
Revision 1.76 by root, Sun Dec 28 06:59:27 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT team 4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
7 * 7 *
8 * Crossfire TRT is free software; you can redistribute it and/or modify it 8 * Deliantra is free software: you can redistribute it and/or modify
9 * under the terms of the GNU General Public License as published by the Free 9 * it under the terms of the GNU General Public License as published by
10 * Software Foundation; either version 2 of the License, or (at your option) 10 * the Free Software Foundation, either version 3 of the License, or
11 * 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, but 13 * This program is distributed in the hope that it will be useful,
14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * 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 along 18 * You should have received a copy of the GNU General Public License
19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
21 * 20 *
22 * The authors can be reached via e-mail to <crossfire@schmorp.de> 21 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client/server logic. 26 * Client/server logic.
… …
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 41
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
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 *
187 ******************************************************************************/ 46 ******************************************************************************/
… …
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 ns.send_face (head->face); 125 ns.send_face (head->face, -50);
270 ns.flush_fx (); 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 ns.send_animation (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); 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}
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"
329 184
330/** 185/**
331 * Send the look window. Don't need to do animations here 186 * Send the look window. Don't need to do animations here
332 * 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
333 * because object ordering would otherwise be inconsistent. 188 * because object ordering would otherwise be inconsistent.
334 */ 189 */
335void 190void
336esrv_draw_look (player *pl) 191esrv_draw_look (player *pl)
337{ 192{
338 int got_one = 0, start_look = 0, end_look = 0;
339
340 object *ob = pl->ob; 193 object *ob = pl->ob;
341 194
342 if (!pl->ns->update_look) 195 if (!pl->ns->update_look)
343 { 196 {
344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 197 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
345 return; 198 return;
346 } 199 }
347 else 200
348 pl->ns->update_look = 0; 201 pl->ns->update_look = 0;
349 202
350 if (QUERY_FLAG (ob, FLAG_REMOVED) 203 if (QUERY_FLAG (ob, FLAG_REMOVED)
351 || !ob->map 204 || !ob->map
352 || ob->map->in_memory != MAP_IN_MEMORY 205 || ob->map->in_memory != MAP_ACTIVE
353 || out_of_map (ob->map, ob->x, ob->y)) 206 || out_of_map (ob->map, ob->x, ob->y))
354 return; 207 return;
355 208
356 pl->ns->send_packet ("delinv 0"); 209 pl->ns->send_packet ("delinv 0");
357 210
358 packet sl; 211 packet sl;
359 sl.printf ("item%d ", pl->ns->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
360 213
361 sl << uint32 (0); 214 sl << uint32 (0);
362 215
363 pl->ns->send_face (empty_face); 216 int start_pos = pl->ns->look_position;
364 pl->ns->flush_fx (); 217 bool dirty = false;
365 218
366 if (pl->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 }
367 { 249 }
368 char buf[80];
369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
370 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 */
371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 257 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
372 << uint32 (0) 258 << uint32 (0)
373 << sint32 (-1) 259 << uint32 ((uint32) - 1)
374 << uint32 (empty_face) 260 << uint32 (need_face_now (pl, FINGER_DOWN))
375 << data8 (buf) 261 << data8 ("Apply this to see the items below")
376 << uint16 (0) 262 << uint16 (0)
377 << uint8 (0) 263 << uint8 (0)
378 << uint32 (0); 264 << uint32 (0);
379 265
380 if (pl->ns->itemcmd == 2) 266 if (pl->ns->itemcmd == 2)
381 sl << uint16 (0); 267 sl << uint16 (0);
382 }
383 268
384 object *tmp = ob->ms ().top; 269 dirty = true;
385 for (object *last = 0; tmp != last; tmp = tmp->below)
386 { 270 }
387 object *head;
388 271
389 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)
390 { 285 {
391 last = tmp->below; /* assumes double floor mode */ 286 pl->ns->send_packet (sl);
392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 287
393 last = last->below; 288 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0);
291
292 dirty = false;
394 } 293 }
395
396 if (tmp->client_visible ())
397 {
398 if (++start_look < pl->ns->look_position)
399 continue;
400
401 end_look++;
402
403 if (end_look > FLOORBOX_PAGESIZE)
404 {
405 /* What we basically do is make a 'fake' object - when the user applies it,
406 * we notice the special tag the object has, and act accordingly.
407 */
408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
409 << uint32 (0)
410 << uint32 ((uint32) - 1)
411 << uint32 (empty_face)
412 << data8 ("Apply this to see next group of items")
413 << uint16 (0)
414 << uint8 (0)
415 << uint32 (0);
416
417 if (pl->ns->itemcmd == 2)
418 sl << uint16 (0);
419
420 break;
421 }
422
423 if (tmp->head)
424 head = tmp->head;
425 else
426 head = tmp;
427
428 add_object_to_socklist (*pl->ns, sl, head);
429 got_one++;
430
431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
432 {
433 pl->ns->send_packet (sl);
434
435 sl.reset ();
436 sl.printf ("item%d ", pl->ns->itemcmd);
437 sl << uint32 (0);
438 got_one = 0;
439 }
440 }
441 } 294 }
442 295
443 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)
444 pl->ns->send_packet (sl); 314 pl->ns->send_packet (sl);
445
446} 315}
447 316
448/** 317/**
449 * Sends whole inventory. 318 * Sends whole inventory.
450 */ 319 */
… …
480 349
481 /* IT is possible for players to accumulate a huge amount of 350 /* IT is possible for players to accumulate a huge amount of
482 * items (especially with some of the bags out there) to 351 * items (especially with some of the bags out there) to
483 * overflow the buffer. IF so, send multiple item commands. 352 * overflow the buffer. IF so, send multiple item commands.
484 */ 353 */
485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 354 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
486 { 355 {
487 pl->contr->ns->send_packet (sl); 356 pl->contr->ns->send_packet (sl);
488 357
489 sl.reset (); 358 sl.reset ();
490 sl.printf ("item%d ", pl->contr->ns->itemcmd); 359 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
507 */ 376 */
508void 377void
509esrv_update_item (int flags, object *pl, object *op) 378esrv_update_item (int flags, object *pl, object *op)
510{ 379{
511 /* 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. */
512 if (op != pl)
513 {
514 if (!op->client_visible ()) 381 if (op != pl && !op->client_visible ())
515 return; 382 return;
516 /* we remove the check for op->env, because in theory, the object
517 * is hopefully in the same place, so the client should preserve
518 * order.
519 */
520 }
521 383
522 client *ns = pl->contr->ns; 384 client *ns = pl->contr->ns;
523 if (!ns) 385 if (!ns)
524 return; 386 return;
525 387
526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
527 {
528 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
529 * this is happening - we can set a breakpoint here in the debugger
530 * and track back the call.
531 */
532 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
533 }
534
535 packet sl ("upditem"); 388 packet sl ("upditem");
536 389
537 sl << uint8 (flags); 390 sl << uint8 (flags);
538 391
539 if (op->head)
540 op = op->head; 392 op = op->head_ ();
541 393
542 sl << uint32 (op->count); 394 sl << uint32 (op->count);
543 395
544 if (flags & UPD_LOCATION) 396 if (flags & UPD_LOCATION)
545 sl << uint32 (op->env ? op->env->count : 0); 397 sl << uint32 (op->env ? op->env->count : 0);
… …
547 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
548 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
549 401
550 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
551 { 403 {
552 sint32 weight = WEIGHT (op); 404 sint32 weight = op->client_weight ();
553 405
554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 406 if (op == pl)
555
556 if (pl == op)
557 ns->last_weight = weight; 407 ns->last_weight = weight;
408
409 sl << uint32 (weight);
558 } 410 }
559 411
560 if (flags & UPD_FACE) 412 if (flags & UPD_FACE)
561 { 413 {
562 ns->send_face (op->face); 414 ns->send_face (op->face, -50);
563 ns->flush_fx (); 415 ns->flush_fx ();
564 sl << uint32 (op->face); 416 sl << uint32 (op->face);
565 } 417 }
566 418
567 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
… …
633esrv_send_item (object *pl, object *op) 485esrv_send_item (object *pl, object *op)
634{ 486{
635 if (!pl->contr->ns) 487 if (!pl->contr->ns)
636 return; 488 return;
637 489
638 /* If this is not the player object, do some more checks */
639 if (op != pl)
640 {
641 /* We only send 'visibile' objects to the client */ 490 /* We only send 'visible' objects to the client, and sometimes the player */
642 if (!op->client_visible ()) 491 if (!op->client_visible () && op->type != PLAYER)
643 return; 492 return;
644
645 /* if the item is on the ground, mark that the look needs to
646 * be updated.
647 */
648 if (!op->env)
649 {
650 pl->contr->ns->floorbox_update ();
651 return;
652 }
653 }
654 493
655 packet sl; 494 packet sl;
656 495
657 sl.printf ("item%d ", pl->contr->ns->itemcmd); 496 sl.printf ("item%d ", pl->contr->ns->itemcmd);
658 497
659 if (op->head)
660 op = op->head; 498 op = op->head_ ();
661 499
662 sl << uint32 (op->env ? op->env->count : 0); 500 sl << uint32 (op->env ? op->env->count : 0);
663 501
664 add_object_to_socklist (*pl->contr->ns, sl, op); 502 add_object_to_socklist (*pl->contr->ns, sl, op);
665 503
666 pl->contr->ns->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
667 SET_FLAG (op, FLAG_CLIENT_SENT);
668} 505}
669 506
670/** 507/**
671 * Tells the client to delete an item. Uses the item 508 * Tells the client to delete an item.
672 * command with a -1 location.
673 */ 509 */
674void 510void
675esrv_del_item (player *pl, int tag) 511esrv_del_item (player *pl, int tag)
676{ 512{
677 if (!pl->ns) 513 if (!pl->ns)
… …
732void 568void
733ExamineCmd (char *buf, int len, player *pl) 569ExamineCmd (char *buf, int len, player *pl)
734{ 570{
735 tag_t tag = atoi (buf); 571 tag_t tag = atoi (buf);
736 572
573 /* If the high bit is set, player applied a pseudo object. */
574 if (tag & 0x80000000)
575 {
576 pl->ns->look_position = tag & 0x7fffffff;
577 pl->ns->floorbox_update ();
578 return;
579 }
580
737 object *op = esrv_get_ob_from_count (pl->ob, tag); 581 object *op = esrv_get_ob_from_count (pl->ob, tag);
738 582
739 if (!op) 583 if (!op)
740 { 584 {
741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 585 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 598 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 { 599 {
756 std::string s = op->describe (pl->ob); 600 std::string s = op->describe (pl->ob);
757 601
758 packet sl ("ex"); 602 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str (); 603 sl << ber32 (tag)
604 << data (*pl->expand_cfpod (s.c_str ()));
760 605
761 pl->ns->send_packet (sl); 606 pl->ns->send_packet (sl);
762 } 607 }
763} 608}
764 609
765/** Client wants to apply some object. Lets do so. */ 610/** Client wants to apply some object. Lets do so. */
766void 611void
767ApplyCmd (char *buf, int len, player *pl) 612ApplyCmd (char *buf, int len, player *pl)
768{ 613{
769 tag_t tag = atoi (buf); 614 tag_t tag = atoi (buf);
770
771 /* sort of a hack, but if the player saves and the player then manually
772 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
773 */
774 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
775 return;
776 615
777 /* If the high bit is set, player applied a pseudo object. */ 616 /* If the high bit is set, player applied a pseudo object. */
778 if (tag & 0x80000000) 617 if (tag & 0x80000000)
779 { 618 {
780 pl->ns->look_position = tag & 0x7fffffff; 619 pl->ns->look_position = tag & 0x7fffffff;
… …
801 tag_t tag = net_uint32 ((uint8 *)data + 1); 640 tag_t tag = net_uint32 ((uint8 *)data + 1);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 641 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 642
804 if (!op) 643 if (!op)
805 { 644 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 645 pl->failmsg ("Could not find object to lock/unlock");
807 return; 646 return;
808 } 647 }
809 648
810 if (!flag) 649 if (!flag)
811 CLEAR_FLAG (op, FLAG_INV_LOCKED); 650 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
822 tag_t tag = net_uint32 ((uint8 *)data); 661 tag_t tag = net_uint32 ((uint8 *)data);
823 object *op = esrv_get_ob_from_count (pl->ob, tag); 662 object *op = esrv_get_ob_from_count (pl->ob, tag);
824 663
825 if (!op) 664 if (!op)
826 { 665 {
827 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 666 pl->failmsg ("Could not find object to mark");
828 return; 667 return;
829 } 668 }
830 669
831 pl->mark = op; 670 pl->mark = op;
832 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 671 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
833} 672}
834 673
835/** 674/**
836 * look_at prints items on the specified square. 675 * look_at prints items on the specified square.
837 * 676 *
… …
839 * Tero.Haatanen@lut.fi ] 678 * Tero.Haatanen@lut.fi ]
840 */ 679 */
841static void 680static void
842look_at (player *pl, int dx, int dy) 681look_at (player *pl, int dx, int dy)
843{ 682{
683 dynbuf_text buf;
844 object *ob = pl->ob; 684 object *ob = pl->ob;
845 685
846 maptile *m = pl->observe->map; 686 if (!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; 687 return;
688
689 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
690
691 mapxy pos (pl->observe);
692 pos.move (dx, dy);
693
694 if (wiz)
854 } 695 {
855 696 if (pos.normalise ())
856 int flag = 0;
857
858 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
859 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
861 continue;
862
863 if (!flag)
864 { 697 {
865 if (dx || dy) 698 mapspace &ms = *pos;
866 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:"); 699 ms.update ();
867 else
868 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
869 700
870 flag = 1; 701 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
702 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
703 &pos.m->path, pos.x, pos.y, dx, dy,
704 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
705 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
706 );
871 } 707 }
872
873 if (QUERY_FLAG (ob, FLAG_WIZ))
874 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
875 else 708 else
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 709 buf << "off-map\n\n";
710 }
877 711
878 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 712 int darkness = pl->blocked_los (dx, dy);
879 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
880 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
881 713
714 if (darkness == LOS_BLOCKED)
715 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
716 else if (darkness == LOS_MAX)
717 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
718 else
719 {
720 if (pos.normalise ())
721 for (object *tmp = pos->top; tmp; tmp = tmp->below)
722 {
723 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
724 continue;
725
726 if (wiz)
727 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
728 else
729 buf.printf (" - %s.\n", query_name (tmp));
730
731 object *head = tmp->head_ ();
732
733 if (head->inv)
734 if ((head->type != CONTAINER && head->type != FLESH)
735 || QUERY_FLAG (ob, FLAG_WIZ))
736 buf << head->query_inventory (ob, " ");
737
882 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 738 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
883 break; 739 break;
884 } 740 }
885
886 if (!flag)
887 { 741 }
888 if (dx || dy) 742
889 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); 743 if (buf.empty ())
890 else 744 buf << "You see nothing there.";
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 745
892 } 746 pl->infobox (MSG_CHANNEL ("lookat"), buf);
893} 747}
894 748
895/** Client wants to look at some object. Lets do so. */ 749/** Client wants to look at some object. Lets do so. */
896void 750void
897LookAt (char *buf, int len, player *pl) 751LookAt (char *buf, int len, player *pl)
… …
902 if (!(cp = strchr (buf, ' '))) 756 if (!(cp = strchr (buf, ' ')))
903 return; 757 return;
904 758
905 int dy = atoi (cp); 759 int dy = atoi (cp);
906 760
907 if (player *opl = pl->observe->contr)
908 if (client *ns = opl->ns)
909 {
910 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
911 return;
912
913 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
914 return;
915 }
916
917 look_at (pl, dx, dy); 761 look_at (pl, dx, dy);
918} 762}
919 763
920/** Move an object to a new location */ 764/** Move an object to a new location */
921void 765void
922esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 766esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
923{ 767{
924 object *op, *env;
925
926 op = esrv_get_ob_from_count (pl, tag); 768 object *op = esrv_get_ob_from_count (pl, tag);
927 if (!op) 769 if (!op)
928 { 770 {
929 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 771 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
930 return; 772 return;
931 } 773 }
… …
938 /* If it is an active container, then we should drop all objects 780 /* If it is an active container, then we should drop all objects
939 * in the container and not the container itself. 781 * in the container and not the container itself.
940 */ 782 */
941 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 783 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
942 { 784 {
943 object *current, *next; 785 int cnt = MAX_ITEM_PER_DROP;
944 786
945 for (current = op->inv; current != NULL; current = next) 787 for (object *current = op->inv; current && cnt--; )
946 { 788 {
947 next = current->below; 789 object *next = current->below;
948 drop_object (pl, current, 0); 790 drop_object (pl, current, 0);
791 current = next;
949 } 792 }
950 793
951 esrv_update_item (UPD_WEIGHT, pl, op); 794 if (cnt <= 0)
795 op->failmsg ("Only dropped some items, can't drop that many items at once.");
952 } 796 }
953 else 797 else
954 drop_object (pl, op, nrof); 798 drop_object (pl, op, nrof);
955 799
956 return; 800 return;
… …
964 pl->contr->count = nrof; 808 pl->contr->count = nrof;
965 pick_up (pl, op); 809 pick_up (pl, op);
966 return; 810 return;
967 } 811 }
968 812
969 env = esrv_get_ob_from_count (pl, to); 813 object *env = esrv_get_ob_from_count (pl, to);
970 if (!env) 814 if (!env)
971 { 815 {
972 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 816 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
973 return; 817 return;
974 } 818 }
… …
976 /* put_object_in_sack presumes that necessary sanity checking 820 /* put_object_in_sack presumes that necessary sanity checking
977 * has already been done (eg, it can be picked up and fits in 821 * has already been done (eg, it can be picked up and fits in
978 * in a sack, so check for those things. We should also check 822 * in a sack, so check for those things. We should also check
979 * an make sure env is in fact a container for that matter. 823 * an make sure env is in fact a container for that matter.
980 */ 824 */
981 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 825 if (env->type == CONTAINER
826 && can_pick (pl, op)
827 && sack_can_hold (pl, env, op, nrof))
982 put_object_in_sack (pl, env, op, nrof); 828 put_object_in_sack (pl, env, op, nrof);
983} 829}
984 830

Diff Legend

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