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.58 by root, Tue Apr 15 14:21:04 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 (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2018 Marc Alexander Lehmann / 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 {
199 switch (op->type) 60 switch (op->type)
200 { 61 {
201 case BOW: 62 case BOW:
202 case WAND: 63 case WAND:
203 case ROD: 64 case ROD:
204 case HORN: 65 case HORN:
205 flags = a_readied; 66 flags = a_readied;
206 break; 67 break;
207 case WEAPON: 68 case WEAPON:
208 flags = a_wielded; 69 flags = a_wielded;
209 break; 70 break;
210 case SKILL: 71 case SKILL:
211 case ARMOUR: 72 case ARMOUR:
212 case HELMET: 73 case HELMET:
213 case SHIELD: 74 case SHIELD:
214 case RING: 75 case RING:
215 case BOOTS: 76 case BOOTS:
216 case GLOVES: 77 case GLOVES:
217 case AMULET: 78 case AMULET:
218 case GIRDLE: 79 case GIRDLE:
219 case BRACERS: 80 case BRACERS:
220 case CLOAK: 81 case CLOAK:
221 flags = a_worn; 82 flags = a_worn;
222 break; 83 break;
223 case CONTAINER: 84 case CONTAINER:
224 flags = a_active; 85 flags = a_active;
225 break; 86 break;
226 default: 87 default:
227 flags = a_applied; 88 flags = a_applied;
228 break; 89 break;
229 } 90 }
230 }
231 91
232 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 92 if (op->is_open_container ())
233 flags |= F_OPEN; 93 flags |= F_OPEN;
234 94
235 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 95 if (op->flag [FLAG_KNOWN_CURSED])
236 { 96 {
237 if (QUERY_FLAG (op, FLAG_DAMNED)) 97 if (op->flag [FLAG_DAMNED])
238 flags |= F_DAMNED; 98 flags |= F_DAMNED;
239 else if (QUERY_FLAG (op, FLAG_CURSED)) 99 else if (op->flag [FLAG_CURSED])
240 flags |= F_CURSED; 100 flags |= F_CURSED;
241 } 101 }
242 102
243 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 103 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
244 flags |= F_MAGIC; 104 flags |= F_MAGIC;
245 if (QUERY_FLAG (op, FLAG_UNPAID)) 105 if (op->flag [FLAG_UNPAID])
246 flags |= F_UNPAID; 106 flags |= F_UNPAID;
247 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 107 if (op->flag [FLAG_INV_LOCKED])
248 flags |= F_LOCKED; 108 flags |= F_LOCKED;
249 109
250 return flags; 110 return flags;
251} 111}
252 112
… …
255 * animation of face to the client. 115 * animation of face to the client.
256 */ 116 */
257static void 117static void
258add_object_to_socklist (client &ns, packet &sl, object *head) 118add_object_to_socklist (client &ns, packet &sl, object *head)
259{ 119{
260 int flags, len, anim_speed;
261 char item_n[MAX_BUF];
262 const char *item_p;
263
264 flags = query_flags (head); 120 int flags = query_flags (head);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 121
122 if (head->flag [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 ();
270 126
271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 127 if (head->flag [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 (head->flag [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_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;
285 } 145 }
286 else 146 else
287 { 147 {
288 strncpy (item_n, head->custom_name, 127); 148 int len = min (127, head->custom_name.length ());
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_n (head->custom_name, len)
296 len += strlen (item_n + 1 + len) + 1; 152 << uint8 (0)
153 << data_n (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
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
347 pl->ns->update_look = 0; 208 pl->ns->update_look = 0;
209 pl->ns->need_delinv0 = 1;
348 210
349 if (QUERY_FLAG (ob, FLAG_REMOVED) 211 if (ob->flag [FLAG_REMOVED]
350 || !ob->map 212 || !ob->map
351 || ob->map->in_memory != MAP_ACTIVE 213 || ob->map->state != MAP_ACTIVE
352 || out_of_map (ob->map, ob->x, ob->y)) 214 || out_of_map (ob->map, ob->x, ob->y))
353 return; 215 return;
354
355 pl->ns->send_packet ("delinv 0");
356 216
357 packet sl; 217 packet sl;
358 sl.printf ("item%d ", pl->ns->itemcmd); 218 sl.printf ("item%d ", pl->ns->itemcmd);
359 219
360 sl << uint32 (0); 220 sl << uint32 (0);
361 221
362 pl->ns->send_face (empty_face, -50); 222 int start_pos = pl->ns->look_position;
363 pl->ns->flush_fx (); 223 bool dirty = false;
364 224
365 if (pl->ns->look_position) 225 mapspace &ms = ob->ms ();
226
227 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
228 // start from the top
229 object *items [FLOORBOX_PAGESIZE];
230 int item_idx = 0, item_cnt = 0;
231 int pos = 0;
232
233 // find our items by walking down
234 object *item = ms.top;
235
236 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
237 {
238 if (!item->client_visible ())
239 continue;
240
241 if (++pos < start_pos)
242 continue;
243
244 // record item
245 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
246 item_cnt++;
247
248 // stop at first floor
249 if (item->flag [FLAG_IS_FLOOR])
250 {
251 // we are finished, don't append "next group of items"
252 // by setting item to ms.bot it becomes zero which is checked after the while loop
253 item = ms.bot;
254 }
366 { 255 }
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 256
257 // see if there are more if we cared - we ignore invisible objects
258 if (item)
259 {
260 /* What we basically do is make a 'fake' object - when the user applies it,
261 * we notice the special tag the object has, and act accordingly.
262 */
370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 263 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
371 << uint32 (0) 264 << uint32 (0)
372 << sint32 (-1) 265 << uint32 ((uint32) - 1)
373 << uint32 (empty_face) 266 << uint32 (need_face_now (pl, FINGER_DOWN))
374 << data8 (buf) 267 << data8 ("Apply this to see the items below")
375 << uint16 (0) 268 << uint16 (0)
376 << uint8 (0) 269 << uint8 (0)
377 << uint32 (0); 270 << uint32 (0);
378 271
379 if (pl->ns->itemcmd == 2) 272 if (pl->ns->itemcmd == 2)
380 sl << uint16 (0); 273 sl << uint16 (0);
381 }
382 274
383 object *tmp = ob->ms ().top; 275 dirty = true;
384 for (object *last = 0; tmp != last; tmp = tmp->below)
385 { 276 }
386 object *head;
387 277
388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 278 // now send out all items in the ring buffer in reverse order
279 while (item_cnt)
280 {
281 --item_cnt;
282 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
283 object *item = items [item_idx];
284
285 add_object_to_socklist (*pl->ns, sl, item->head_ ());
286
287 dirty = true;
288
289 // if packet got too large, send it and begin a new one
290 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
389 { 291 {
390 last = tmp->below; /* assumes double floor mode */ 292 pl->ns->flush_fx ();
391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 293 pl->ns->send_packet (sl);
392 last = last->below; 294
295 sl.reset ();
296 sl.printf ("item%d ", pl->ns->itemcmd);
297 sl << uint32 (0);
298
299 dirty = false;
393 } 300 }
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 } 301 }
441 302
442 if (got_one) 303 if (start_pos)
304 {
305 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
306 << uint32 (0)
307 << sint32 (-1)
308 << uint32 (need_face_now (pl, FINGER_UP))
309 << data8 ("Apply this to see the items higher up")
310 << uint16 (0)
311 << uint8 (0)
312 << uint32 (0);
313
314 if (pl->ns->itemcmd == 2)
315 sl << uint16 (0);
316
317 dirty = true;
318 }
319
320 if (dirty)
321 {
322 pl->ns->flush_fx ();
443 pl->ns->send_packet (sl); 323 pl->ns->send_packet (sl);
444 324 }
445} 325}
446 326
447/** 327/**
448 * Sends whole inventory. 328 * Sends whole inventory.
449 */ 329 */
… …
481 * items (especially with some of the bags out there) to 361 * items (especially with some of the bags out there) to
482 * overflow the buffer. IF so, send multiple item commands. 362 * overflow the buffer. IF so, send multiple item commands.
483 */ 363 */
484 if (sl.length () > MAXSOCKBUF - MAXITEMLEN) 364 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
485 { 365 {
366 pl->contr->ns->flush_fx ();
486 pl->contr->ns->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
487 368
488 sl.reset (); 369 sl.reset ();
489 sl.printf ("item%d ", pl->contr->ns->itemcmd); 370 sl.printf ("item%d ", pl->contr->ns->itemcmd);
490 sl << uint32 (op->count); 371 sl << uint32 (op->count);
… …
492 } 373 }
493 } 374 }
494 } 375 }
495 376
496 if (got_one) 377 if (got_one)
378 {
379 pl->contr->ns->flush_fx ();
497 pl->contr->ns->send_packet (sl); 380 pl->contr->ns->send_packet (sl);
381 }
498} 382}
499 383
500/** 384/**
501 * Updates object *op for player *pl. 385 * Updates object *op for player *pl.
502 * 386 *
… …
506 */ 390 */
507void 391void
508esrv_update_item (int flags, object *pl, object *op) 392esrv_update_item (int flags, object *pl, object *op)
509{ 393{
510 /* If we have a request to send the player item, skip a few checks. */ 394 /* If we have a request to send the player item, skip a few checks. */
511 if (op != pl)
512 {
513 if (!op->client_visible ()) 395 if (op != pl && !op->client_visible ())
514 return; 396 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 397
521 client *ns = pl->contr->ns; 398 client *ns = pl->contr->ns;
522 if (!ns) 399 if (!ns)
523 return; 400 return;
524 401
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"); 402 packet sl ("upditem");
535 403
536 sl << uint8 (flags); 404 sl << uint8 (flags);
537 405
538 if (op->head)
539 op = op->head; 406 op = op->head_ ();
540 407
541 sl << uint32 (op->count); 408 sl << uint32 (op->count);
542 409
543 if (flags & UPD_LOCATION) 410 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 411 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 413 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 414 sl << uint32 (query_flags (op));
548 415
549 if (flags & UPD_WEIGHT) 416 if (flags & UPD_WEIGHT)
550 { 417 {
551 sint32 weight = WEIGHT (op); 418 sint32 weight = op->client_weight ();
552 419
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 420 if (op == pl)
554
555 if (pl == op)
556 ns->last_weight = weight; 421 ns->last_weight = weight;
422
423 sl << uint32 (weight);
557 } 424 }
558 425
559 if (flags & UPD_FACE) 426 if (flags & UPD_FACE)
560 { 427 {
561 ns->send_face (op->face, -50); 428 ns->send_face (op->face, -50);
… …
565 432
566 if (flags & UPD_NAME) 433 if (flags & UPD_NAME)
567 { 434 {
568 int len; 435 int len;
569 const char *item_p; 436 const char *item_p;
570 char item_n[MAX_BUF]; 437 char item_n[127 * 2];
571 438
572 if (!op->custom_name) 439 if (!op->custom_name)
573 { 440 {
574 strncpy (item_n, query_base_name (op, 0), 127); 441 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); 442 item_p = query_base_name (op, 1);
578 } 443 }
579 else 444 else
580 { 445 {
581 strncpy (item_n, op->custom_name, 127); 446 len = assign (item_n, &op->custom_name, 127);
582 item_n[127] = 0;
583 len = strlen (item_n);
584 item_p = op->custom_name; 447 item_p = &op->custom_name;
585 } 448 }
586 449
587 strncpy (item_n + len + 1, item_p, 127); 450 len += assign (item_n + len, item_p, 127);
588 item_n[254] = 0;
589 len += strlen (item_n + 1 + len) + 1;
590 451
591 sl << data8 (item_n, len); 452 sl << data8 (item_n, len);
592 } 453 }
593 454
594 if (flags & UPD_ANIM) 455 if (flags & UPD_ANIM)
… …
596 457
597 if (flags & UPD_ANIMSPEED) 458 if (flags & UPD_ANIMSPEED)
598 { 459 {
599 int anim_speed = 0; 460 int anim_speed = 0;
600 461
601 if (QUERY_FLAG (op, FLAG_ANIMATE)) 462 if (op->flag [FLAG_ANIMATE])
602 { 463 {
603 if (op->anim_speed) 464 if (op->anim_speed)
604 anim_speed = op->anim_speed; 465 anim_speed = op->anim_speed;
605 else 466 else
606 { 467 {
607 if (fabs (op->speed) < 0.001) 468 if (op->speed < 0.001)
608 anim_speed = 255; 469 anim_speed = 255;
609 else if (fabs (op->speed) >= 1.0) 470 else if (op->speed >= 1.0)
610 anim_speed = 1; 471 anim_speed = 1;
611 else 472 else
612 anim_speed = (int) (1.0 / fabs (op->speed)); 473 anim_speed = 1. / op->speed;
613 } 474 }
614 475
615 if (anim_speed > 255) 476 if (anim_speed > 255)
616 anim_speed = 255; 477 anim_speed = 255;
617 } 478 }
… …
632esrv_send_item (object *pl, object *op) 493esrv_send_item (object *pl, object *op)
633{ 494{
634 if (!pl->contr->ns) 495 if (!pl->contr->ns)
635 return; 496 return;
636 497
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 */ 498 /* We only send 'visible' objects to the client, and sometimes the player */
641 if (!op->client_visible ()) 499 if (!op->client_visible () && op->type != PLAYER)
642 return; 500 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 501
654 packet sl; 502 packet sl;
655 503
656 sl.printf ("item%d ", pl->contr->ns->itemcmd); 504 sl.printf ("item%d ", pl->contr->ns->itemcmd);
657 505
658 if (op->head)
659 op = op->head; 506 op = op->head_ ();
660 507
661 sl << uint32 (op->env ? op->env->count : 0); 508 sl << uint32 (op->env ? op->env->count : 0);
662 509
663 add_object_to_socklist (*pl->contr->ns, sl, op); 510 add_object_to_socklist (*pl->contr->ns, sl, op);
664 511
512 pl->contr->ns->flush_fx ();
665 pl->contr->ns->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 514}
668 515
669/** 516/**
670 * Tells the client to delete an item. Uses the item 517 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 518 */
673void 519void
674esrv_del_item (player *pl, int tag) 520esrv_del_item (player *pl, int tag)
675{ 521{
676 if (!pl->ns) 522 if (!pl->ns)
… …
692 538
693/** 539/**
694 * 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
695 * pointer, or null if it can't be found. 541 * pointer, or null if it can't be found.
696 */ 542 */
697object * 543static object *
698esrv_get_ob_from_count (object *pl, tag_t count) 544esrv_get_ob_from_count (object *pl, tag_t count)
699{ 545{
700 if (pl->count == count) 546 if (pl->count == count)
701 return pl; 547 return pl;
702 548
703 for (object *op = pl->inv; op; op = op->below) 549 for (object *op = pl->inv; op; op = op->below)
704 if (op->count == count) 550 if (op->count == count)
705 return op; 551 return op;
706 else if (op->type == CONTAINER && pl->container == op) 552 else if (op->type == CONTAINER && pl->container_ () == op)
707 for (object *tmp = op->inv; tmp; tmp = tmp->below) 553 for (object *tmp = op->inv; tmp; tmp = tmp->below)
708 if (tmp->count == count) 554 if (tmp->count == count)
709 return tmp; 555 return tmp;
710 556
711 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)
712 if (op->head && op->head->count == count) 558 if (op->head && op->head->count == count)
713 return op; 559 return op;
714 else if (op->count == count) 560 else if (op->count == count)
715 return op; 561 return op;
716 else if (op->type == CONTAINER && pl->container == op) 562 else if (op->type == CONTAINER && pl->container_ () == op)
717 for (object *tmp = op->inv; tmp; tmp = tmp->below) 563 for (object *tmp = op->inv; tmp; tmp = tmp->below)
718 if (tmp->count == count) 564 if (tmp->count == count)
719 return tmp; 565 return tmp;
720 566
721#if 0 567#if 0
… …
731void 577void
732ExamineCmd (char *buf, int len, player *pl) 578ExamineCmd (char *buf, int len, player *pl)
733{ 579{
734 tag_t tag = atoi (buf); 580 tag_t tag = atoi (buf);
735 581
736 object *op = esrv_get_ob_from_count (pl->ob, tag);
737
738 if (!op)
739 {
740 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
741 return;
742 }
743
744 examine (pl->ob, op);
745}
746
747/** Client wants to examine some object. So lets do so. */
748void
749ExCmd (char *buf, int len, player *pl)
750{
751 tag_t tag = atoi (buf);
752
753 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
754 {
755 std::string s = op->describe (pl->ob);
756
757 packet sl ("ex");
758 sl << ber32 (tag) << s.c_str ();
759
760 pl->ns->send_packet (sl);
761 }
762}
763
764/** Client wants to apply some object. Lets do so. */
765void
766ApplyCmd (char *buf, int len, player *pl)
767{
768 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
776 /* If the high bit is set, player applied a pseudo object. */ 582 /* If the high bit is set, player applied a pseudo object. */
777 if (tag & 0x80000000) 583 if (tag & 0x80000000)
778 { 584 {
779 pl->ns->look_position = tag & 0x7fffffff; 585 pl->ns->look_position = tag & 0x7fffffff;
780 pl->ns->floorbox_update (); 586 pl->ns->floorbox_update ();
… …
783 589
784 object *op = esrv_get_ob_from_count (pl->ob, tag); 590 object *op = esrv_get_ob_from_count (pl->ob, tag);
785 591
786 if (!op) 592 if (!op)
787 { 593 {
788 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 594 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
789 return; 595 return;
596 }
597
598 examine (pl->ob, op);
599}
600
601/** Client wants to examine some object. So lets do so. */
602void
603ExCmd (char *buf, int len, player *pl)
604{
605 tag_t tag = atoi (buf);
606
607 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
790 } 608 {
609 std::string s = op->describe (pl->ob);
791 610
792 player_apply (pl->ob, op, 0, 0); 611 packet sl ("ex");
612 sl << ber32 (tag)
613 << data_n (*pl->expand_cfpod (s.c_str ()));
614
615 pl->ns->send_packet (sl);
616 }
617}
618
619/** Client wants to apply some object. Lets do so. */
620void
621ApplyCmd (char *buf, int len, player *pl)
622{
623 tag_t tag = atoi (buf);
624
625 /* If the high bit is set, player applied a pseudo object. */
626 if (tag & 0x80000000)
627 {
628 pl->ns->look_position = tag & 0x7fffffff;
629 pl->ns->floorbox_update ();
630 return;
631 }
632
633 // the object might be legally gone already
634 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
635 pl->ob->apply (op, AP_TOGGLE);
793} 636}
794 637
795/** Client wants to lock some object. Lets do so. */ 638/** Client wants to lock some object. Lets do so. */
796void 639void
797LockItem (char *data, int len, player *pl) 640LockItem (char *data, int len, player *pl)
… …
800 tag_t tag = net_uint32 ((uint8 *)data + 1); 643 tag_t tag = net_uint32 ((uint8 *)data + 1);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 644 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 645
803 if (!op) 646 if (!op)
804 { 647 {
805 pl->failmsg ("Could not find object to lock/unlock"); 648 pl->failmsgf ("Could not find object %d to lock/unlock", tag);
806 return; 649 return;
807 } 650 }
808 651
809 if (!flag) 652 if (!flag)
810 CLEAR_FLAG (op, FLAG_INV_LOCKED); 653 op->clr_flag (FLAG_INV_LOCKED);
811 else 654 else
812 SET_FLAG (op, FLAG_INV_LOCKED); 655 op->set_flag (FLAG_INV_LOCKED);
813 656
814 esrv_update_item (UPD_FLAGS, pl->ob, op); 657 esrv_update_item (UPD_FLAGS, pl->ob, op);
815} 658}
816 659
817/** Client wants to mark some object. Lets do so. */ 660/** Client wants to mark some object. Lets do so. */
… …
821 tag_t tag = net_uint32 ((uint8 *)data); 664 tag_t tag = net_uint32 ((uint8 *)data);
822 object *op = esrv_get_ob_from_count (pl->ob, tag); 665 object *op = esrv_get_ob_from_count (pl->ob, tag);
823 666
824 if (!op) 667 if (!op)
825 { 668 {
826 pl->failmsg ("Could not find object to mark"); 669 pl->failmsgf ("Could not find object %d to mark", tag);
827 return; 670 return;
828 } 671 }
829 672
830 pl->mark = op; 673 pl->mark = op;
831 pl->ob->statusmsg (format ("Marked item %s", query_name (op))); 674 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
… …
838 * Tero.Haatanen@lut.fi ] 681 * Tero.Haatanen@lut.fi ]
839 */ 682 */
840static void 683static void
841look_at (player *pl, int dx, int dy) 684look_at (player *pl, int dx, int dy)
842{ 685{
843 dynbuf_text buf; 686 dynbuf_text &buf = msg_dynbuf; buf.clear ();
844 object *ob = pl->ob; 687 object *ob = pl->ob;
845 688
846 if (!pl->observe->map) 689 if (!pl->observe->map)
847 return; 690 return;
691
692 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
848 693
849 mapxy pos (pl->observe); 694 mapxy pos (pl->observe);
850 pos.move (dx, dy); 695 pos.move (dx, dy);
851 696
697 if (wiz)
698 {
852 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 ())
853 for (object *tmp = pos->top; tmp; tmp = tmp->below) 724 for (object *tmp = pos->top; tmp; tmp = tmp->below)
854 { 725 {
855 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ)) 726 if (tmp->invisible && !ob->flag [FLAG_WIZ])
856 continue; 727 continue;
857 728
858 if (QUERY_FLAG (ob, FLAG_WIZ)) 729 if (wiz)
859 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 ());
860 else 731 else
861 buf.printf ("- %s.\n", query_name (tmp)); 732 buf.printf (" - %s.\n", query_name (tmp));
862 733
863 object *head = tmp->head_ (); 734 object *head = tmp->head_ ();
864 735
865 if (head->inv) 736 if (head->inv)
866 if ((head->type != CONTAINER && head->type != FLESH) 737 if ((head->type != CONTAINER && head->type != FLESH)
867 || QUERY_FLAG (ob, FLAG_WIZ)) 738 || ob->flag [FLAG_WIZ])
868 buf << head->query_inventory (ob, " "); 739 buf << head->query_inventory (ob, " ");
869 740
870 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 */
871 break; 742 break;
743 }
872 } 744 }
873 745
874 if (buf.empty ()) 746 if (buf.empty ())
875 pl->failmsg ("You see nothing there."); 747 buf << "You see nothing there.";
876 else 748
877 pl->infobox (MSG_CHANNEL ("lookat"), buf); 749 pl->infobox (MSG_CHANNEL ("lookat"), buf);
878} 750}
879 751
880/** Client wants to look at some object. Lets do so. */ 752/** Client wants to look at some object. Lets do so. */
881void 753void
882LookAt (char *buf, int len, player *pl) 754LookAt (char *buf, int len, player *pl)
… …
887 if (!(cp = strchr (buf, ' '))) 759 if (!(cp = strchr (buf, ' ')))
888 return; 760 return;
889 761
890 int dy = atoi (cp); 762 int dy = atoi (cp);
891 763
892 if (player *opl = pl->observe->contr)
893 if (client *ns = opl->ns)
894 {
895 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
896 return;
897
898 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
899 return;
900 }
901
902 look_at (pl, dx, dy); 764 look_at (pl, dx, dy);
903} 765}
904 766
905/** Move an object to a new location */ 767/** Move an object to a new location */
906void 768void
907esrv_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)
908{ 770{
909 object *op, *env;
910
911 op = esrv_get_ob_from_count (pl, tag); 771 object *op = esrv_get_ob_from_count (pl, tag);
912 if (!op) 772 if (!op)
913 { 773 {
914 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);
915 return; 775 return;
916 } 776 }
… …
921 return; 781 return;
922 782
923 /* 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
924 * in the container and not the container itself. 784 * in the container and not the container itself.
925 */ 785 */
926 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 786 if (op->inv && op->flag [FLAG_APPLIED])
927 { 787 {
928 object *current, *next;
929
930 int cnt = MAX_ITEM_PER_DROP; 788 int cnt = MAX_ITEM_PER_ACTION;
931 789
932 for (current = op->inv; current != NULL; current = next) 790 for (object *current = op->inv; current && cnt--; )
933 { 791 {
934 next = current->below; 792 object *next = current->below;
935 drop_object (pl, current, 0); 793 drop_object (pl, current, 0);
936 794 current = next;
937 if (--cnt <= 0) break;
938 } 795 }
939 796
940 if (cnt <= 0) 797 if (cnt <= 0)
941 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.");
942
943 esrv_update_item (UPD_WEIGHT, pl, op);
944 } 799 }
945 else 800 else
946 drop_object (pl, op, nrof); 801 drop_object (pl, op, nrof);
947
948 update_after_inventory_change (pl);
949 802
950 return; 803 return;
951 } 804 }
952 else if (to == pl->count) 805 else if (to == pl->count)
953 { /* pick it up to the inventory */ 806 { /* pick it up to the inventory */
… …
958 pl->contr->count = nrof; 811 pl->contr->count = nrof;
959 pick_up (pl, op); 812 pick_up (pl, op);
960 return; 813 return;
961 } 814 }
962 815
963 env = esrv_get_ob_from_count (pl, to); 816 object *env = esrv_get_ob_from_count (pl, to);
964 if (!env) 817 if (!env)
965 { 818 {
966 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);
967 return; 820 return;
968 } 821 }
… …
970 /* put_object_in_sack presumes that necessary sanity checking 823 /* put_object_in_sack presumes that necessary sanity checking
971 * has already been done (eg, it can be picked up and fits in 824 * has already been done (eg, it can be picked up and fits in
972 * in a sack, so check for those things. We should also check 825 * in a sack, so check for those things. We should also check
973 * an make sure env is in fact a container for that matter. 826 * an make sure env is in fact a container for that matter.
974 */ 827 */
975 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 828 if (env->type == CONTAINER
976 { 829 && can_pick (pl, op)
830 && sack_can_hold (pl, env, op, nrof))
977 put_object_in_sack (pl, env, op, nrof); 831 put_object_in_sack (pl, env, op, nrof);
978 update_after_inventory_change (pl);
979 }
980} 832}
981 833

Diff Legend

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