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.64 by root, Mon May 5 22:03:22 2008 UTC vs.
Revision 1.105 by root, Wed Nov 14 23:24:27 2018 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2018 Marc Alexander Lehmann / the Deliantra team
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 5 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012,2013,2014,2015,2016 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 6 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 7 * Copyright (©) 1992 Frank Tore Johansen
7 * 8 *
8 * Deliantra is free software: you can redistribute it and/or modify 9 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 10 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 11 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 12 * option) any later version.
12 * 13 *
13 * This program is distributed in the hope that it will be useful, 14 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 17 * GNU General Public License for more details.
17 * 18 *
18 * You should have received a copy of the GNU General Public License 19 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 20 * and the GNU General Public License along with this program. If not, see
21 * <http://www.gnu.org/licenses/>.
20 * 22 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 23 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 24 */
23 25
24/** 26/**
25 * \file 27 * \file
… …
37#include <sproto.h> 39#include <sproto.h>
38 40
39/** This is the maximum number of bytes we expect any one item to take up */ 41/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 42#define MAXITEMLEN 300
41 43
42#if 0
43tag_t
44client_container::tag () const
45{
46 switch (type)
47 {
48 case CC_INVENTORY:
49 return ns->pl->count;
50 case CC_MAPSPACE:
51 return 0;
52 case CC_CONTAINER:
53 return env->count;
54 }
55
56 abort ();
57}
58
59void
60client_container::clear ()
61{
62 switch (type)
63 {
64 case CC_INVENTORY:
65 abort ();
66
67 case CC_MAPSPACE:
68 case CC_CONTAINER:
69 ns->send_packet_printf ("delinv %d", tag ());
70 break;
71 }
72
73 for (iterator i = begin (); i != end (); ++i)
74 i->op->seen_by = 0;
75
76 vector< refitem, slice_allocator<refitem> >::clear ();
77}
78
79inline iterator
80client_container::merge_item (iterator i, object *op)
81{
82 if (i != end () && i->op == op)
83 return ++i;
84
85 if (op->seen_by)
86 return; // seen by another entity already
87
88 op->seen_by = this;
89
90 refitem ref;
91 ref.op = op;
92
93 return insert (i, ref);
94}
95
96void
97client_container::update (int offset)
98{
99 iterator i = begin ();
100
101 switch (type)
102 {
103 case CC_INVENTORY:
104 case CC_CONTAINER:
105 {
106 object *env = type == CC_INVENTORY
107 ? ns->pl->ob
108 : this->env;
109
110 // pass 1, erase all objects no longer in container
111 for (iterator j = begin (); j != end (); ++j)
112 if (j->op->env != env)
113 {
114 j->op->seen_by = 0;
115 erase (j);
116 }
117
118 // pass 2 merge items
119 for (object *op = env->inv; op; op = op->below)
120 {
121 if (--offset < 0)
122 i = merge_item (i, op);
123 else if (offset < -FLOORBOX_PAGESIZE)
124 break;
125 }
126 }
127 break;
128
129 case CC_MAPSPACE:
130 {
131 // pass 1, erase all objects no longer on space
132 for (iterator j = begin (); j != end (); ++j)
133 if (j->op->x != x || j->op->y != y || j->op->map != map)
134 {
135 j->op->seen_by = 0;
136 erase (j);
137 }
138
139 // pass 2 merge items
140 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
141 {
142 if (--offset < 0)
143 i = merge_item (i, op);
144 else if (offset < -FLOORBOX_PAGESIZE)
145 break;
146 }
147 }
148 break;
149 }
150
151 // pass 3, erase all extra items
152 for (iterator j = i; j != end (); ++j)
153 j->op->seen_by = 0;
154
155 if (i != end ())
156 erase (i, end ());
157}
158
159void
160client_container::set_mapspace (maptile *map, int x, int y)
161{
162 if (type == CC_MAPSPACE
163 && this->map == map
164 && this->x == x
165 && this->y == y)
166 return;
167
168 clear ();
169
170 type = CC_MAPSPACE;
171 this->map = map;
172 this->x = x;
173 this->y = y;
174}
175
176void
177client_container::set_container (object *env)
178{
179}
180#endif
181
182/******************************************************************************* 44/*******************************************************************************
183 * 45 *
184 * Functions related to sending object data to the client. 46 * Functions related to sending object data to the client.
185 * 47 *
186 ******************************************************************************/ 48 ******************************************************************************/
187 49
188/** 50/**
189 * This is a similar to query_name, but returns flags 51 * This is a similar to query_name, but returns flags
190 * to be sent to client. 52 * to be sent to client.
191 */ 53 */
192unsigned int 54static unsigned int
193query_flags (object *op) 55query_flags (object *op)
194{ 56{
195 unsigned int flags = 0; 57 unsigned int flags = 0;
196 58
197 if (QUERY_FLAG (op, FLAG_APPLIED)) 59 if (op->flag [FLAG_APPLIED])
198 switch (op->type) 60 switch (op->type)
199 { 61 {
200 case BOW: 62 case BOW:
201 case WAND: 63 case WAND:
202 case ROD: 64 case ROD:
… …
225 default: 87 default:
226 flags = a_applied; 88 flags = a_applied;
227 break; 89 break;
228 } 90 }
229 91
230 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 92 if (op->is_open_container ())
231 flags |= F_OPEN; 93 flags |= F_OPEN;
232 94
233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 95 if (op->flag [FLAG_KNOWN_CURSED])
234 { 96 {
235 if (QUERY_FLAG (op, FLAG_DAMNED)) 97 if (op->flag [FLAG_DAMNED])
236 flags |= F_DAMNED; 98 flags |= F_DAMNED;
237 else if (QUERY_FLAG (op, FLAG_CURSED)) 99 else if (op->flag [FLAG_CURSED])
238 flags |= F_CURSED; 100 flags |= F_CURSED;
239 } 101 }
240 102
241 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 103 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
242 flags |= F_MAGIC; 104 flags |= F_MAGIC;
243 if (QUERY_FLAG (op, FLAG_UNPAID)) 105 if (op->flag [FLAG_UNPAID])
244 flags |= F_UNPAID; 106 flags |= F_UNPAID;
245 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 107 if (op->flag [FLAG_INV_LOCKED])
246 flags |= F_LOCKED; 108 flags |= F_LOCKED;
247 109
248 return flags; 110 return flags;
249} 111}
250 112
… …
253 * animation of face to the client. 115 * animation of face to the client.
254 */ 116 */
255static void 117static void
256add_object_to_socklist (client &ns, packet &sl, object *head) 118add_object_to_socklist (client &ns, packet &sl, object *head)
257{ 119{
258 int flags, len, anim_speed;
259 char item_n[MAX_BUF];
260 const char *item_p;
261
262 flags = query_flags (head); 120 int flags = query_flags (head);
263 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121
122 if (head->flag [FLAG_NO_PICK])
264 flags |= F_NOPICK; 123 flags |= F_NOPICK;
265 124
266 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
267 ns.flush_fx ();
268 126
269 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 127 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
270 ns.send_animation (head->animation_id); 128 ns.send_animation (head->animation_id);
271 129
272 sl << uint32 (head->count) 130 sl << uint32 (head->count)
273 << uint32 (flags) 131 << uint32 (flags)
274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ()) 132 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
275 << uint32 (head->face); 133 << uint32 (head->face);
276 134
277 if (!head->custom_name) 135 if (!head->custom_name)
278 { 136 {
279 strncpy (item_n, query_base_name (head, 0), 127); 137 const char *name;
280 item_n[127] = 0; 138 uint8 *len = sl.cur++; // patch up length later
281 len = strlen (item_n); 139
282 item_p = query_base_name (head, 1); 140 name = query_base_name (head, 0); sl << data_n (name, min (127, strlen (name)));
141 sl << uint8 (0);
142 name = query_base_name (head, 1); sl << data_n (name, min (127, strlen (name)));
143
144 *len = sl.cur - len - 1;
283 } 145 }
284 else 146 else
285 { 147 {
286 strncpy (item_n, head->custom_name, 127); 148 int len = min (127, head->custom_name.length ());
287 item_n[127] = 0;
288 len = strlen (item_n);
289 item_p = head->custom_name;
290 }
291 149
292 strncpy (item_n + len + 1, item_p, 127); 150 sl << uint8 (len * 2 + 1)
293 item_n[254] = 0; 151 << data_n (head->custom_name, len)
294 len += strlen (item_n + 1 + len) + 1; 152 << uint8 (0)
153 << data_n (head->custom_name, len);
154 }
295 155
296 sl << data8 (item_n, len)
297 << uint16 (head->animation_id); 156 sl << uint16 (head->animation_id);
298 157
299 anim_speed = 0; 158 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
300 if (QUERY_FLAG (head, FLAG_ANIMATE)) 159 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
301 { 160 : 1. / clamp (head->speed, 1./255., 1./1.);
302 if (head->anim_speed)
303 anim_speed = head->anim_speed;
304 else
305 {
306 if (fabs (head->speed) < 0.001)
307 anim_speed = 255;
308 else if (fabs (head->speed) >= 1.0)
309 anim_speed = 1;
310 else
311 anim_speed = (int) (1.0 / fabs (head->speed));
312 }
313
314 if (anim_speed > 255)
315 anim_speed = 255;
316 }
317 161
318 sl << uint8 (anim_speed) 162 sl << uint8 (anim_speed)
319 << uint32 (head->nrof); 163 << uint32 (head->nrof);
320 164
321 if (ns.itemcmd == 2) 165 if (ns.itemcmd == 2)
322 sl << uint16 (head->client_type); 166 sl << uint16 (head->client_type);
323
324 SET_FLAG (head, FLAG_CLIENT_SENT);
325} 167}
326 168
327static faceidx 169static faceidx
328need_face_now (player *pl, const char *name) 170need_face_now (player *pl, const char *name)
329{ 171{
… …
337 179
338#define FINGER_UP "finger_up.x11" 180#define FINGER_UP "finger_up.x11"
339#define FINGER_DOWN "finger_down.x11" 181#define FINGER_DOWN "finger_down.x11"
340 182
341/** 183/**
342 * Send the look window. Don't need to do animations here 184 * Send the look window. Don't need to do animations here
343 * This sends all the faces to the client, not just updates. This is 185 * This sends all the faces to the client, not just updates. This is
344 * because object ordering would otherwise be inconsistent. 186 * because object ordering would otherwise be inconsistent.
345 */ 187 */
346void 188void
347esrv_draw_look (player *pl) 189esrv_draw_look (player *pl)
… …
352 { 194 {
353 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 195 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
354 return; 196 return;
355 } 197 }
356 198
199 if (pl->ns->need_delinv0)
200 {
201 pl->ns->need_delinv0 = 0;
202 pl->ns->send_packet ("delinv 0");
203 }
204
205 if (pl->run_on)
206 return;
207
357 pl->ns->update_look = 0; 208 pl->ns->update_look = 0;
209 pl->ns->need_delinv0 = 1;
358 210
359 if (QUERY_FLAG (ob, FLAG_REMOVED) 211 if (ob->flag [FLAG_REMOVED]
360 || !ob->map 212 || !ob->map
361 || ob->map->in_memory != MAP_ACTIVE 213 || ob->map->state != MAP_ACTIVE
362 || out_of_map (ob->map, ob->x, ob->y)) 214 || out_of_map (ob->map, ob->x, ob->y))
363 return; 215 return;
364
365 pl->ns->send_packet ("delinv 0");
366 216
367 packet sl; 217 packet sl;
368 sl.printf ("item%d ", pl->ns->itemcmd); 218 sl.printf ("item%d ", pl->ns->itemcmd);
369 219
370 sl << uint32 (0); 220 sl << uint32 (0);
… …
437 dirty = true; 287 dirty = true;
438 288
439 // if packet got too large, send it and begin a new one 289 // if packet got too large, send it and begin a new one
440 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 290 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
441 { 291 {
292 pl->ns->flush_fx ();
442 pl->ns->send_packet (sl); 293 pl->ns->send_packet (sl);
443 294
444 sl.reset (); 295 sl.reset ();
445 sl.printf ("item%d ", pl->ns->itemcmd); 296 sl.printf ("item%d ", pl->ns->itemcmd);
446 sl << uint32 (0); 297 sl << uint32 (0);
… …
465 316
466 dirty = true; 317 dirty = true;
467 } 318 }
468 319
469 if (dirty) 320 if (dirty)
321 {
322 pl->ns->flush_fx ();
470 pl->ns->send_packet (sl); 323 pl->ns->send_packet (sl);
324 }
471} 325}
472 326
473/** 327/**
474 * Sends whole inventory. 328 * Sends whole inventory.
475 */ 329 */
… …
507 * items (especially with some of the bags out there) to 361 * items (especially with some of the bags out there) to
508 * overflow the buffer. IF so, send multiple item commands. 362 * overflow the buffer. IF so, send multiple item commands.
509 */ 363 */
510 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 364 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
511 { 365 {
366 pl->contr->ns->flush_fx ();
512 pl->contr->ns->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
513 368
514 sl.reset (); 369 sl.reset ();
515 sl.printf ("item%d ", pl->contr->ns->itemcmd); 370 sl.printf ("item%d ", pl->contr->ns->itemcmd);
516 sl << uint32 (op->count); 371 sl << uint32 (op->count);
… …
518 } 373 }
519 } 374 }
520 } 375 }
521 376
522 if (got_one) 377 if (got_one)
378 {
379 pl->contr->ns->flush_fx ();
523 pl->contr->ns->send_packet (sl); 380 pl->contr->ns->send_packet (sl);
381 }
524} 382}
525 383
526/** 384/**
527 * Updates object *op for player *pl. 385 * Updates object *op for player *pl.
528 * 386 *
… …
539 397
540 client *ns = pl->contr->ns; 398 client *ns = pl->contr->ns;
541 if (!ns) 399 if (!ns)
542 return; 400 return;
543 401
544 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
545 {
546 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
547 * this is happening - we can set a breakpoint here in the debugger
548 * and track back the call.
549 */
550 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
551 }
552
553 packet sl ("upditem"); 402 packet sl ("upditem");
554 403
555 sl << uint8 (flags); 404 sl << uint8 (flags);
556 405
557 op = op->head_ (); 406 op = op->head_ ();
… …
564 if (flags & UPD_FLAGS) 413 if (flags & UPD_FLAGS)
565 sl << uint32 (query_flags (op)); 414 sl << uint32 (query_flags (op));
566 415
567 if (flags & UPD_WEIGHT) 416 if (flags & UPD_WEIGHT)
568 { 417 {
569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight (); 418 sint32 weight = op->client_weight ();
570 419
571 if (op) 420 if (op == pl)
572 ns->last_weight = weight; 421 ns->last_weight = weight;
573 422
574 sl << uint32 (weight); 423 sl << uint32 (weight);
575 } 424 }
576 425
… …
583 432
584 if (flags & UPD_NAME) 433 if (flags & UPD_NAME)
585 { 434 {
586 int len; 435 int len;
587 const char *item_p; 436 const char *item_p;
588 char item_n[MAX_BUF]; 437 char item_n[127 * 2];
589 438
590 if (!op->custom_name) 439 if (!op->custom_name)
591 { 440 {
592 strncpy (item_n, query_base_name (op, 0), 127); 441 len = assign (item_n, query_base_name (op, 0), 127);
593 item_n[127] = 0;
594 len = strlen (item_n);
595 item_p = query_base_name (op, 1); 442 item_p = query_base_name (op, 1);
596 } 443 }
597 else 444 else
598 { 445 {
599 strncpy (item_n, op->custom_name, 127); 446 len = assign (item_n, &op->custom_name, 127);
600 item_n[127] = 0;
601 len = strlen (item_n);
602 item_p = op->custom_name; 447 item_p = &op->custom_name;
603 } 448 }
604 449
605 strncpy (item_n + len + 1, item_p, 127); 450 len += assign (item_n + len, item_p, 127);
606 item_n[254] = 0;
607 len += strlen (item_n + 1 + len) + 1;
608 451
609 sl << data8 (item_n, len); 452 sl << data8 (item_n, len);
610 } 453 }
611 454
612 if (flags & UPD_ANIM) 455 if (flags & UPD_ANIM)
… …
614 457
615 if (flags & UPD_ANIMSPEED) 458 if (flags & UPD_ANIMSPEED)
616 { 459 {
617 int anim_speed = 0; 460 int anim_speed = 0;
618 461
619 if (QUERY_FLAG (op, FLAG_ANIMATE)) 462 if (op->flag [FLAG_ANIMATE])
620 { 463 {
621 if (op->anim_speed) 464 if (op->anim_speed)
622 anim_speed = op->anim_speed; 465 anim_speed = op->anim_speed;
623 else 466 else
624 { 467 {
625 if (fabs (op->speed) < 0.001) 468 if (op->speed < 0.001)
626 anim_speed = 255; 469 anim_speed = 255;
627 else if (fabs (op->speed) >= 1.0) 470 else if (op->speed >= 1.0)
628 anim_speed = 1; 471 anim_speed = 1;
629 else 472 else
630 anim_speed = (int) (1.0 / fabs (op->speed)); 473 anim_speed = 1. / op->speed;
631 } 474 }
632 475
633 if (anim_speed > 255) 476 if (anim_speed > 255)
634 anim_speed = 255; 477 anim_speed = 255;
635 } 478 }
… …
664 507
665 sl << uint32 (op->env ? op->env->count : 0); 508 sl << uint32 (op->env ? op->env->count : 0);
666 509
667 add_object_to_socklist (*pl->contr->ns, sl, op); 510 add_object_to_socklist (*pl->contr->ns, sl, op);
668 511
512 pl->contr->ns->flush_fx ();
669 pl->contr->ns->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
670 SET_FLAG (op, FLAG_CLIENT_SENT);
671} 514}
672 515
673/** 516/**
674 * Tells the client to delete an item. 517 * Tells the client to delete an item.
675 */ 518 */
… …
695 538
696/** 539/**
697 * Takes a player and object count (tag) and returns the actual object 540 * Takes a player and object count (tag) and returns the actual object
698 * pointer, or null if it can't be found. 541 * pointer, or null if it can't be found.
699 */ 542 */
700object * 543static object *
701esrv_get_ob_from_count (object *pl, tag_t count) 544esrv_get_ob_from_count (object *pl, tag_t count)
702{ 545{
703 if (pl->count == count) 546 if (pl->count == count)
704 return pl; 547 return pl;
705 548
706 for (object *op = pl->inv; op; op = op->below) 549 for (object *op = pl->inv; op; op = op->below)
707 if (op->count == count) 550 if (op->count == count)
708 return op; 551 return op;
709 else if (op->type == CONTAINER && pl->container == op) 552 else if (op->type == CONTAINER && pl->container_ () == op)
710 for (object *tmp = op->inv; tmp; tmp = tmp->below) 553 for (object *tmp = op->inv; tmp; tmp = tmp->below)
711 if (tmp->count == count) 554 if (tmp->count == count)
712 return tmp; 555 return tmp;
713 556
714 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 557 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
715 if (op->head && op->head->count == count) 558 if (op->head && op->head->count == count)
716 return op; 559 return op;
717 else if (op->count == count) 560 else if (op->count == count)
718 return op; 561 return op;
719 else if (op->type == CONTAINER && pl->container == op) 562 else if (op->type == CONTAINER && pl->container_ () == op)
720 for (object *tmp = op->inv; tmp; tmp = tmp->below) 563 for (object *tmp = op->inv; tmp; tmp = tmp->below)
721 if (tmp->count == count) 564 if (tmp->count == count)
722 return tmp; 565 return tmp;
723 566
724#if 0 567#if 0
… …
764 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 607 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
765 { 608 {
766 std::string s = op->describe (pl->ob); 609 std::string s = op->describe (pl->ob);
767 610
768 packet sl ("ex"); 611 packet sl ("ex");
769 sl << ber32 (tag) << s.c_str (); 612 sl << ber32 (tag)
613 << data_n (*pl->expand_cfpod (s.c_str ()));
770 614
771 pl->ns->send_packet (sl); 615 pl->ns->send_packet (sl);
772 } 616 }
773} 617}
774 618
… …
784 pl->ns->look_position = tag & 0x7fffffff; 628 pl->ns->look_position = tag & 0x7fffffff;
785 pl->ns->floorbox_update (); 629 pl->ns->floorbox_update ();
786 return; 630 return;
787 } 631 }
788 632
633 // the object might be legally gone already
789 object *op = esrv_get_ob_from_count (pl->ob, tag); 634 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
790 635 pl->ob->apply (op, AP_TOGGLE);
791 if (!op)
792 {
793 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
794 return;
795 }
796
797 player_apply (pl->ob, op, 0, 0);
798} 636}
799 637
800/** Client wants to lock some object. Lets do so. */ 638/** Client wants to lock some object. Lets do so. */
801void 639void
802LockItem (char *data, int len, player *pl) 640LockItem (char *data, int len, player *pl)
… …
805 tag_t tag = net_uint32 ((uint8 *)data + 1); 643 tag_t tag = net_uint32 ((uint8 *)data + 1);
806 object *op = esrv_get_ob_from_count (pl->ob, tag); 644 object *op = esrv_get_ob_from_count (pl->ob, tag);
807 645
808 if (!op) 646 if (!op)
809 { 647 {
810 pl->failmsg ("Could not find object to lock/unlock"); 648 pl->failmsgf ("Could not find object %d to lock/unlock", tag);
811 return; 649 return;
812 } 650 }
813 651
814 if (!flag) 652 if (!flag)
815 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
816 else 654 else
817 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
818 656
819 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
820} 658}
821 659
822/** Client wants to mark some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
… …
826 tag_t tag = net_uint32 ((uint8 *)data); 664 tag_t tag = net_uint32 ((uint8 *)data);
827 object *op = esrv_get_ob_from_count (pl->ob, tag); 665 object *op = esrv_get_ob_from_count (pl->ob, tag);
828 666
829 if (!op) 667 if (!op)
830 { 668 {
831 pl->failmsg ("Could not find object to mark"); 669 pl->failmsgf ("Could not find object %d to mark", tag);
832 return; 670 return;
833 } 671 }
834 672
835 pl->mark = op; 673 pl->mark = op;
836 pl->ob->statusmsg (format ("Marked item %s", query_name (op))); 674 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
… …
843 * Tero.Haatanen@lut.fi ] 681 * Tero.Haatanen@lut.fi ]
844 */ 682 */
845static void 683static void
846look_at (player *pl, int dx, int dy) 684look_at (player *pl, int dx, int dy)
847{ 685{
848 dynbuf_text buf; 686 dynbuf_text &buf = msg_dynbuf; buf.clear ();
849 object *ob = pl->ob; 687 object *ob = pl->ob;
850 688
851 if (!pl->observe->map) 689 if (!pl->observe->map)
852 return; 690 return;
691
692 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
853 693
854 mapxy pos (pl->observe); 694 mapxy pos (pl->observe);
855 pos.move (dx, dy); 695 pos.move (dx, dy);
856 696
697 if (wiz)
698 {
857 if (pos.normalise ()) 699 if (pos.normalise ())
700 {
701 mapspace &ms = *pos;
702 ms.update ();
703
704 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
705 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
706 &pos.m->path, pos.x, pos.y, dx, dy,
707 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
708 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
709 );
710 }
711 else
712 buf << "off-map\n\n";
713 }
714
715 int darkness = pl->blocked_los (dx, dy);
716
717 if (darkness == LOS_BLOCKED)
718 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
719 else if (darkness == LOS_MAX)
720 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
721 else
722 {
723 if (pos.normalise ())
858 for (object *tmp = pos->top; tmp; tmp = tmp->below) 724 for (object *tmp = pos->top; tmp; tmp = tmp->below)
859 { 725 {
860 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 726 if (tmp->invisible && !ob->flag [FLAG_WIZ])
861 continue; 727 continue;
862 728
863 if (QUERY_FLAG (ob, FLAG_WIZ)) 729 if (wiz)
864 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count); 730 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
865 else 731 else
866 buf.printf ("- %s.\n", query_name (tmp)); 732 buf.printf (" - %s.\n", query_name (tmp));
867 733
868 object *head = tmp->head_ (); 734 object *head = tmp->head_ ();
869 735
870 if (head->inv) 736 if (head->inv)
871 if ((head->type != CONTAINER && head->type != FLESH) 737 if ((head->type != CONTAINER && head->type != FLESH)
872 || QUERY_FLAG (ob, FLAG_WIZ)) 738 || ob->flag [FLAG_WIZ])
873 buf << head->query_inventory (ob, " "); 739 buf << head->query_inventory (ob, " ");
874 740
875 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 741 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
876 break; 742 break;
743 }
877 } 744 }
878 745
879 if (buf.empty ()) 746 if (buf.empty ())
880 pl->failmsg ("You see nothing there."); 747 buf << "You see nothing there.";
881 else 748
882 pl->infobox (MSG_CHANNEL ("lookat"), buf); 749 pl->infobox (MSG_CHANNEL ("lookat"), buf);
883} 750}
884 751
885/** Client wants to look at some object. Lets do so. */ 752/** Client wants to look at some object. Lets do so. */
886void 753void
887LookAt (char *buf, int len, player *pl) 754LookAt (char *buf, int len, player *pl)
… …
892 if (!(cp = strchr (buf, ' '))) 759 if (!(cp = strchr (buf, ' ')))
893 return; 760 return;
894 761
895 int dy = atoi (cp); 762 int dy = atoi (cp);
896 763
897 if (player *opl = pl->observe->contr)
898 if (client *ns = opl->ns)
899 {
900 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
901 return;
902
903 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
904 return;
905 }
906
907 look_at (pl, dx, dy); 764 look_at (pl, dx, dy);
908} 765}
909 766
910/** Move an object to a new location */ 767/** Move an object to a new location */
911void 768void
912esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 769esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
913{ 770{
914 object *op, *env;
915
916 op = esrv_get_ob_from_count (pl, tag); 771 object *op = esrv_get_ob_from_count (pl, tag);
917 if (!op) 772 if (!op)
918 { 773 {
919 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 774 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
920 return; 775 return;
921 } 776 }
… …
926 return; 781 return;
927 782
928 /* If it is an active container, then we should drop all objects 783 /* If it is an active container, then we should drop all objects
929 * in the container and not the container itself. 784 * in the container and not the container itself.
930 */ 785 */
931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
932 { 787 {
933 int cnt = MAX_ITEM_PER_DROP; 788 int cnt = MAX_ITEM_PER_ACTION;
934 789
935 for (object *current = op->inv; current; ) 790 for (object *current = op->inv; current && cnt--; )
936 { 791 {
937 object *next = current->below; 792 object *next = current->below;
938
939 drop_object (pl, current, 0); 793 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next; 794 current = next;
944 } 795 }
945 796
946 if (cnt <= 0) 797 if (cnt <= 0)
947 op->failmsg ("Only dropped some items, can't drop that many items at once."); 798 op->failmsg ("Only dropped some items, can't drop that many items at once.");
… …
960 pl->contr->count = nrof; 811 pl->contr->count = nrof;
961 pick_up (pl, op); 812 pick_up (pl, op);
962 return; 813 return;
963 } 814 }
964 815
965 env = esrv_get_ob_from_count (pl, to); 816 object *env = esrv_get_ob_from_count (pl, to);
966 if (!env) 817 if (!env)
967 { 818 {
968 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 819 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
969 return; 820 return;
970 } 821 }

Diff Legend

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