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

Diff Legend

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