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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines