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

Diff Legend

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