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.97 by root, Wed May 4 07:41:14 2011 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,2009,2010,2011 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 * Crossfire TRT 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 <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24/** 25/**
25 * \file 26 * \file
26 * Client/server logic. 27 * Client/server logic.
… …
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 (op->flag [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 (op->flag [FLAG_KNOWN_CURSED])
236 { 95 {
237 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (op->flag [FLAG_DAMNED])
238 flags |= F_DAMNED; 97 flags |= F_DAMNED;
239 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (op->flag [FLAG_CURSED])
240 flags |= F_CURSED; 99 flags |= F_CURSED;
241 } 100 }
242 101
243 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
244 flags |= F_MAGIC; 103 flags |= F_MAGIC;
245 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (op->flag [FLAG_UNPAID])
246 flags |= F_UNPAID; 105 flags |= F_UNPAID;
247 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (op->flag [FLAG_INV_LOCKED])
248 flags |= F_LOCKED; 107 flags |= F_LOCKED;
249 108
250 return flags; 109 return flags;
251} 110}
252 111
… …
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);
265 if (QUERY_FLAG (head, FLAG_NO_PICK)) 120
121 if (head->flag [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 ();
270 125
271 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 126 if (head->flag [FLAG_ANIMATE] && !ns.anims_sent[head->animation_id])
272 ns.send_animation (head->animation_id); 127 ns.send_animation (head->animation_id);
273 128
274 sl << uint32 (head->count) 129 sl << uint32 (head->count)
275 << uint32 (flags) 130 << uint32 (flags)
276 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 131 << uint32 (head->flag [FLAG_NO_PICK] ? -1 : head->client_weight ())
277 << uint32 (head->face); 132 << uint32 (head->face);
278 133
279 if (!head->custom_name) 134 if (!head->custom_name)
280 { 135 {
281 strncpy (item_n, query_base_name (head, 0), 127); 136 const char *name;
282 item_n[127] = 0; 137 uint8 *len = sl.cur++; // patch up length later
283 len = strlen (item_n); 138
284 item_p = query_base_name (head, 1); 139 name = query_base_name (head, 0); sl << data (name, min (127, strlen (name)));
140 sl << uint8 (0);
141 name = query_base_name (head, 1); sl << data (name, min (127, strlen (name)));
142
143 *len = sl.cur - len - 1;
285 } 144 }
286 else 145 else
287 { 146 {
288 strncpy (item_n, head->custom_name, 127); 147 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 148
294 strncpy (item_n + len + 1, item_p, 127); 149 sl << uint8 (len * 2 + 1)
295 item_n[254] = 0; 150 << data (head->custom_name, len)
296 len += strlen (item_n + 1 + len) + 1; 151 << uint8 (0)
152 << data (head->custom_name, len);
153 }
297 154
298 sl << data8 (item_n, len)
299 << uint16 (head->animation_id); 155 sl << uint16 (head->animation_id);
300 156
301 anim_speed = 0; 157 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
302 if (QUERY_FLAG (head, FLAG_ANIMATE)) 158 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
303 { 159 : 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 160
320 sl << uint8 (anim_speed) 161 sl << uint8 (anim_speed)
321 << uint32 (head->nrof); 162 << uint32 (head->nrof);
322 163
323 if (ns.itemcmd == 2) 164 if (ns.itemcmd == 2)
324 sl << uint16 (head->client_type); 165 sl << uint16 (head->client_type);
325
326 SET_FLAG (head, FLAG_CLIENT_SENT);
327} 166}
167
168static faceidx
169need_face_now (player *pl, const char *name)
170{
171 faceidx face = face_find (name, empty_face);
172
173 pl->ns->send_face (face, -50);
174 pl->ns->flush_fx ();
175
176 return face;
177}
178
179#define FINGER_UP "finger_up.x11"
180#define FINGER_DOWN "finger_down.x11"
328 181
329/** 182/**
330 * Send the look window. Don't need to do animations here 183 * 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 184 * This sends all the faces to the client, not just updates. This is
332 * because object ordering would otherwise be inconsistent. 185 * because object ordering would otherwise be inconsistent.
333 */ 186 */
334void 187void
335esrv_draw_look (player *pl) 188esrv_draw_look (player *pl)
336{ 189{
337 int got_one = 0, start_look = 0, end_look = 0;
338
339 object *ob = pl->ob; 190 object *ob = pl->ob;
340 191
341 if (!pl->ns->update_look) 192 if (!pl->ns->update_look)
342 { 193 {
343 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name); 194 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
344 return; 195 return;
345 } 196 }
346 else 197
198 if (pl->ns->need_delinv0)
199 {
200 pl->ns->need_delinv0 = 0;
201 pl->ns->send_packet ("delinv 0");
202 }
203
204 if (pl->run_on)
205 return;
206
347 pl->ns->update_look = 0; 207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
348 209
349 if (QUERY_FLAG (ob, FLAG_REMOVED) 210 if (ob->flag [FLAG_REMOVED]
350 || !ob->map 211 || !ob->map
351 || ob->map->in_memory != MAP_IN_MEMORY 212 || ob->map->state != MAP_ACTIVE
352 || out_of_map (ob->map, ob->x, ob->y)) 213 || out_of_map (ob->map, ob->x, ob->y))
353 return; 214 return;
354
355 pl->ns->send_packet ("delinv 0");
356 215
357 packet sl; 216 packet sl;
358 sl.printf ("item%d ", pl->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
359 218
360 sl << uint32 (0); 219 sl << uint32 (0);
361 220
362 pl->ns->send_face (empty_face, -50); 221 int start_pos = pl->ns->look_position;
363 pl->ns->flush_fx (); 222 bool dirty = false;
364 223
365 if (pl->ns->look_position) 224 mapspace &ms = ob->ms ();
225
226 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
227 // start from the top
228 object *items [FLOORBOX_PAGESIZE];
229 int item_idx = 0, item_cnt = 0;
230 int pos = 0;
231
232 // find our items by walking down
233 object *item = ms.top;
234
235 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
236 {
237 if (!item->client_visible ())
238 continue;
239
240 if (++pos < start_pos)
241 continue;
242
243 // record item
244 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
245 item_cnt++;
246
247 // stop at first floor
248 if (item->flag [FLAG_IS_FLOOR])
249 {
250 // we are finished, don't append "next group of items"
251 // by setting item to ms.bot it becomes zero which is checked after the while loop
252 item = ms.bot;
253 }
366 { 254 }
367 char buf[80];
368 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
369 255
256 // see if there are more if we cared - we ignore invisible objects
257 if (item)
258 {
259 /* What we basically do is make a 'fake' object - when the user applies it,
260 * we notice the special tag the object has, and act accordingly.
261 */
370 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE)) 262 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
371 << uint32 (0) 263 << uint32 (0)
372 << sint32 (-1) 264 << uint32 ((uint32) - 1)
373 << uint32 (empty_face) 265 << uint32 (need_face_now (pl, FINGER_DOWN))
374 << data8 (buf) 266 << data8 ("Apply this to see the items below")
375 << uint16 (0) 267 << uint16 (0)
376 << uint8 (0) 268 << uint8 (0)
377 << uint32 (0); 269 << uint32 (0);
378 270
379 if (pl->ns->itemcmd == 2) 271 if (pl->ns->itemcmd == 2)
380 sl << uint16 (0); 272 sl << uint16 (0);
381 }
382 273
383 object *tmp = ob->ms ().top; 274 dirty = true;
384 for (object *last = 0; tmp != last; tmp = tmp->below)
385 { 275 }
386 object *head;
387 276
388 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 277 // now send out all items in the ring buffer in reverse order
278 while (item_cnt)
279 {
280 --item_cnt;
281 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
282 object *item = items [item_idx];
283
284 add_object_to_socklist (*pl->ns, sl, item->head_ ());
285
286 dirty = true;
287
288 // if packet got too large, send it and begin a new one
289 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
389 { 290 {
390 last = tmp->below; /* assumes double floor mode */ 291 pl->ns->flush_fx ();
391 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 292 pl->ns->send_packet (sl);
392 last = last->below; 293
294 sl.reset ();
295 sl.printf ("item%d ", pl->ns->itemcmd);
296 sl << uint32 (0);
297
298 dirty = false;
393 } 299 }
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 } 300 }
441 301
442 if (got_one) 302 if (start_pos)
303 {
304 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
305 << uint32 (0)
306 << sint32 (-1)
307 << uint32 (need_face_now (pl, FINGER_UP))
308 << data8 ("Apply this to see the items higher up")
309 << uint16 (0)
310 << uint8 (0)
311 << uint32 (0);
312
313 if (pl->ns->itemcmd == 2)
314 sl << uint16 (0);
315
316 dirty = true;
317 }
318
319 if (dirty)
320 {
321 pl->ns->flush_fx ();
443 pl->ns->send_packet (sl); 322 pl->ns->send_packet (sl);
444 323 }
445} 324}
446 325
447/** 326/**
448 * Sends whole inventory. 327 * Sends whole inventory.
449 */ 328 */
… …
479 358
480 /* IT is possible for players to accumulate a huge amount of 359 /* IT is possible for players to accumulate a huge amount of
481 * items (especially with some of the bags out there) to 360 * items (especially with some of the bags out there) to
482 * overflow the buffer. IF so, send multiple item commands. 361 * overflow the buffer. IF so, send multiple item commands.
483 */ 362 */
484 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 363 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
485 { 364 {
365 pl->contr->ns->flush_fx ();
486 pl->contr->ns->send_packet (sl); 366 pl->contr->ns->send_packet (sl);
487 367
488 sl.reset (); 368 sl.reset ();
489 sl.printf ("item%d ", pl->contr->ns->itemcmd); 369 sl.printf ("item%d ", pl->contr->ns->itemcmd);
490 sl << uint32 (op->count); 370 sl << uint32 (op->count);
… …
492 } 372 }
493 } 373 }
494 } 374 }
495 375
496 if (got_one) 376 if (got_one)
377 {
378 pl->contr->ns->flush_fx ();
497 pl->contr->ns->send_packet (sl); 379 pl->contr->ns->send_packet (sl);
380 }
498} 381}
499 382
500/** 383/**
501 * Updates object *op for player *pl. 384 * Updates object *op for player *pl.
502 * 385 *
… …
506 */ 389 */
507void 390void
508esrv_update_item (int flags, object *pl, object *op) 391esrv_update_item (int flags, object *pl, object *op)
509{ 392{
510 /* If we have a request to send the player item, skip a few checks. */ 393 /* If we have a request to send the player item, skip a few checks. */
511 if (op != pl)
512 {
513 if (!op->client_visible ()) 394 if (op != pl && !op->client_visible ())
514 return; 395 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 396
521 client *ns = pl->contr->ns; 397 client *ns = pl->contr->ns;
522 if (!ns) 398 if (!ns)
523 return; 399 return;
524 400
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"); 401 packet sl ("upditem");
535 402
536 sl << uint8 (flags); 403 sl << uint8 (flags);
537 404
538 if (op->head)
539 op = op->head; 405 op = op->head_ ();
540 406
541 sl << uint32 (op->count); 407 sl << uint32 (op->count);
542 408
543 if (flags & UPD_LOCATION) 409 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 410 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 412 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 413 sl << uint32 (query_flags (op));
548 414
549 if (flags & UPD_WEIGHT) 415 if (flags & UPD_WEIGHT)
550 { 416 {
551 sint32 weight = WEIGHT (op); 417 sint32 weight = op->client_weight ();
552 418
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 419 if (op == pl)
554
555 if (pl == op)
556 ns->last_weight = weight; 420 ns->last_weight = weight;
421
422 sl << uint32 (weight);
557 } 423 }
558 424
559 if (flags & UPD_FACE) 425 if (flags & UPD_FACE)
560 { 426 {
561 ns->send_face (op->face, -50); 427 ns->send_face (op->face, -50);
… …
565 431
566 if (flags & UPD_NAME) 432 if (flags & UPD_NAME)
567 { 433 {
568 int len; 434 int len;
569 const char *item_p; 435 const char *item_p;
570 char item_n[MAX_BUF]; 436 char item_n[127 * 2];
571 437
572 if (!op->custom_name) 438 if (!op->custom_name)
573 { 439 {
574 strncpy (item_n, query_base_name (op, 0), 127); 440 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); 441 item_p = query_base_name (op, 1);
578 } 442 }
579 else 443 else
580 { 444 {
581 strncpy (item_n, op->custom_name, 127); 445 len = assign (item_n, &op->custom_name, 127);
582 item_n[127] = 0;
583 len = strlen (item_n);
584 item_p = op->custom_name; 446 item_p = &op->custom_name;
585 } 447 }
586 448
587 strncpy (item_n + len + 1, item_p, 127); 449 len += assign (item_n + len, item_p, 127);
588 item_n[254] = 0;
589 len += strlen (item_n + 1 + len) + 1;
590 450
591 sl << data8 (item_n, len); 451 sl << data8 (item_n, len);
592 } 452 }
593 453
594 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
… …
596 456
597 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
598 { 458 {
599 int anim_speed = 0; 459 int anim_speed = 0;
600 460
601 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
602 { 462 {
603 if (op->anim_speed) 463 if (op->anim_speed)
604 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
605 else 465 else
606 { 466 {
607 if (fabs (op->speed) < 0.001) 467 if (op->speed < 0.001)
608 anim_speed = 255; 468 anim_speed = 255;
609 else if (fabs (op->speed) >= 1.0) 469 else if (op->speed >= 1.0)
610 anim_speed = 1; 470 anim_speed = 1;
611 else 471 else
612 anim_speed = (int) (1.0 / fabs (op->speed)); 472 anim_speed = 1. / op->speed;
613 } 473 }
614 474
615 if (anim_speed > 255) 475 if (anim_speed > 255)
616 anim_speed = 255; 476 anim_speed = 255;
617 } 477 }
… …
632esrv_send_item (object *pl, object *op) 492esrv_send_item (object *pl, object *op)
633{ 493{
634 if (!pl->contr->ns) 494 if (!pl->contr->ns)
635 return; 495 return;
636 496
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 */ 497 /* We only send 'visible' objects to the client, and sometimes the player */
641 if (!op->client_visible ()) 498 if (!op->client_visible () && op->type != PLAYER)
642 return; 499 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 500
654 packet sl; 501 packet sl;
655 502
656 sl.printf ("item%d ", pl->contr->ns->itemcmd); 503 sl.printf ("item%d ", pl->contr->ns->itemcmd);
657 504
658 if (op->head)
659 op = op->head; 505 op = op->head_ ();
660 506
661 sl << uint32 (op->env ? op->env->count : 0); 507 sl << uint32 (op->env ? op->env->count : 0);
662 508
663 add_object_to_socklist (*pl->contr->ns, sl, op); 509 add_object_to_socklist (*pl->contr->ns, sl, op);
664 510
511 pl->contr->ns->flush_fx ();
665 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
666 SET_FLAG (op, FLAG_CLIENT_SENT);
667} 513}
668 514
669/** 515/**
670 * Tells the client to delete an item. Uses the item 516 * Tells the client to delete an item.
671 * command with a -1 location.
672 */ 517 */
673void 518void
674esrv_del_item (player *pl, int tag) 519esrv_del_item (player *pl, int tag)
675{ 520{
676 if (!pl->ns) 521 if (!pl->ns)
… …
692 537
693/** 538/**
694 * Takes a player and object count (tag) and returns the actual object 539 * Takes a player and object count (tag) and returns the actual object
695 * pointer, or null if it can't be found. 540 * pointer, or null if it can't be found.
696 */ 541 */
697object * 542static object *
698esrv_get_ob_from_count (object *pl, tag_t count) 543esrv_get_ob_from_count (object *pl, tag_t count)
699{ 544{
700 if (pl->count == count) 545 if (pl->count == count)
701 return pl; 546 return pl;
702 547
703 for (object *op = pl->inv; op; op = op->below) 548 for (object *op = pl->inv; op; op = op->below)
704 if (op->count == count) 549 if (op->count == count)
705 return op; 550 return op;
706 else if (op->type == CONTAINER && pl->container == op) 551 else if (op->type == CONTAINER && pl->container_ () == op)
707 for (object *tmp = op->inv; tmp; tmp = tmp->below) 552 for (object *tmp = op->inv; tmp; tmp = tmp->below)
708 if (tmp->count == count) 553 if (tmp->count == count)
709 return tmp; 554 return tmp;
710 555
711 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 556 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
712 if (op->head && op->head->count == count) 557 if (op->head && op->head->count == count)
713 return op; 558 return op;
714 else if (op->count == count) 559 else if (op->count == count)
715 return op; 560 return op;
716 else if (op->type == CONTAINER && pl->container == op) 561 else if (op->type == CONTAINER && pl->container_ () == op)
717 for (object *tmp = op->inv; tmp; tmp = tmp->below) 562 for (object *tmp = op->inv; tmp; tmp = tmp->below)
718 if (tmp->count == count) 563 if (tmp->count == count)
719 return tmp; 564 return tmp;
720 565
721#if 0 566#if 0
… …
731void 576void
732ExamineCmd (char *buf, int len, player *pl) 577ExamineCmd (char *buf, int len, player *pl)
733{ 578{
734 tag_t tag = atoi (buf); 579 tag_t tag = atoi (buf);
735 580
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. */ 581 /* If the high bit is set, player applied a pseudo object. */
777 if (tag & 0x80000000) 582 if (tag & 0x80000000)
778 { 583 {
779 pl->ns->look_position = tag & 0x7fffffff; 584 pl->ns->look_position = tag & 0x7fffffff;
780 pl->ns->floorbox_update (); 585 pl->ns->floorbox_update ();
… …
783 588
784 object *op = esrv_get_ob_from_count (pl->ob, tag); 589 object *op = esrv_get_ob_from_count (pl->ob, tag);
785 590
786 if (!op) 591 if (!op)
787 { 592 {
788 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 593 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
789 return; 594 return;
595 }
596
597 examine (pl->ob, op);
598}
599
600/** Client wants to examine some object. So lets do so. */
601void
602ExCmd (char *buf, int len, player *pl)
603{
604 tag_t tag = atoi (buf);
605
606 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
790 } 607 {
608 std::string s = op->describe (pl->ob);
791 609
792 player_apply (pl->ob, op, 0, 0); 610 packet sl ("ex");
611 sl << ber32 (tag)
612 << data (*pl->expand_cfpod (s.c_str ()));
613
614 pl->ns->send_packet (sl);
615 }
616}
617
618/** Client wants to apply some object. Lets do so. */
619void
620ApplyCmd (char *buf, int len, player *pl)
621{
622 tag_t tag = atoi (buf);
623
624 /* If the high bit is set, player applied a pseudo object. */
625 if (tag & 0x80000000)
626 {
627 pl->ns->look_position = tag & 0x7fffffff;
628 pl->ns->floorbox_update ();
629 return;
630 }
631
632 // the object might be legally gone already
633 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
634 pl->ob->apply (op, AP_TOGGLE);
793} 635}
794 636
795/** Client wants to lock some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
796void 638void
797LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
… …
800 tag_t tag = net_uint32 ((uint8 *)data + 1); 642 tag_t tag = net_uint32 ((uint8 *)data + 1);
801 object *op = esrv_get_ob_from_count (pl->ob, tag); 643 object *op = esrv_get_ob_from_count (pl->ob, tag);
802 644
803 if (!op) 645 if (!op)
804 { 646 {
805 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
806 return; 648 return;
807 } 649 }
808 650
809 if (!flag) 651 if (!flag)
810 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 op->clr_flag (FLAG_INV_LOCKED);
811 else 653 else
812 SET_FLAG (op, FLAG_INV_LOCKED); 654 op->set_flag (FLAG_INV_LOCKED);
813 655
814 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
815} 657}
816 658
817/** Client wants to mark some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
… …
821 tag_t tag = net_uint32 ((uint8 *)data); 663 tag_t tag = net_uint32 ((uint8 *)data);
822 object *op = esrv_get_ob_from_count (pl->ob, tag); 664 object *op = esrv_get_ob_from_count (pl->ob, tag);
823 665
824 if (!op) 666 if (!op)
825 { 667 {
826 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 668 pl->failmsg ("Could not find object to mark");
827 return; 669 return;
828 } 670 }
829 671
830 pl->mark = op; 672 pl->mark = op;
831 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 673 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
832} 674}
833 675
834/** 676/**
835 * look_at prints items on the specified square. 677 * look_at prints items on the specified square.
836 * 678 *
… …
838 * Tero.Haatanen@lut.fi ] 680 * Tero.Haatanen@lut.fi ]
839 */ 681 */
840static void 682static void
841look_at (player *pl, int dx, int dy) 683look_at (player *pl, int dx, int dy)
842{ 684{
685 dynbuf_text &buf = msg_dynbuf; buf.clear ();
843 object *ob = pl->ob; 686 object *ob = pl->ob;
844 687
845 maptile *m = pl->observe->map; 688 if (!pl->observe->map)
846 sint16 x = pl->observe->x + dx;
847 sint16 y = pl->observe->y + dy;
848
849 if (!m)
850 return;
851
852 if (!xy_normalise (m, x, y))
853 {
854 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
855 return; 689 return;
690
691 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
692
693 mapxy pos (pl->observe);
694 pos.move (dx, dy);
695
696 if (wiz)
856 } 697 {
857 698 if (pos.normalise ())
858 int flag = 0;
859
860 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
861 {
862 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
863 continue;
864
865 if (!flag)
866 { 699 {
867 if (dx || dy) 700 mapspace &ms = *pos;
868 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:"); 701 ms.update ();
869 else
870 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
871 702
872 flag = 1; 703 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
704 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
705 &pos.m->path, pos.x, pos.y, dx, dy,
706 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
707 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
708 );
873 } 709 }
874
875 if (QUERY_FLAG (ob, FLAG_WIZ))
876 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
877 else 710 else
878 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp)); 711 buf << "off-map\n\n";
712 }
879 713
880 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 714 int darkness = pl->blocked_los (dx, dy);
881 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
882 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
883 715
884 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */ 716 if (darkness == LOS_BLOCKED)
717 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
718 else if (darkness == LOS_MAX)
719 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
720 else
721 {
722 if (pos.normalise ())
723 for (object *tmp = pos->top; tmp; tmp = tmp->below)
724 {
725 if (tmp->invisible && !ob->flag [FLAG_WIZ])
726 continue;
727
728 if (wiz)
729 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
730 else
731 buf.printf (" - %s.\n", query_name (tmp));
732
733 object *head = tmp->head_ ();
734
735 if (head->inv)
736 if ((head->type != CONTAINER && head->type != FLESH)
737 || ob->flag [FLAG_WIZ])
738 buf << head->query_inventory (ob, " ");
739
740 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
885 break; 741 break;
886 } 742 }
887
888 if (!flag)
889 { 743 }
890 if (dx || dy) 744
891 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there."); 745 if (buf.empty ())
892 else 746 buf << "You see nothing there.";
893 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing."); 747
894 } 748 pl->infobox (MSG_CHANNEL ("lookat"), buf);
895} 749}
896 750
897/** Client wants to look at some object. Lets do so. */ 751/** Client wants to look at some object. Lets do so. */
898void 752void
899LookAt (char *buf, int len, player *pl) 753LookAt (char *buf, int len, player *pl)
… …
904 if (!(cp = strchr (buf, ' '))) 758 if (!(cp = strchr (buf, ' ')))
905 return; 759 return;
906 760
907 int dy = atoi (cp); 761 int dy = atoi (cp);
908 762
909 if (player *opl = pl->observe->contr)
910 if (client *ns = opl->ns)
911 {
912 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
913 return;
914
915 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
916 return;
917 }
918
919 look_at (pl, dx, dy); 763 look_at (pl, dx, dy);
920} 764}
921 765
922/** Move an object to a new location */ 766/** Move an object to a new location */
923void 767void
924esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 768esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
925{ 769{
926 object *op, *env;
927
928 op = esrv_get_ob_from_count (pl, tag); 770 object *op = esrv_get_ob_from_count (pl, tag);
929 if (!op) 771 if (!op)
930 { 772 {
931 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 773 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
932 return; 774 return;
933 } 775 }
… …
938 return; 780 return;
939 781
940 /* If it is an active container, then we should drop all objects 782 /* If it is an active container, then we should drop all objects
941 * in the container and not the container itself. 783 * in the container and not the container itself.
942 */ 784 */
943 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 785 if (op->inv && op->flag [FLAG_APPLIED])
944 { 786 {
945 object *current, *next; 787 int cnt = MAX_ITEM_PER_ACTION;
946 788
947 for (current = op->inv; current != NULL; current = next) 789 for (object *current = op->inv; current && cnt--; )
948 { 790 {
949 next = current->below; 791 object *next = current->below;
950 drop_object (pl, current, 0); 792 drop_object (pl, current, 0);
793 current = next;
951 } 794 }
952 795
953 esrv_update_item (UPD_WEIGHT, pl, op); 796 if (cnt <= 0)
797 op->failmsg ("Only dropped some items, can't drop that many items at once.");
954 } 798 }
955 else 799 else
956 drop_object (pl, op, nrof); 800 drop_object (pl, op, nrof);
957 801
958 return; 802 return;
… …
966 pl->contr->count = nrof; 810 pl->contr->count = nrof;
967 pick_up (pl, op); 811 pick_up (pl, op);
968 return; 812 return;
969 } 813 }
970 814
971 env = esrv_get_ob_from_count (pl, to); 815 object *env = esrv_get_ob_from_count (pl, to);
972 if (!env) 816 if (!env)
973 { 817 {
974 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 818 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
975 return; 819 return;
976 } 820 }
… …
978 /* put_object_in_sack presumes that necessary sanity checking 822 /* put_object_in_sack presumes that necessary sanity checking
979 * has already been done (eg, it can be picked up and fits in 823 * 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 824 * 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. 825 * an make sure env is in fact a container for that matter.
982 */ 826 */
983 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 827 if (env->type == CONTAINER
828 && can_pick (pl, op)
829 && sack_can_hold (pl, env, op, nrof))
984 put_object_in_sack (pl, env, op, nrof); 830 put_object_in_sack (pl, env, op, nrof);
985} 831}
986 832

Diff Legend

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