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

Diff Legend

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