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.42 by root, Wed Mar 14 00:04:59 2007 UTC vs.
Revision 1.94 by root, Sun Apr 11 23:48:57 2010 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * This program 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 2 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, write to the Free Software 19 * and the GNU General Public License along with this program. If not, see
20 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * <http://www.gnu.org/licenses/>.
21 * 21 *
22 * The author can be reached via e-mail to <crossfire@schmorp.de> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25/** 25/**
26 * \file 26 * \file
27 * Client/server logic. 27 * Client/server logic.
… …
38#include <sproto.h> 38#include <sproto.h>
39 39
40/** 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 */
41#define MAXITEMLEN 300 41#define MAXITEMLEN 300
42 42
43#if 0
44tag_t
45client_container::tag () const
46{
47 switch (type)
48 {
49 case CC_INVENTORY:
50 return ns->pl->count;
51 case CC_MAPSPACE:
52 return 0;
53 case CC_CONTAINER:
54 return env->count;
55 }
56
57 abort ();
58}
59
60void
61client_container::clear ()
62{
63 switch (type)
64 {
65 case CC_INVENTORY:
66 abort ();
67
68 case CC_MAPSPACE:
69 case CC_CONTAINER:
70 ns->send_packet_printf ("delinv %d", tag ());
71 break;
72 }
73
74 for (iterator i = begin (); i != end (); ++i)
75 i->op->seen_by = 0;
76
77 vector< refitem, slice_allocator<refitem> >::clear ();
78}
79
80inline iterator
81client_container::merge_item (iterator i, object *op)
82{
83 if (i != end () && i->op == op)
84 return ++i;
85
86 if (op->seen_by)
87 return; // seen by another entity already
88
89 op->seen_by = this;
90
91 refitem ref;
92 ref.op = op;
93
94 return insert (i, ref);
95}
96
97void
98client_container::update (int offset)
99{
100 iterator i = begin ();
101
102 switch (type)
103 {
104 case CC_INVENTORY:
105 case CC_CONTAINER:
106 {
107 object *env = type == CC_INVENTORY
108 ? ns->pl->ob
109 : this->env;
110
111 // pass 1, erase all objects no longer in container
112 for (iterator j = begin (); j != end (); ++j)
113 if (j->op->env != env)
114 {
115 j->op->seen_by = 0;
116 erase (j);
117 }
118
119 // pass 2 merge items
120 for (object *op = env->inv; op; op = op->below)
121 {
122 if (--offset < 0)
123 i = merge_item (i, op);
124 else if (offset < -FLOORBOX_PAGESIZE)
125 break;
126 }
127 }
128 break;
129
130 case CC_MAPSPACE:
131 {
132 // pass 1, erase all objects no longer on space
133 for (iterator j = begin (); j != end (); ++j)
134 if (j->op->x != x || j->op->y != y || j->op->map != map)
135 {
136 j->op->seen_by = 0;
137 erase (j);
138 }
139
140 // pass 2 merge items
141 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
142 {
143 if (--offset < 0)
144 i = merge_item (i, op);
145 else if (offset < -FLOORBOX_PAGESIZE)
146 break;
147 }
148 }
149 break;
150 }
151
152 // pass 3, erase all extra items
153 for (iterator j = i; j != end (); ++j)
154 j->op->seen_by = 0;
155
156 if (i != end ())
157 erase (i, end ());
158}
159
160void
161client_container::set_mapspace (maptile *map, int x, int y)
162{
163 if (type == CC_MAPSPACE
164 && this->map == map
165 && this->x == x
166 && this->y == y)
167 return;
168
169 clear ();
170
171 type = CC_MAPSPACE;
172 this->map = map;
173 this->x = x;
174 this->y = y;
175}
176
177void
178client_container::set_container (object *env)
179{
180}
181#endif
182
183/******************************************************************************* 43/*******************************************************************************
184 * 44 *
185 * Functions related to sending object data to the client. 45 * Functions related to sending object data to the client.
186 * 46 *
187 ******************************************************************************/ 47 ******************************************************************************/
188 48
189/** 49/**
190 * This is a similar to query_name, but returns flags 50 * This is a similar to query_name, but returns flags
191 * to be sent to client. 51 * to be sent to client.
192 */ 52 */
193unsigned int 53static unsigned int
194query_flags (object *op) 54query_flags (object *op)
195{ 55{
196 unsigned int flags = 0; 56 unsigned int flags = 0;
197 57
198 if (QUERY_FLAG (op, FLAG_APPLIED)) 58 if (op->flag [FLAG_APPLIED])
199 {
200 switch (op->type) 59 switch (op->type)
201 { 60 {
202 case BOW: 61 case BOW:
203 case WAND: 62 case WAND:
204 case ROD: 63 case ROD:
205 case HORN: 64 case HORN:
206 flags = a_readied; 65 flags = a_readied;
207 break; 66 break;
208 case WEAPON: 67 case WEAPON:
209 flags = a_wielded; 68 flags = a_wielded;
210 break; 69 break;
211 case SKILL: 70 case SKILL:
212 case ARMOUR: 71 case ARMOUR:
213 case HELMET: 72 case HELMET:
214 case SHIELD: 73 case SHIELD:
215 case RING: 74 case RING:
216 case BOOTS: 75 case BOOTS:
217 case GLOVES: 76 case GLOVES:
218 case AMULET: 77 case AMULET:
219 case GIRDLE: 78 case GIRDLE:
220 case BRACERS: 79 case BRACERS:
221 case CLOAK: 80 case CLOAK:
222 flags = a_worn; 81 flags = a_worn;
223 break; 82 break;
224 case CONTAINER: 83 case CONTAINER:
225 flags = a_active; 84 flags = a_active;
226 break; 85 break;
227 default: 86 default:
228 flags = a_applied; 87 flags = a_applied;
229 break; 88 break;
230 } 89 }
231 }
232 90
233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 91 if (op->is_open_container ())
234 flags |= F_OPEN; 92 flags |= F_OPEN;
235 93
236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 94 if (op->flag [FLAG_KNOWN_CURSED])
237 { 95 {
238 if (QUERY_FLAG (op, FLAG_DAMNED)) 96 if (op->flag [FLAG_DAMNED])
239 flags |= F_DAMNED; 97 flags |= F_DAMNED;
240 else if (QUERY_FLAG (op, FLAG_CURSED)) 98 else if (op->flag [FLAG_CURSED])
241 flags |= F_CURSED; 99 flags |= F_CURSED;
242 } 100 }
243 101
244 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 102 if (op->flag [FLAG_KNOWN_MAGICAL] && !op->flag [FLAG_IDENTIFIED])
245 flags |= F_MAGIC; 103 flags |= F_MAGIC;
246 if (QUERY_FLAG (op, FLAG_UNPAID)) 104 if (op->flag [FLAG_UNPAID])
247 flags |= F_UNPAID; 105 flags |= F_UNPAID;
248 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 106 if (op->flag [FLAG_INV_LOCKED])
249 flags |= F_LOCKED; 107 flags |= F_LOCKED;
250 108
251 return flags; 109 return flags;
252} 110}
253 111
… …
256 * animation of face to the client. 114 * animation of face to the client.
257 */ 115 */
258static void 116static void
259add_object_to_socklist (client &ns, packet &sl, object *head) 117add_object_to_socklist (client &ns, packet &sl, object *head)
260{ 118{
261 int flags, len, anim_speed;
262 char item_n[MAX_BUF];
263 const char *item_p;
264
265 flags = query_flags (head); 119 int flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 120
121 if (head->flag [FLAG_NO_PICK])
267 flags |= F_NOPICK; 122 flags |= F_NOPICK;
268 123
269 ns.send_face (head->face); 124 ns.send_face (head->face, -50);
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 (object *pl) 188esrv_draw_look (player *pl)
336{ 189{
337 int got_one = 0, start_look = 0, end_look = 0; 190 object *ob = pl->ob;
338 191
339 if (!pl->contr->ns->update_look) 192 if (!pl->ns->update_look)
340 { 193 {
341 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &pl->name); 194 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
342 return;
343 }
344 else
345 pl->contr->ns->update_look = 0;
346
347 if (QUERY_FLAG (pl, FLAG_REMOVED)
348 || !pl->map
349 || pl->map->in_memory != MAP_IN_MEMORY
350 || out_of_map (pl->map, pl->x, pl->y))
351 return; 195 return;
196 }
352 197
198 if (pl->ns->need_delinv0)
199 {
200 pl->ns->need_delinv0 = 0;
353 pl->contr->ns->send_packet ("delinv 0"); 201 pl->ns->send_packet ("delinv 0");
202 }
203
204 if (pl->run_on)
205 return;
206
207 pl->ns->update_look = 0;
208 pl->ns->need_delinv0 = 1;
209
210 if (ob->flag [FLAG_REMOVED]
211 || !ob->map
212 || ob->map->in_memory != MAP_ACTIVE
213 || out_of_map (ob->map, ob->x, ob->y))
214 return;
354 215
355 packet sl; 216 packet sl;
356 sl.printf ("item%d ", pl->contr->ns->itemcmd); 217 sl.printf ("item%d ", pl->ns->itemcmd);
357 218
358 sl << uint32 (0); 219 sl << uint32 (0);
359 220
360 pl->contr->ns->send_face (empty_face); 221 int start_pos = pl->ns->look_position;
222 bool dirty = false;
361 223
362 if (pl->contr->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 }
363 { 254 }
364 char buf[80];
365 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
366 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 */
367 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 262 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
368 << uint32 (0) 263 << uint32 (0)
369 << sint32 (-1) 264 << uint32 ((uint32) - 1)
370 << uint32 (empty_face) 265 << uint32 (need_face_now (pl, FINGER_DOWN))
371 << data8 (buf) 266 << data8 ("Apply this to see the items below")
372 << uint16 (0) 267 << uint16 (0)
373 << uint8 (0) 268 << uint8 (0)
374 << uint32 (0); 269 << uint32 (0);
375 270
376 if (pl->contr->ns->itemcmd == 2) 271 if (pl->ns->itemcmd == 2)
377 sl << uint16 (0); 272 sl << uint16 (0);
378 }
379 273
380 object *tmp = pl->ms ().top; 274 dirty = true;
381 for (object *last = 0; tmp != last; tmp = tmp->below)
382 { 275 }
383 object *head;
384 276
385 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)
386 { 290 {
387 last = tmp->below; /* assumes double floor mode */ 291 pl->ns->flush_fx ();
388 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 292 pl->ns->send_packet (sl);
389 last = last->below; 293
294 sl.reset ();
295 sl.printf ("item%d ", pl->ns->itemcmd);
296 sl << uint32 (0);
297
298 dirty = false;
390 } 299 }
391
392 if (tmp->client_visible ())
393 {
394 if (++start_look < pl->contr->ns->look_position)
395 continue;
396
397 end_look++;
398
399 if (end_look > FLOORBOX_PAGESIZE)
400 {
401 /* What we basically do is make a 'fake' object - when the user applies it,
402 * we notice the special tag the object has, and act accordingly.
403 */
404 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
405 << uint32 (0)
406 << uint32 ((uint32) - 1)
407 << uint32 (empty_face)
408 << data8 ("Apply this to see next group of items")
409 << uint16 (0)
410 << uint8 (0)
411 << uint32 (0);
412
413 if (pl->contr->ns->itemcmd == 2)
414 sl << uint16 (0);
415
416 break;
417 }
418
419 if (tmp->head)
420 head = tmp->head;
421 else
422 head = tmp;
423
424 add_object_to_socklist (*pl->contr->ns, sl, head);
425 got_one++;
426
427 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
428 {
429 pl->contr->ns->send_packet (sl);
430
431 sl.reset ();
432 sl.printf ("item%d ", pl->contr->ns->itemcmd);
433 sl << uint32 (0);
434 got_one = 0;
435 }
436 }
437 } 300 }
438 301
439 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 ();
440 pl->contr->ns->send_packet (sl); 322 pl->ns->send_packet (sl);
441 323 }
442} 324}
443 325
444/** 326/**
445 * Sends whole inventory. 327 * Sends whole inventory.
446 */ 328 */
… …
476 358
477 /* IT is possible for players to accumulate a huge amount of 359 /* IT is possible for players to accumulate a huge amount of
478 * items (especially with some of the bags out there) to 360 * items (especially with some of the bags out there) to
479 * overflow the buffer. IF so, send multiple item commands. 361 * overflow the buffer. IF so, send multiple item commands.
480 */ 362 */
481 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 363 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
482 { 364 {
365 pl->contr->ns->flush_fx ();
483 pl->contr->ns->send_packet (sl); 366 pl->contr->ns->send_packet (sl);
484 367
485 sl.reset (); 368 sl.reset ();
486 sl.printf ("item%d ", pl->contr->ns->itemcmd); 369 sl.printf ("item%d ", pl->contr->ns->itemcmd);
487 sl << uint32 (op->count); 370 sl << uint32 (op->count);
… …
489 } 372 }
490 } 373 }
491 } 374 }
492 375
493 if (got_one) 376 if (got_one)
377 {
378 pl->contr->ns->flush_fx ();
494 pl->contr->ns->send_packet (sl); 379 pl->contr->ns->send_packet (sl);
380 }
495} 381}
496 382
497/** 383/**
498 * Updates object *op for player *pl. 384 * Updates object *op for player *pl.
499 * 385 *
… …
503 */ 389 */
504void 390void
505esrv_update_item (int flags, object *pl, object *op) 391esrv_update_item (int flags, object *pl, object *op)
506{ 392{
507 /* 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. */
508 if (op != pl)
509 {
510 if (!op->client_visible ()) 394 if (op != pl && !op->client_visible ())
511 return; 395 return;
512 /* we remove the check for op->env, because in theory, the object
513 * is hopefully in the same place, so the client should preserve
514 * order.
515 */
516 }
517 396
518 client *ns = pl->contr->ns; 397 client *ns = pl->contr->ns;
519 if (!ns) 398 if (!ns)
520 return; 399 return;
521 400
522 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
523 {
524 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
525 * this is happening - we can set a breakpoint here in the debugger
526 * and track back the call.
527 */
528 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
529 }
530
531 packet sl ("upditem"); 401 packet sl ("upditem");
532 402
533 sl << uint8 (flags); 403 sl << uint8 (flags);
534 404
535 if (op->head)
536 op = op->head; 405 op = op->head_ ();
537 406
538 sl << uint32 (op->count); 407 sl << uint32 (op->count);
539 408
540 if (flags & UPD_LOCATION) 409 if (flags & UPD_LOCATION)
541 sl << uint32 (op->env ? op->env->count : 0); 410 sl << uint32 (op->env ? op->env->count : 0);
… …
543 if (flags & UPD_FLAGS) 412 if (flags & UPD_FLAGS)
544 sl << uint32 (query_flags (op)); 413 sl << uint32 (query_flags (op));
545 414
546 if (flags & UPD_WEIGHT) 415 if (flags & UPD_WEIGHT)
547 { 416 {
548 sint32 weight = WEIGHT (op); 417 sint32 weight = op->client_weight ();
549 418
550 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 419 if (op == pl)
551
552 if (pl == op)
553 ns->last_weight = weight; 420 ns->last_weight = weight;
421
422 sl << uint32 (weight);
554 } 423 }
555 424
556 if (flags & UPD_FACE) 425 if (flags & UPD_FACE)
557 { 426 {
558 ns->send_face (op->face); 427 ns->send_face (op->face, -50);
428 ns->flush_fx ();
559 sl << uint32 (op->face); 429 sl << uint32 (op->face);
560 } 430 }
561 431
562 if (flags & UPD_NAME) 432 if (flags & UPD_NAME)
563 { 433 {
564 int len; 434 int len;
565 const char *item_p; 435 const char *item_p;
566 char item_n[MAX_BUF]; 436 char item_n[127 * 2];
567 437
568 if (!op->custom_name) 438 if (!op->custom_name)
569 { 439 {
570 strncpy (item_n, query_base_name (op, 0), 127); 440 len = assign (item_n, query_base_name (op, 0), 127);
571 item_n[127] = 0;
572 len = strlen (item_n);
573 item_p = query_base_name (op, 1); 441 item_p = query_base_name (op, 1);
574 } 442 }
575 else 443 else
576 { 444 {
577 strncpy (item_n, op->custom_name, 127); 445 len = assign (item_n, &op->custom_name, 127);
578 item_n[127] = 0;
579 len = strlen (item_n);
580 item_p = op->custom_name; 446 item_p = &op->custom_name;
581 } 447 }
582 448
583 strncpy (item_n + len + 1, item_p, 127); 449 len += assign (item_n + len, item_p, 127);
584 item_n[254] = 0;
585 len += strlen (item_n + 1 + len) + 1;
586 450
587 sl << data8 (item_n, len); 451 sl << data8 (item_n, len);
588 } 452 }
589 453
590 if (flags & UPD_ANIM) 454 if (flags & UPD_ANIM)
… …
592 456
593 if (flags & UPD_ANIMSPEED) 457 if (flags & UPD_ANIMSPEED)
594 { 458 {
595 int anim_speed = 0; 459 int anim_speed = 0;
596 460
597 if (QUERY_FLAG (op, FLAG_ANIMATE)) 461 if (op->flag [FLAG_ANIMATE])
598 { 462 {
599 if (op->anim_speed) 463 if (op->anim_speed)
600 anim_speed = op->anim_speed; 464 anim_speed = op->anim_speed;
601 else 465 else
602 { 466 {
603 if (fabs (op->speed) < 0.001) 467 if (op->speed < 0.001)
604 anim_speed = 255; 468 anim_speed = 255;
605 else if (fabs (op->speed) >= 1.0) 469 else if (op->speed >= 1.0)
606 anim_speed = 1; 470 anim_speed = 1;
607 else 471 else
608 anim_speed = (int) (1.0 / fabs (op->speed)); 472 anim_speed = 1. / op->speed;
609 } 473 }
610 474
611 if (anim_speed > 255) 475 if (anim_speed > 255)
612 anim_speed = 255; 476 anim_speed = 255;
613 } 477 }
… …
628esrv_send_item (object *pl, object *op) 492esrv_send_item (object *pl, object *op)
629{ 493{
630 if (!pl->contr->ns) 494 if (!pl->contr->ns)
631 return; 495 return;
632 496
633 /* If this is not the player object, do some more checks */
634 if (op != pl)
635 {
636 /* We only send 'visibile' objects to the client */ 497 /* We only send 'visible' objects to the client, and sometimes the player */
637 if (!op->client_visible ()) 498 if (!op->client_visible () && op->type != PLAYER)
638 return; 499 return;
639
640 /* if the item is on the ground, mark that the look needs to
641 * be updated.
642 */
643 if (!op->env)
644 {
645 pl->contr->ns->floorbox_update ();
646 return;
647 }
648 }
649 500
650 packet sl; 501 packet sl;
651 502
652 sl.printf ("item%d ", pl->contr->ns->itemcmd); 503 sl.printf ("item%d ", pl->contr->ns->itemcmd);
653 504
654 if (op->head)
655 op = op->head; 505 op = op->head_ ();
656 506
657 sl << uint32 (op->env ? op->env->count : 0); 507 sl << uint32 (op->env ? op->env->count : 0);
658 508
659 add_object_to_socklist (*pl->contr->ns, sl, op); 509 add_object_to_socklist (*pl->contr->ns, sl, op);
660 510
511 pl->contr->ns->flush_fx ();
661 pl->contr->ns->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
662 SET_FLAG (op, FLAG_CLIENT_SENT);
663} 513}
664 514
665/** 515/**
666 * Tells the client to delete an item. Uses the item 516 * Tells the client to delete an item.
667 * command with a -1 location.
668 */ 517 */
669void 518void
670esrv_del_item (player *pl, int tag) 519esrv_del_item (player *pl, int tag)
671{ 520{
672 if (!pl->ns) 521 if (!pl->ns)
… …
688 537
689/** 538/**
690 * 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
691 * pointer, or null if it can't be found. 540 * pointer, or null if it can't be found.
692 */ 541 */
693 542static object *
694object *
695esrv_get_ob_from_count (object *pl, tag_t count) 543esrv_get_ob_from_count (object *pl, tag_t count)
696{ 544{
697 object *op, *tmp;
698
699 if (pl->count == count) 545 if (pl->count == count)
700 return pl; 546 return pl;
701 547
702 for (op = pl->inv; op; op = op->below) 548 for (object *op = pl->inv; op; op = op->below)
703 if (op->count == count) 549 if (op->count == count)
704 return op; 550 return op;
705 else if (op->type == CONTAINER && pl->container == op) 551 else if (op->type == CONTAINER && pl->container_ () == op)
706 for (tmp = op->inv; tmp; tmp = tmp->below) 552 for (object *tmp = op->inv; tmp; tmp = tmp->below)
707 if (tmp->count == count) 553 if (tmp->count == count)
708 return tmp; 554 return tmp;
709 555
710 for (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)
711 if (op->head && op->head->count == count) 557 if (op->head && op->head->count == count)
712 return op; 558 return op;
713 else if (op->count == count) 559 else if (op->count == count)
714 return op; 560 return op;
715 else if (op->type == CONTAINER && pl->container == op) 561 else if (op->type == CONTAINER && pl->container_ () == op)
716 for (tmp = op->inv; tmp; tmp = tmp->below) 562 for (object *tmp = op->inv; tmp; tmp = tmp->below)
717 if (tmp->count == count) 563 if (tmp->count == count)
718 return tmp; 564 return tmp;
719 565
566#if 0
567 /* If the high bit is set, player examined a pseudo object. */
568 if (count & 0x80000000)
569 return 0;
570#endif
571
720 return 0; 572 return 0;
721} 573}
722 574
723
724/** Client wants to examine some object. So lets do so. */ 575/** Client wants to examine some object. So lets do so. */
725void 576void
726ExamineCmd (char *buf, int len, player *pl) 577ExamineCmd (char *buf, int len, player *pl)
727{ 578{
728 tag_t tag = atoi (buf); 579 tag_t tag = atoi (buf);
729
730 /* If the high bit is set, player examined a pseudo object. */
731 if (tag & 0x80000000)
732 return;
733
734 object *op = esrv_get_ob_from_count (pl->ob, tag);
735
736 if (!op)
737 {
738 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
739 return;
740 }
741
742 examine (pl->ob, op);
743}
744
745/** Client wants to apply some object. Lets do so. */
746void
747ApplyCmd (char *buf, int len, player *pl)
748{
749 tag_t tag = atoi (buf);
750
751 /* sort of a hack, but if the player saves and the player then manually
752 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
753 */
754 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
755 return;
756 580
757 /* If the high bit is set, player applied a pseudo object. */ 581 /* If the high bit is set, player applied a pseudo object. */
758 if (tag & 0x80000000) 582 if (tag & 0x80000000)
759 { 583 {
760 pl->ns->look_position = tag & 0x7fffffff; 584 pl->ns->look_position = tag & 0x7fffffff;
… …
764 588
765 object *op = esrv_get_ob_from_count (pl->ob, tag); 589 object *op = esrv_get_ob_from_count (pl->ob, tag);
766 590
767 if (!op) 591 if (!op)
768 { 592 {
593 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
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))
607 {
608 std::string s = op->describe (pl->ob);
609
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 object *op = esrv_get_ob_from_count (pl->ob, tag);
633
634 if (!op)
635 {
769 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 636 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
770 return; 637 return;
771 } 638 }
772 639
773 player_apply (pl->ob, op, 0, 0); 640 pl->ob->apply (op, AP_TOGGLE);
774} 641}
775 642
776/** Client wants to lock some object. Lets do so. */ 643/** Client wants to lock some object. Lets do so. */
777void 644void
778LockItem (char *data, int len, player *pl) 645LockItem (char *data, int len, player *pl)
… …
781 tag_t tag = net_uint32 ((uint8 *)data + 1); 648 tag_t tag = net_uint32 ((uint8 *)data + 1);
782 object *op = esrv_get_ob_from_count (pl->ob, tag); 649 object *op = esrv_get_ob_from_count (pl->ob, tag);
783 650
784 if (!op) 651 if (!op)
785 { 652 {
786 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 653 pl->failmsg ("Could not find object to lock/unlock");
787 return; 654 return;
788 } 655 }
789 656
790 if (!flag) 657 if (!flag)
791 CLEAR_FLAG (op, FLAG_INV_LOCKED); 658 op->clr_flag (FLAG_INV_LOCKED);
792 else 659 else
793 SET_FLAG (op, FLAG_INV_LOCKED); 660 op->set_flag (FLAG_INV_LOCKED);
794 661
795 esrv_update_item (UPD_FLAGS, pl->ob, op); 662 esrv_update_item (UPD_FLAGS, pl->ob, op);
796} 663}
797 664
798/** Client wants to mark some object. Lets do so. */ 665/** Client wants to mark some object. Lets do so. */
… …
802 tag_t tag = net_uint32 ((uint8 *)data); 669 tag_t tag = net_uint32 ((uint8 *)data);
803 object *op = esrv_get_ob_from_count (pl->ob, tag); 670 object *op = esrv_get_ob_from_count (pl->ob, tag);
804 671
805 if (!op) 672 if (!op)
806 { 673 {
807 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 674 pl->failmsg ("Could not find object to mark");
808 return; 675 return;
809 } 676 }
810 677
811 pl->mark = op; 678 pl->mark = op;
812 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 679 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
813} 680}
814 681
815/** 682/**
816 * look_at prints items on the specified square. 683 * look_at prints items on the specified square.
817 * 684 *
818 * [ removed EARTHWALL check and added check for containers inventory. 685 * [ removed EARTHWALL check and added check for containers inventory.
819 * Tero.Haatanen@lut.fi ] 686 * Tero.Haatanen@lut.fi ]
820 */ 687 */
821void 688static void
822look_at (object *op, int dx, int dy) 689look_at (player *pl, int dx, int dy)
823{ 690{
824 object *tmp; 691 dynbuf_text &buf = msg_dynbuf; buf.clear ();
825 int flag = 0; 692 object *ob = pl->ob;
826 sint16 x, y;
827 maptile *m;
828 693
829 x = op->x + dx; 694 if (!pl->observe->map)
830 y = op->y + dy;
831
832 if (out_of_map (op->map, x, y))
833 return; 695 return;
834 696
835 m = get_map_from_coord (op->map, &x, &y); 697 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
836 if (!m)
837 return;
838 698
839 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 699 mapxy pos (pl->observe);
700 pos.move (dx, dy);
840 701
841 for (; tmp != NULL; tmp = tmp->below) 702 if (wiz)
842 { 703 {
843 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 704 if (pos.normalise ())
844 continue;
845
846 if (!flag)
847 { 705 {
848 if (dx || dy) 706 mapspace &ms = *pos;
849 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 707 ms.update ();
850 else 708
851 { 709 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
852 clear_win_info (op); 710 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; items %d, volume %lld\n\n",
853 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 711 &pos.m->path, pos.x, pos.y, dx, dy,
854 } 712 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
855 flag = 1; 713 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (int)ms.items (), (long long)ms.volume ()
714 );
856 } 715 }
857
858 if (QUERY_FLAG (op, FLAG_WIZ))
859 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
860 else 716 else
861 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 717 buf << "off-map\n\n";
718 }
862 719
863 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 720 int darkness = pl->blocked_los (dx, dy);
864 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
865 inventory (op, tmp->head == NULL ? tmp : tmp->head);
866 721
867 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 722 if (darkness == LOS_BLOCKED)
723 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
724 else if (darkness == LOS_MAX)
725 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
726 else
727 {
728 if (pos.normalise ())
729 for (object *tmp = pos->top; tmp; tmp = tmp->below)
730 {
731 if (tmp->invisible && !ob->flag [FLAG_WIZ])
732 continue;
733
734 if (wiz)
735 buf.printf (" - %s (%d) %s\n", query_name (tmp), tmp->count, tmp->uuid.c_str ());
736 else
737 buf.printf (" - %s.\n", query_name (tmp));
738
739 object *head = tmp->head_ ();
740
741 if (head->inv)
742 if ((head->type != CONTAINER && head->type != FLESH)
743 || ob->flag [FLAG_WIZ])
744 buf << head->query_inventory (ob, " ");
745
746 if (tmp->flag [FLAG_IS_FLOOR] && !wiz) /* don't continue under the floor */
868 break; 747 break;
869 } 748 }
870
871 if (!flag)
872 { 749 }
873 if (dx || dy) 750
874 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 751 if (buf.empty ())
875 else 752 buf << "You see nothing there.";
876 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 753
877 } 754 pl->infobox (MSG_CHANNEL ("lookat"), buf);
878} 755}
879 756
880/** Client wants to look at some object. Lets do so. */ 757/** Client wants to look at some object. Lets do so. */
881void 758void
882LookAt (char *buf, int len, player *pl) 759LookAt (char *buf, int len, player *pl)
883{ 760{
884 int dx, dy;
885 char *cp; 761 char *cp;
886 762
887 dx = atoi (buf); 763 int dx = atoi (buf);
888 if (!(cp = strchr (buf, ' '))) 764 if (!(cp = strchr (buf, ' ')))
889 {
890 return; 765 return;
891 } 766
892 dy = atoi (cp); 767 int dy = atoi (cp);
893 768
894 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
895 return;
896
897 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
898 return;
899
900 look_at (pl->ob, dx, dy); 769 look_at (pl, dx, dy);
901} 770}
902 771
903/** Move an object to a new location */ 772/** Move an object to a new location */
904void 773void
905esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 774esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
906{ 775{
907 object *op, *env;
908
909 op = esrv_get_ob_from_count (pl, tag); 776 object *op = esrv_get_ob_from_count (pl, tag);
910 if (!op) 777 if (!op)
911 { 778 {
912 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 779 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
913 return; 780 return;
914 } 781 }
… …
919 return; 786 return;
920 787
921 /* If it is an active container, then we should drop all objects 788 /* If it is an active container, then we should drop all objects
922 * in the container and not the container itself. 789 * in the container and not the container itself.
923 */ 790 */
924 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 791 if (op->inv && op->flag [FLAG_APPLIED])
925 { 792 {
926 object *current, *next; 793 int cnt = MAX_ITEM_PER_ACTION;
927 794
928 for (current = op->inv; current != NULL; current = next) 795 for (object *current = op->inv; current && cnt--; )
929 { 796 {
930 next = current->below; 797 object *next = current->below;
931 drop_object (pl, current, 0); 798 drop_object (pl, current, 0);
799 current = next;
932 } 800 }
933 801
934 esrv_update_item (UPD_WEIGHT, pl, op); 802 if (cnt <= 0)
803 op->failmsg ("Only dropped some items, can't drop that many items at once.");
935 } 804 }
936 else 805 else
937 drop_object (pl, op, nrof); 806 drop_object (pl, op, nrof);
938 807
939 return; 808 return;
… …
947 pl->contr->count = nrof; 816 pl->contr->count = nrof;
948 pick_up (pl, op); 817 pick_up (pl, op);
949 return; 818 return;
950 } 819 }
951 820
952 env = esrv_get_ob_from_count (pl, to); 821 object *env = esrv_get_ob_from_count (pl, to);
953 if (!env) 822 if (!env)
954 { 823 {
955 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 824 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
956 return; 825 return;
957 } 826 }
… …
959 /* put_object_in_sack presumes that necessary sanity checking 828 /* put_object_in_sack presumes that necessary sanity checking
960 * has already been done (eg, it can be picked up and fits in 829 * has already been done (eg, it can be picked up and fits in
961 * in a sack, so check for those things. We should also check 830 * in a sack, so check for those things. We should also check
962 * an make sure env is in fact a container for that matter. 831 * an make sure env is in fact a container for that matter.
963 */ 832 */
964 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 833 if (env->type == CONTAINER
834 && can_pick (pl, op)
835 && sack_can_hold (pl, env, op, nrof))
965 put_object_in_sack (pl, env, op, nrof); 836 put_object_in_sack (pl, env, op, nrof);
966} 837}
967 838

Diff Legend

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