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.51 by root, Tue Jul 24 04:55:35 2007 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC

1/* 1/*
2 * This file is part of Crossfire TRT, the Roguelike Realtime MORPG. 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 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 3 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,
… …
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, see <http://www.gnu.org/licenses/>. 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 * 20 *
21 * 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>
22 */ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client/server logic. 26 * Client/server logic.
… …
37#include <sproto.h> 37#include <sproto.h>
38 38
39/** 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 */
40#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41 41
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/******************************************************************************* 42/*******************************************************************************
183 * 43 *
184 * Functions related to sending object data to the client. 44 * Functions related to sending object data to the client.
185 * 45 *
186 ******************************************************************************/ 46 ******************************************************************************/
… …
193query_flags (object *op) 53query_flags (object *op)
194{ 54{
195 unsigned int flags = 0; 55 unsigned int flags = 0;
196 56
197 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
198 {
199 switch (op->type) 58 switch (op->type)
200 { 59 {
201 case BOW: 60 case BOW:
202 case WAND: 61 case WAND:
203 case ROD: 62 case ROD:
204 case HORN: 63 case HORN:
205 flags = a_readied; 64 flags = a_readied;
206 break; 65 break;
207 case WEAPON: 66 case WEAPON:
208 flags = a_wielded; 67 flags = a_wielded;
209 break; 68 break;
210 case SKILL: 69 case SKILL:
211 case ARMOUR: 70 case ARMOUR:
212 case HELMET: 71 case HELMET:
213 case SHIELD: 72 case SHIELD:
214 case RING: 73 case RING:
215 case BOOTS: 74 case BOOTS:
216 case GLOVES: 75 case GLOVES:
217 case AMULET: 76 case AMULET:
218 case GIRDLE: 77 case GIRDLE:
219 case BRACERS: 78 case BRACERS:
220 case CLOAK: 79 case CLOAK:
221 flags = a_worn; 80 flags = a_worn;
222 break; 81 break;
223 case CONTAINER: 82 case CONTAINER:
224 flags = a_active; 83 flags = a_active;
225 break; 84 break;
226 default: 85 default:
227 flags = a_applied; 86 flags = a_applied;
228 break; 87 break;
229 } 88 }
230 }
231 89
232 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))))
233 flags |= F_OPEN; 91 flags |= F_OPEN;
234 92
235 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
255 * animation of face to the client. 113 * animation of face to the client.
256 */ 114 */
257static void 115static void
258add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
259{ 117{
260 int flags, len, anim_speed;
261 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
262 const char *item_p; 119 const char *item_p;
263 120
264 flags = query_flags (head); 121 int flags = query_flags (head);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
266 flags |= F_NOPICK; 123 flags |= F_NOPICK;
267 124
268 ns.send_face (head->face, -50); 125 ns.send_face (head->face, -50);
269 ns.flush_fx (); 126 ns.flush_fx ();
… …
271 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])
272 ns.send_animation (head->animation_id); 129 ns.send_animation (head->animation_id);
273 130
274 sl << uint32 (head->count) 131 sl << uint32 (head->count)
275 << uint32 (flags) 132 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
277 << uint32 (head->face); 134 << uint32 (head->face);
135
136 int len;
278 137
279 if (!head->custom_name) 138 if (!head->custom_name)
280 { 139 {
281 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
282 item_n[127] = 0; 141 item_n[127] = 0;
… …
296 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
297 156
298 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
299 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
300 159
301 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
302 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
303 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
304 if (head->anim_speed)
305 anim_speed = head->anim_speed;
306 else
307 {
308 if (fabs (head->speed) < 0.001)
309 anim_speed = 255;
310 else if (fabs (head->speed) >= 1.0)
311 anim_speed = 1;
312 else
313 anim_speed = (int) (1.0 / fabs (head->speed));
314 }
315
316 if (anim_speed > 255)
317 anim_speed = 255;
318 }
319 163
320 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
321 << uint32 (head->nrof); 165 << uint32 (head->nrof);
322 166
323 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
324 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
325 169
326 SET_FLAG (head, FLAG_CLIENT_SENT); 170 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 171}
172
173static faceidx
174need_face_now (player *pl, const char *name)
175{
176 faceidx face = face_find (name, empty_face);
177
178 pl->ns->send_face (face, -50);
179 pl->ns->flush_fx ();
180
181 return face;
182}
183
184#define FINGER_UP "finger_up.x11"
185#define FINGER_DOWN "finger_down.x11"
328 186
329/** 187/**
330 * Send the look window. Don't need to do animations here 188 * Send the look window. Don't need to do animations here
331 * This sends all the faces to the client, not just updates. This is 189 * This sends all the faces to the client, not just updates. This is
332 * because object ordering would otherwise be inconsistent. 190 * because object ordering would otherwise be inconsistent.
333 */ 191 */
334void 192void
335esrv_draw_look (player *pl) 193esrv_draw_look (player *pl)
336{ 194{
337 int got_one = 0, start_look = 0, end_look = 0;
338
339 object *ob = pl->ob; 195 object *ob = pl->ob;
340 196
341 if (!pl->ns->update_look) 197 if (!pl->ns->update_look)
342 { 198 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 199 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
344 return; 200 return;
345 } 201 }
346 else 202
347 pl->ns->update_look = 0; 203 pl->ns->update_look = 0;
348 204
349 if (QUERY_FLAG (ob, FLAG_REMOVED) 205 if (QUERY_FLAG (ob, FLAG_REMOVED)
350 || !ob->map 206 || !ob->map
351 || ob->map->in_memory != MAP_IN_MEMORY 207 || ob->map->in_memory != MAP_ACTIVE
352 || out_of_map (ob->map, ob->x, ob->y)) 208 || out_of_map (ob->map, ob->x, ob->y))
353 return; 209 return;
354 210
355 pl->ns->send_packet ("delinv 0"); 211 pl->ns->send_packet ("delinv 0");
356 212
357 packet sl; 213 packet sl;
358 sl.printf ("item%d ", pl->ns->itemcmd); 214 sl.printf ("item%d ", pl->ns->itemcmd);
359 215
360 sl << uint32 (0); 216 sl << uint32 (0);
361 217
362 pl->ns->send_face (empty_face, -50); 218 int start_pos = pl->ns->look_position;
363 pl->ns->flush_fx (); 219 bool dirty = false;
364 220
365 if (pl->ns->look_position) 221 mapspace &ms = ob->ms ();
222
223 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
224 // start from the top
225 object *items [FLOORBOX_PAGESIZE];
226 int item_idx = 0, item_cnt = 0;
227 int pos = 0;
228
229 // find our items by walking down
230 object *item = ms.top;
231
232 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
233 {
234 if (!item->client_visible ())
235 continue;
236
237 if (++pos < start_pos)
238 continue;
239
240 // record item
241 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
242 item_cnt++;
243
244 // stop at first floor
245 if (item->flag [FLAG_IS_FLOOR])
246 {
247 // we are finished, don't append "next group of items"
248 // by setting item to ms.bot it becomes zero which is checked after the while loop
249 item = ms.bot;
250 }
366 { 251 }
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 252
253 // see if there are more if we cared - we ignore invisible objects
254 if (item)
255 {
256 /* What we basically do is make a 'fake' object - when the user applies it,
257 * we notice the special tag the object has, and act accordingly.
258 */
370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 259 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
371 << uint32 (0) 260 << uint32 (0)
372 << sint32 (-1) 261 << uint32 ((uint32) - 1)
373 << uint32 (empty_face) 262 << uint32 (need_face_now (pl, FINGER_DOWN))
374 << data8 (buf) 263 << data8 ("Apply this to see the items below")
375 << uint16 (0) 264 << uint16 (0)
376 << uint8 (0) 265 << uint8 (0)
377 << uint32 (0); 266 << uint32 (0);
378 267
379 if (pl->ns->itemcmd == 2) 268 if (pl->ns->itemcmd == 2)
380 sl << uint16 (0); 269 sl << uint16 (0);
381 }
382 270
383 object *tmp = ob->ms ().top; 271 dirty = true;
384 for (object *last = 0; tmp != last; tmp = tmp->below)
385 { 272 }
386 object *head;
387 273
388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 274 // now send out all items in the ring buffer in reverse order
275 while (item_cnt)
276 {
277 --item_cnt;
278 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
279 object *item = items [item_idx];
280
281 add_object_to_socklist (*pl->ns, sl, item->head_ ());
282
283 dirty = true;
284
285 // if packet got too large, send it and begin a new one
286 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
389 { 287 {
390 last = tmp->below; /* assumes double floor mode */ 288 pl->ns->send_packet (sl);
391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 289
392 last = last->below; 290 sl.reset ();
291 sl.printf ("item%d ", pl->ns->itemcmd);
292 sl << uint32 (0);
293
294 dirty = false;
393 } 295 }
394
395 if (tmp->client_visible ())
396 {
397 if (++start_look < pl->ns->look_position)
398 continue;
399
400 end_look++;
401
402 if (end_look > FLOORBOX_PAGESIZE)
403 {
404 /* What we basically do is make a 'fake' object - when the user applies it,
405 * we notice the special tag the object has, and act accordingly.
406 */
407 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
408 << uint32 (0)
409 << uint32 ((uint32) - 1)
410 << uint32 (empty_face)
411 << data8 ("Apply this to see next group of items")
412 << uint16 (0)
413 << uint8 (0)
414 << uint32 (0);
415
416 if (pl->ns->itemcmd == 2)
417 sl << uint16 (0);
418
419 break;
420 }
421
422 if (tmp->head)
423 head = tmp->head;
424 else
425 head = tmp;
426
427 add_object_to_socklist (*pl->ns, sl, head);
428 got_one++;
429
430 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
431 {
432 pl->ns->send_packet (sl);
433
434 sl.reset ();
435 sl.printf ("item%d ", pl->ns->itemcmd);
436 sl << uint32 (0);
437 got_one = 0;
438 }
439 }
440 } 296 }
441 297
442 if (got_one) 298 if (start_pos)
299 {
300 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
301 << uint32 (0)
302 << sint32 (-1)
303 << uint32 (need_face_now (pl, FINGER_UP))
304 << data8 ("Apply this to see the items higher up")
305 << uint16 (0)
306 << uint8 (0)
307 << uint32 (0);
308
309 if (pl->ns->itemcmd == 2)
310 sl << uint16 (0);
311
312 dirty = true;
313 }
314
315 if (dirty)
443 pl->ns->send_packet (sl); 316 pl->ns->send_packet (sl);
444
445} 317}
446 318
447/** 319/**
448 * Sends whole inventory. 320 * Sends whole inventory.
449 */ 321 */
… …
479 351
480 /* IT is possible for players to accumulate a huge amount of 352 /* IT is possible for players to accumulate a huge amount of
481 * items (especially with some of the bags out there) to 353 * items (especially with some of the bags out there) to
482 * overflow the buffer. IF so, send multiple item commands. 354 * overflow the buffer. IF so, send multiple item commands.
483 */ 355 */
484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 356 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
485 { 357 {
486 pl->contr->ns->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
487 359
488 sl.reset (); 360 sl.reset ();
489 sl.printf ("item%d ", pl->contr->ns->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
… …
506 */ 378 */
507void 379void
508esrv_update_item (int flags, object *pl, object *op) 380esrv_update_item (int flags, object *pl, object *op)
509{ 381{
510 /* If we have a request to send the player item, skip a few checks. */ 382 /* If we have a request to send the player item, skip a few checks. */
511 if (op != pl)
512 {
513 if (!op->client_visible ()) 383 if (op != pl && !op->client_visible ())
514 return; 384 return;
515 /* we remove the check for op->env, because in theory, the object
516 * is hopefully in the same place, so the client should preserve
517 * order.
518 */
519 }
520 385
521 client *ns = pl->contr->ns; 386 client *ns = pl->contr->ns;
522 if (!ns) 387 if (!ns)
523 return; 388 return;
524 389
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 {
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 391 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
528 * this is happening - we can set a breakpoint here in the debugger 392 * this is happening - we can set a breakpoint here in the debugger
529 * and track back the call. 393 * and track back the call.
530 */ 394 */
531 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 395 LOG (llevDebug | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count);
532 }
533 396
534 packet sl ("upditem"); 397 packet sl ("upditem");
535 398
536 sl << uint8 (flags); 399 sl << uint8 (flags);
537 400
538 if (op->head)
539 op = op->head; 401 op = op->head_ ();
540 402
541 sl << uint32 (op->count); 403 sl << uint32 (op->count);
542 404
543 if (flags & UPD_LOCATION) 405 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 406 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 408 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 409 sl << uint32 (query_flags (op));
548 410
549 if (flags & UPD_WEIGHT) 411 if (flags & UPD_WEIGHT)
550 { 412 {
551 sint32 weight = WEIGHT (op); 413 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
552 414
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554
555 if (pl == op) 415 if (op)
556 ns->last_weight = weight; 416 ns->last_weight = weight;
417
418 sl << uint32 (weight);
557 } 419 }
558 420
559 if (flags & UPD_FACE) 421 if (flags & UPD_FACE)
560 { 422 {
561 ns->send_face (op->face, -50); 423 ns->send_face (op->face, -50);
… …
632esrv_send_item (object *pl, object *op) 494esrv_send_item (object *pl, object *op)
633{ 495{
634 if (!pl->contr->ns) 496 if (!pl->contr->ns)
635 return; 497 return;
636 498
637 /* If this is not the player object, do some more checks */
638 if (op != pl)
639 {
640 /* We only send 'visibile' objects to the client */ 499 /* We only send 'visible' objects to the client, and sometimes the player */
641 if (!op->client_visible ()) 500 if (!op->client_visible () && op->type != PLAYER)
642 return; 501 return;
643
644 /* if the item is on the ground, mark that the look needs to
645 * be updated.
646 */
647 if (!op->env)
648 {
649 pl->contr->ns->floorbox_update ();
650 return;
651 }
652 }
653 502
654 packet sl; 503 packet sl;
655 504
656 sl.printf ("item%d ", pl->contr->ns->itemcmd); 505 sl.printf ("item%d ", pl->contr->ns->itemcmd);
657 506
658 if (op->head)
659 op = op->head; 507 op = op->head_ ();
660 508
661 sl << uint32 (op->env ? op->env->count : 0); 509 sl << uint32 (op->env ? op->env->count : 0);
662 510
663 add_object_to_socklist (*pl->contr->ns, sl, op); 511 add_object_to_socklist (*pl->contr->ns, sl, op);
664 512
665 pl->contr->ns->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT); 514 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 515}
668 516
669/** 517/**
670 * Tells the client to delete an item. Uses the item 518 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 519 */
673void 520void
674esrv_del_item (player *pl, int tag) 521esrv_del_item (player *pl, int tag)
675{ 522{
676 if (!pl->ns) 523 if (!pl->ns)
… …
731void 578void
732ExamineCmd (char *buf, int len, player *pl) 579ExamineCmd (char *buf, int len, player *pl)
733{ 580{
734 tag_t tag = atoi (buf); 581 tag_t tag = atoi (buf);
735 582
583 /* If the high bit is set, player applied a pseudo object. */
584 if (tag & 0x80000000)
585 {
586 pl->ns->look_position = tag & 0x7fffffff;
587 pl->ns->floorbox_update ();
588 return;
589 }
590
736 object *op = esrv_get_ob_from_count (pl->ob, tag); 591 object *op = esrv_get_ob_from_count (pl->ob, tag);
737 592
738 if (!op) 593 if (!op)
739 { 594 {
740 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 595 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
751 tag_t tag = atoi (buf); 606 tag_t tag = atoi (buf);
752 607
753 if (object *op = esrv_get_ob_from_count (pl->ob, tag)) 608 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
754 { 609 {
755 std::string s = op->describe (pl->ob); 610 std::string s = op->describe (pl->ob);
611
612 if (msg_is_special (s.c_str (), false))
613 cfperl_expand_cfpod (pl, s);
756 614
757 packet sl ("ex"); 615 packet sl ("ex");
758 sl << ber32 (tag) << s.c_str (); 616 sl << ber32 (tag) << s.c_str ();
759 617
760 pl->ns->send_packet (sl); 618 pl->ns->send_packet (sl);
… …
764/** Client wants to apply some object. Lets do so. */ 622/** Client wants to apply some object. Lets do so. */
765void 623void
766ApplyCmd (char *buf, int len, player *pl) 624ApplyCmd (char *buf, int len, player *pl)
767{ 625{
768 tag_t tag = atoi (buf); 626 tag_t tag = atoi (buf);
769
770 /* sort of a hack, but if the player saves and the player then manually
771 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
772 */
773 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
774 return;
775 627
776 /* If the high bit is set, player applied a pseudo object. */ 628 /* If the high bit is set, player applied a pseudo object. */
777 if (tag & 0x80000000) 629 if (tag & 0x80000000)
778 { 630 {
779 pl->ns->look_position = tag & 0x7fffffff; 631 pl->ns->look_position = tag & 0x7fffffff;
… …
800 tag_t tag = net_uint32 ((uint8 *)data + 1); 652 tag_t tag = net_uint32 ((uint8 *)data + 1);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 653 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 654
803 if (!op) 655 if (!op)
804 { 656 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 657 pl->failmsg ("Could not find object to lock/unlock");
806 return; 658 return;
807 } 659 }
808 660
809 if (!flag) 661 if (!flag)
810 CLEAR_FLAG (op, FLAG_INV_LOCKED); 662 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
821 tag_t tag = net_uint32 ((uint8 *)data); 673 tag_t tag = net_uint32 ((uint8 *)data);
822 object *op = esrv_get_ob_from_count (pl->ob, tag); 674 object *op = esrv_get_ob_from_count (pl->ob, tag);
823 675
824 if (!op) 676 if (!op)
825 { 677 {
826 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 678 pl->failmsg ("Could not find object to mark");
827 return; 679 return;
828 } 680 }
829 681
830 pl->mark = op; 682 pl->mark = op;
831 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 683 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
832} 684}
833 685
834/** 686/**
835 * look_at prints items on the specified square. 687 * look_at prints items on the specified square.
836 * 688 *
… …
838 * Tero.Haatanen@lut.fi ] 690 * Tero.Haatanen@lut.fi ]
839 */ 691 */
840static void 692static void
841look_at (player *pl, int dx, int dy) 693look_at (player *pl, int dx, int dy)
842{ 694{
695 dynbuf_text buf;
843 object *ob = pl->ob; 696 object *ob = pl->ob;
844 697
845 maptile *m = pl->observe->map; 698 if (!pl->observe->map)
846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
848
849 if (!m)
850 return; 699 return;
851 700
852 if (!xy_normalise (m, x, y)) 701 mapxy pos (pl->observe);
853 { 702 pos.move (dx, dy);
854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
855 return;
856 }
857 703
858 int flag = 0; 704 if (pos.normalise ())
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below) 705 for (object *tmp = pos->top; tmp; tmp = tmp->below)
861 { 706 {
862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 707 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
863 continue; 708 continue;
864 709
865 if (!flag)
866 {
867 if (dx || dy)
868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
869 else
870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
871
872 flag = 1;
873 }
874
875 if (QUERY_FLAG (ob, FLAG_WIZ)) 710 if (QUERY_FLAG (ob, FLAG_WIZ))
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count); 711 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
877 else 712 else
878 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 713 buf.printf ("- %s.\n", query_name (tmp));
879 714
880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 715 object *head = tmp->head_ ();
881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
883 716
717 if (head->inv)
718 if ((head->type != CONTAINER && head->type != FLESH)
719 || QUERY_FLAG (ob, FLAG_WIZ))
720 buf << head->query_inventory (ob, " ");
721
884 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 722 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
885 break; 723 break;
886 } 724 }
887 725
888 if (!flag) 726 if (buf.empty ())
889 { 727 pl->failmsg ("You see nothing there.");
890 if (dx || dy)
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
892 else 728 else
893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 729 pl->infobox (MSG_CHANNEL ("lookat"), buf);
894 }
895} 730}
896 731
897/** Client wants to look at some object. Lets do so. */ 732/** Client wants to look at some object. Lets do so. */
898void 733void
899LookAt (char *buf, int len, player *pl) 734LookAt (char *buf, int len, player *pl)
… …
921 756
922/** Move an object to a new location */ 757/** Move an object to a new location */
923void 758void
924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 759esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
925{ 760{
926 object *op, *env;
927
928 op = esrv_get_ob_from_count (pl, tag); 761 object *op = esrv_get_ob_from_count (pl, tag);
929 if (!op) 762 if (!op)
930 { 763 {
931 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 764 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
932 return; 765 return;
933 } 766 }
… …
940 /* If it is an active container, then we should drop all objects 773 /* If it is an active container, then we should drop all objects
941 * in the container and not the container itself. 774 * in the container and not the container itself.
942 */ 775 */
943 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
944 { 777 {
945 object *current, *next; 778 int cnt = MAX_ITEM_PER_DROP;
946 779
947 for (current = op->inv; current != NULL; current = next) 780 for (object *current = op->inv; current && cnt--; )
948 { 781 {
949 next = current->below; 782 object *next = current->below;
950 drop_object (pl, current, 0); 783 drop_object (pl, current, 0);
784 current = next;
951 } 785 }
952 786
953 esrv_update_item (UPD_WEIGHT, pl, op); 787 if (cnt <= 0)
788 op->failmsg ("Only dropped some items, can't drop that many items at once.");
954 } 789 }
955 else 790 else
956 drop_object (pl, op, nrof); 791 drop_object (pl, op, nrof);
957 792
958 return; 793 return;
… …
966 pl->contr->count = nrof; 801 pl->contr->count = nrof;
967 pick_up (pl, op); 802 pick_up (pl, op);
968 return; 803 return;
969 } 804 }
970 805
971 env = esrv_get_ob_from_count (pl, to); 806 object *env = esrv_get_ob_from_count (pl, to);
972 if (!env) 807 if (!env)
973 { 808 {
974 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 809 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
975 return; 810 return;
976 } 811 }
… …
978 /* put_object_in_sack presumes that necessary sanity checking 813 /* put_object_in_sack presumes that necessary sanity checking
979 * has already been done (eg, it can be picked up and fits in 814 * has already been done (eg, it can be picked up and fits in
980 * in a sack, so check for those things. We should also check 815 * in a sack, so check for those things. We should also check
981 * an make sure env is in fact a container for that matter. 816 * an make sure env is in fact a container for that matter.
982 */ 817 */
983 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 818 if (env->type == CONTAINER
819 && can_pick (pl, op)
820 && sack_can_hold (pl, env, op, nrof))
984 put_object_in_sack (pl, env, op, nrof); 821 put_object_in_sack (pl, env, op, nrof);
985} 822}
986 823

Diff Legend

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