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

Diff Legend

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