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.69 by root, Mon Jul 14 23:47:06 2008 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
9 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
10 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
11 (at your option) any later version. 11 * (at your 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 GNU General Public License
19 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
20 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
21 21 * The authors can be reached via e-mail to <support@deliantra.net>
22 The author can be reached via e-mail to <crossfire@schmorp.de>
23*/ 22 */
24 23
25/** 24/**
26 * \file 25 * \file
27 * Client/server logic. 26 * Client/server logic.
28 * 27 *
29 * \date 2003-12-02 28 * \date 2003-12-02
30 * 29 *
31 * This containes item logic for client/server. It doesn't contain 30 * This contains item logic for client/server. It doesn't contain
32 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
33 * the logic for what items should be sent. 32 * the logic for what items should be sent.
34 */ 33 */
35 34
36#include <global.h> 35#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
38#include <sproto.h> 37#include <sproto.h>
39 38
40/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
41#define MAXITEMLEN 300 40#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 41
183/******************************************************************************* 42/*******************************************************************************
184 * 43 *
185 * Functions related to sending object data to the client. 44 * Functions related to sending object data to the client.
186 * 45 *
… …
194query_flags (object *op) 53query_flags (object *op)
195{ 54{
196 unsigned int flags = 0; 55 unsigned int flags = 0;
197 56
198 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
199 {
200 switch (op->type) 58 switch (op->type)
201 { 59 {
202 case BOW: 60 case BOW:
203 case WAND: 61 case WAND:
204 case ROD: 62 case ROD:
205 case HORN: 63 case HORN:
206 flags = a_readied; 64 flags = a_readied;
207 break; 65 break;
208 case WEAPON: 66 case WEAPON:
209 flags = a_wielded; 67 flags = a_wielded;
210 break; 68 break;
211 case SKILL: 69 case SKILL:
212 case ARMOUR: 70 case ARMOUR:
213 case HELMET: 71 case HELMET:
214 case SHIELD: 72 case SHIELD:
215 case RING: 73 case RING:
216 case BOOTS: 74 case BOOTS:
217 case GLOVES: 75 case GLOVES:
218 case AMULET: 76 case AMULET:
219 case GIRDLE: 77 case GIRDLE:
220 case BRACERS: 78 case BRACERS:
221 case CLOAK: 79 case CLOAK:
222 flags = a_worn; 80 flags = a_worn;
223 break; 81 break;
224 case CONTAINER: 82 case CONTAINER:
225 flags = a_active; 83 flags = a_active;
226 break; 84 break;
227 default: 85 default:
228 flags = a_applied; 86 flags = a_applied;
229 break; 87 break;
230 } 88 }
231 }
232 89
233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
234 flags |= F_OPEN; 91 flags |= F_OPEN;
235 92
236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
256 * animation of face to the client. 113 * animation of face to the client.
257 */ 114 */
258static void 115static void
259add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
260{ 117{
261 int flags, len, anim_speed;
262 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
263 const char *item_p; 119 const char *item_p;
264 120
265 flags = query_flags (head); 121 int flags = query_flags (head);
266 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
267 flags |= F_NOPICK; 123 flags |= F_NOPICK;
268 124
269 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 125 ns.send_face (head->face, -50);
270 esrv_send_face (&ns, head->face->number, 0); 126 ns.flush_fx ();
271 127
272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 128 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
273 esrv_send_animation (&ns, head->animation_id); 129 ns.send_animation (head->animation_id);
274 130
275 sl << uint32 (head->count) 131 sl << uint32 (head->count)
276 << uint32 (flags) 132 << uint32 (flags)
277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
278 << uint32 (head->face->number); 134 << uint32 (head->face);
135
136 int len;
279 137
280 if (!head->custom_name) 138 if (!head->custom_name)
281 { 139 {
282 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
283 item_n[127] = 0; 141 item_n[127] = 0;
… …
297 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
298 156
299 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
300 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
301 159
302 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
303 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
304 { 162 : 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 163
321 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
322 << uint32 (head->nrof); 165 << uint32 (head->nrof);
323 166
324 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
325 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
326 169
327 SET_FLAG (head, FLAG_CLIENT_SENT); 170 SET_FLAG (head, FLAG_CLIENT_SENT);
328} 171}
329 172
173static faceidx
174need_face_now (player *pl, const char *name)
175{
176 faceidx face = face_find (name, empty_face);
177
178 pl->ns->send_face (face, -50);
179 pl->ns->flush_fx ();
180
181 return face;
182}
183
184#define FINGER_UP "finger_up.x11"
185#define FINGER_DOWN "finger_down.x11"
330 186
331/** 187/**
332 * Send the look window. Don't need to do animations here 188 * 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 189 * This sends all the faces to the client, not just updates. This is
334 * because object ordering would otherwise be inconsistent. 190 * because object ordering would otherwise be inconsistent.
335 */ 191 */
336void 192void
337esrv_draw_look (object *pl) 193esrv_draw_look (player *pl)
338{ 194{
339 object *tmp, *last; 195 object *ob = pl->ob;
340 int got_one = 0, start_look = 0, end_look = 0;
341 char buf[MAX_BUF];
342 196
343 if (!pl->contr->ns->update_look) 197 if (!pl->ns->update_look)
344 { 198 {
345 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 199 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
346 return; 200 return;
347 } 201 }
348 else 202
349 pl->contr->ns->update_look = 0; 203 pl->ns->update_look = 0;
350 204
351 if (QUERY_FLAG (pl, FLAG_REMOVED) 205 if (QUERY_FLAG (ob, FLAG_REMOVED)
352 || !pl->map 206 || !ob->map
353 || pl->map->in_memory != MAP_IN_MEMORY 207 || ob->map->in_memory != MAP_ACTIVE
354 || out_of_map (pl->map, pl->x, pl->y)) 208 || out_of_map (ob->map, ob->x, ob->y))
355 return; 209 return;
356 210
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"); 211 pl->ns->send_packet ("delinv 0");
361 212
362 packet sl; 213 packet sl;
363 sl.printf ("item%d ", pl->contr->ns->itemcmd); 214 sl.printf ("item%d ", pl->ns->itemcmd);
364 215
365 sl << uint32 (0); 216 sl << uint32 (0);
366 217
367 if (!(pl->contr->ns->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 218 int start_pos = pl->ns->look_position;
368 esrv_send_face (pl->contr->ns, empty_face->number, 0); 219 bool dirty = false;
369 220
370 if (pl->contr->ns->look_position) 221 mapspace &ms = ob->ms ();
222
223 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
224 // start from the top
225 object *items [FLOORBOX_PAGESIZE];
226 int item_idx = 0, item_cnt = 0;
227 int pos = 0;
228
229 // find our items by walking down
230 object *item = ms.top;
231
232 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
233 {
234 if (!item->client_visible ())
235 continue;
236
237 if (++pos < start_pos)
238 continue;
239
240 // record item
241 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
242 item_cnt++;
243
244 // stop at first floor
245 if (item->flag [FLAG_IS_FLOOR])
246 {
247 // we are finished, don't append "next group of items"
248 // by setting item to ms.bot it becomes zero which is checked after the while loop
249 item = ms.bot;
250 }
371 { 251 }
372 char buf[80];
373 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
374 252
253 // see if there are more if we cared - we ignore invisible objects
254 if (item)
255 {
256 /* What we basically do is make a 'fake' object - when the user applies it,
257 * we notice the special tag the object has, and act accordingly.
258 */
375 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE)) 259 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
376 << uint32 (0) 260 << uint32 (0)
377 << sint32 (-1) 261 << uint32 ((uint32) - 1)
378 << uint32 (empty_face->number) 262 << uint32 (need_face_now (pl, FINGER_DOWN))
379 << data8 (buf) 263 << data8 ("Apply this to see the items below")
380 << uint16 (0) 264 << uint16 (0)
381 << uint8 (0) 265 << uint8 (0)
382 << uint32 (0); 266 << uint32 (0);
383 267
384 if (pl->contr->ns->itemcmd == 2) 268 if (pl->ns->itemcmd == 2)
385 sl << uint16 (0); 269 sl << uint16 (0);
386 }
387 270
388 for (last = NULL; tmp != last; tmp = tmp->below) 271 dirty = true;
389 { 272 }
390 object *head;
391 273
392 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 274 // now send out all items in the ring buffer in reverse order
275 while (item_cnt)
276 {
277 --item_cnt;
278 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
279 object *item = items [item_idx];
280
281 add_object_to_socklist (*pl->ns, sl, item->head_ ());
282
283 dirty = true;
284
285 // if packet got too large, send it and begin a new one
286 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
393 { 287 {
394 last = tmp->below; /* assumes double floor mode */ 288 pl->ns->send_packet (sl);
395 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 289
396 last = last->below; 290 sl.reset ();
291 sl.printf ("item%d ", pl->ns->itemcmd);
292 sl << uint32 (0);
293
294 dirty = false;
397 } 295 }
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 } 296 }
445 297
446 if (got_one) 298 if (start_pos)
299 {
300 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
301 << uint32 (0)
302 << sint32 (-1)
303 << uint32 (need_face_now (pl, FINGER_UP))
304 << data8 ("Apply this to see the items higher up")
305 << uint16 (0)
306 << uint8 (0)
307 << uint32 (0);
308
309 if (pl->ns->itemcmd == 2)
310 sl << uint16 (0);
311
312 dirty = true;
313 }
314
315 if (dirty)
447 pl->contr->ns->send_packet (sl); 316 pl->ns->send_packet (sl);
448
449} 317}
450 318
451/** 319/**
452 * Sends whole inventory. 320 * Sends whole inventory.
453 */ 321 */
454void 322void
455esrv_send_inventory (object *pl, object *op) 323esrv_send_inventory (object *pl, object *op)
456{ 324{
457 object *tmp; 325 if (!pl->contr->ns)//D
326 return;
327
458 int got_one = 0; 328 int got_one = 0;
459
460 329
461 pl->contr->ns->send_packet_printf ("delinv %d", op->count); 330 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
462 331
463 packet sl; 332 packet sl;
464 sl.printf ("item%d ", pl->contr->ns->itemcmd); 333 sl.printf ("item%d ", pl->contr->ns->itemcmd);
465 334
466 sl << uint32 (op->count); 335 sl << uint32 (op->count);
467 336
468 for (tmp = op->inv; tmp; tmp = tmp->below) 337 for (object *tmp = op->inv; tmp; tmp = tmp->below)
469 { 338 {
470 object *head; 339 object *head;
471 340
472 if (tmp->head) 341 if (tmp->head)
473 head = tmp->head; 342 head = tmp->head;
474 else 343 else
475 head = tmp; 344 head = tmp;
476 345
477 if (LOOK_OBJ (head)) 346 if (head->client_visible ())
478 { 347 {
479 add_object_to_socklist (*pl->contr->ns, sl, head); 348 add_object_to_socklist (*pl->contr->ns, sl, head);
480 349
481 got_one++; 350 got_one++;
482 351
483 /* IT is possible for players to accumulate a huge amount of 352 /* IT is possible for players to accumulate a huge amount of
484 * items (especially with some of the bags out there) to 353 * items (especially with some of the bags out there) to
485 * overflow the buffer. IF so, send multiple item commands. 354 * overflow the buffer. IF so, send multiple item commands.
486 */ 355 */
487 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 356 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
488 { 357 {
489 pl->contr->ns->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
490 359
491 sl.reset (); 360 sl.reset ();
492 sl.printf ("item%d ", pl->contr->ns->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
493 sl << uint32 (op->count); 362 sl << uint32 (op->count);
494 got_one = 0; 363 got_one = 0;
495 } 364 }
496 } /* If LOOK_OBJ() */ 365 }
497 } 366 }
498 367
499 if (got_one) 368 if (got_one)
500 pl->contr->ns->send_packet (sl); 369 pl->contr->ns->send_packet (sl);
501} 370}
… …
505 * 374 *
506 * flags is a list of values to update 375 * flags is a list of values to update
507 * to the client (as defined in newclient.h - might as well use the 376 * to the client (as defined in newclient.h - might as well use the
508 * same value both places. 377 * same value both places.
509 */ 378 */
510
511void 379void
512esrv_update_item (int flags, object *pl, object *op) 380esrv_update_item (int flags, object *pl, object *op)
513{ 381{
514 /* If we have a request to send the player item, skip a few checks. */ 382 /* If we have a request to send the player item, skip a few checks. */
515 if (op != pl) 383 if (op != pl && !op->client_visible ())
516 {
517 if (!LOOK_OBJ (op))
518 return; 384 return;
519 /* we remove the check for op->env, because in theory, the object 385
520 * is hopefully in the same place, so the client should preserve 386 client *ns = pl->contr->ns;
521 * order. 387 if (!ns)
522 */ 388 return;
523 }
524 389
525 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
526 {
527 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 391 /* 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 392 * this is happening - we can set a breakpoint here in the debugger
529 * and track back the call. 393 * and track back the call.
530 */ 394 */
531 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 395 LOG (llevDebug | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count);
532 }
533 396
534 packet sl ("upditem"); 397 packet sl ("upditem");
535 398
536 sl << uint8 (flags); 399 sl << uint8 (flags);
537 400
538 if (op->head)
539 op = op->head; 401 op = op->head_ ();
540 402
541 sl << uint32 (op->count); 403 sl << uint32 (op->count);
542 404
543 if (flags & UPD_LOCATION) 405 if (flags & UPD_LOCATION)
544 sl << uint32 (op->env ? op->env->count : 0); 406 sl << uint32 (op->env ? op->env->count : 0);
… …
546 if (flags & UPD_FLAGS) 408 if (flags & UPD_FLAGS)
547 sl << uint32 (query_flags (op)); 409 sl << uint32 (query_flags (op));
548 410
549 if (flags & UPD_WEIGHT) 411 if (flags & UPD_WEIGHT)
550 { 412 {
551 sint32 weight = WEIGHT (op); 413 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
552 414
553 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
554
555 if (pl == op) 415 if (op)
556 op->contr->last_weight = weight; 416 ns->last_weight = weight;
417
418 sl << uint32 (weight);
557 } 419 }
558 420
559 if (flags & UPD_FACE) 421 if (flags & UPD_FACE)
560 { 422 {
561 if (!(pl->contr->ns->faces_sent[op->face->number] & NS_FACESENT_FACE)) 423 ns->send_face (op->face, -50);
562 esrv_send_face (pl->contr->ns, op->face->number, 0); 424 ns->flush_fx ();
563
564 sl << uint32 (op->face->number); 425 sl << uint32 (op->face);
565 } 426 }
566 427
567 if (flags & UPD_NAME) 428 if (flags & UPD_NAME)
568 { 429 {
569 int len; 430 int len;
… …
603 { 464 {
604 if (op->anim_speed) 465 if (op->anim_speed)
605 anim_speed = op->anim_speed; 466 anim_speed = op->anim_speed;
606 else 467 else
607 { 468 {
608 if (FABS (op->speed) < 0.001) 469 if (fabs (op->speed) < 0.001)
609 anim_speed = 255; 470 anim_speed = 255;
610 else if (FABS (op->speed) >= 1.0) 471 else if (fabs (op->speed) >= 1.0)
611 anim_speed = 1; 472 anim_speed = 1;
612 else 473 else
613 anim_speed = (int) (1.0 / FABS (op->speed)); 474 anim_speed = (int) (1.0 / fabs (op->speed));
614 } 475 }
615 476
616 if (anim_speed > 255) 477 if (anim_speed > 255)
617 anim_speed = 255; 478 anim_speed = 255;
618 } 479 }
… …
630 * Sends item's info to player. 491 * Sends item's info to player.
631 */ 492 */
632void 493void
633esrv_send_item (object *pl, object *op) 494esrv_send_item (object *pl, object *op)
634{ 495{
635 /* If this is not the player object, do some more checks */ 496 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; 497 return;
641 /* if the item is on the ground, mark that the look needs to 498
642 * be updated. 499 /* We only send 'visible' objects to the client, and sometimes the player */
643 */ 500 if (!op->client_visible () && op->type != PLAYER)
644 if (!op->env)
645 {
646 pl->contr->ns->floorbox_update ();
647 return; 501 return;
648 }
649 }
650 502
651 packet sl; 503 packet sl;
652 504
653 sl.printf ("item%d ", pl->contr->ns->itemcmd); 505 sl.printf ("item%d ", pl->contr->ns->itemcmd);
654 506
655 if (op->head)
656 op = op->head; 507 op = op->head_ ();
657 508
658 sl << uint32 (op->env ? op->env->count : 0); 509 sl << uint32 (op->env ? op->env->count : 0);
659 510
660 add_object_to_socklist (*pl->contr->ns, sl, op); 511 add_object_to_socklist (*pl->contr->ns, sl, op);
661 512
662 pl->contr->ns->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
663 SET_FLAG (op, FLAG_CLIENT_SENT); 514 SET_FLAG (op, FLAG_CLIENT_SENT);
664} 515}
665 516
666/** 517/**
667 * Tells the client to delete an item. Uses the item 518 * Tells the client to delete an item.
668 * command with a -1 location.
669 */ 519 */
670
671void 520void
672esrv_del_item (player *pl, int tag) 521esrv_del_item (player *pl, int tag)
673{ 522{
523 if (!pl->ns)
524 return;
525
674 packet sl ("delitem"); 526 packet sl ("delitem");
675 527
676 sl << uint32 (tag); 528 sl << uint32 (tag);
677 529
678 pl->ns->send_packet (sl); 530 pl->ns->send_packet (sl);
… …
687 539
688/** 540/**
689 * Takes a player and object count (tag) and returns the actual object 541 * Takes a player and object count (tag) and returns the actual object
690 * pointer, or null if it can't be found. 542 * pointer, or null if it can't be found.
691 */ 543 */
692
693object * 544object *
694esrv_get_ob_from_count (object *pl, tag_t count) 545esrv_get_ob_from_count (object *pl, tag_t count)
695{ 546{
696 object *op, *tmp;
697
698 if (pl->count == count) 547 if (pl->count == count)
699 return pl; 548 return pl;
700 549
701 for (op = pl->inv; op; op = op->below) 550 for (object *op = pl->inv; op; op = op->below)
702 if (op->count == count) 551 if (op->count == count)
703 return op; 552 return op;
704 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container == op)
705 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
706 if (tmp->count == count) 555 if (tmp->count == count)
707 return tmp; 556 return tmp;
708 557
709 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above) 558 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
710 if (op->head && op->head->count == count) 559 if (op->head && op->head->count == count)
711 return op; 560 return op;
712 else if (op->count == count) 561 else if (op->count == count)
713 return op; 562 return op;
714 else if (op->type == CONTAINER && pl->container == op) 563 else if (op->type == CONTAINER && pl->container == op)
715 for (tmp = op->inv; tmp; tmp = tmp->below) 564 for (object *tmp = op->inv; tmp; tmp = tmp->below)
716 if (tmp->count == count) 565 if (tmp->count == count)
717 return tmp; 566 return tmp;
718 567
568#if 0
569 /* If the high bit is set, player examined a pseudo object. */
570 if (count & 0x80000000)
571 return 0;
572#endif
573
719 return 0; 574 return 0;
720} 575}
721 576
722
723/** Client wants to examine some object. So lets do so. */ 577/** Client wants to examine some object. So lets do so. */
724void 578void
725ExamineCmd (char *buf, int len, player *pl) 579ExamineCmd (char *buf, int len, player *pl)
726{ 580{
727 tag_t tag = atoi (buf); 581 tag_t tag = atoi (buf);
728 582
729 /* If the high bit is set, player examined a pseudo object. */ 583 /* If the high bit is set, player applied a pseudo object. */
730 if (tag & 0x80000000) 584 if (tag & 0x80000000)
585 {
586 pl->ns->look_position = tag & 0x7fffffff;
587 pl->ns->floorbox_update ();
731 return; 588 return;
589 }
732 590
733 object *op = esrv_get_ob_from_count (pl->ob, tag); 591 object *op = esrv_get_ob_from_count (pl->ob, tag);
734 592
735 if (!op) 593 if (!op)
736 { 594 {
… …
739 } 597 }
740 598
741 examine (pl->ob, op); 599 examine (pl->ob, op);
742} 600}
743 601
602/** Client wants to examine some object. So lets do so. */
603void
604ExCmd (char *buf, int len, player *pl)
605{
606 tag_t tag = atoi (buf);
607
608 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
609 {
610 std::string s = op->describe (pl->ob);
611
612 if (msg_is_special (s.c_str (), false))
613 cfperl_expand_cfpod (pl, s);
614
615 packet sl ("ex");
616 sl << ber32 (tag) << s.c_str ();
617
618 pl->ns->send_packet (sl);
619 }
620}
621
744/** Client wants to apply some object. Lets do so. */ 622/** Client wants to apply some object. Lets do so. */
745void 623void
746ApplyCmd (char *buf, int len, player *pl) 624ApplyCmd (char *buf, int len, player *pl)
747{ 625{
748 tag_t tag = atoi (buf); 626 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 627
756 /* If the high bit is set, player applied a pseudo object. */ 628 /* If the high bit is set, player applied a pseudo object. */
757 if (tag & 0x80000000) 629 if (tag & 0x80000000)
758 { 630 {
759 pl->ns->look_position = tag & 0x7fffffff; 631 pl->ns->look_position = tag & 0x7fffffff;
… …
780 tag_t tag = net_uint32 ((uint8 *)data + 1); 652 tag_t tag = net_uint32 ((uint8 *)data + 1);
781 object *op = esrv_get_ob_from_count (pl->ob, tag); 653 object *op = esrv_get_ob_from_count (pl->ob, tag);
782 654
783 if (!op) 655 if (!op)
784 { 656 {
785 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 657 pl->failmsg ("Could not find object to lock/unlock");
786 return; 658 return;
787 } 659 }
788 660
789 if (!flag) 661 if (!flag)
790 CLEAR_FLAG (op, FLAG_INV_LOCKED); 662 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
801 tag_t tag = net_uint32 ((uint8 *)data); 673 tag_t tag = net_uint32 ((uint8 *)data);
802 object *op = esrv_get_ob_from_count (pl->ob, tag); 674 object *op = esrv_get_ob_from_count (pl->ob, tag);
803 675
804 if (!op) 676 if (!op)
805 { 677 {
806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 678 pl->failmsg ("Could not find object to mark");
807 return; 679 return;
808 } 680 }
809 681
810 pl->mark = op; 682 pl->mark = op;
811 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 683 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
812} 684}
813 685
814/** 686/**
815 * look_at prints items on the specified square. 687 * look_at prints items on the specified square.
816 * 688 *
817 * [ removed EARTHWALL check and added check for containers inventory. 689 * [ removed EARTHWALL check and added check for containers inventory.
818 * Tero.Haatanen@lut.fi ] 690 * Tero.Haatanen@lut.fi ]
819 */ 691 */
820void 692static void
821look_at (object *op, int dx, int dy) 693look_at (player *pl, int dx, int dy)
822{ 694{
823 object *tmp; 695 dynbuf_text buf;
824 int flag = 0; 696 object *ob = pl->ob;
825 sint16 x, y;
826 maptile *m;
827 697
828 x = op->x + dx; 698 if (!pl->observe->map)
829 y = op->y + dy;
830
831 if (out_of_map (op->map, x, y))
832 return; 699 return;
833 700
834 m = get_map_from_coord (op->map, &x, &y); 701 mapxy pos (pl->observe);
835 if (!m) 702 pos.move (dx, dy);
703
704 if (pos.normalise ())
705 for (object *tmp = pos->top; tmp; tmp = tmp->below)
706 {
707 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
708 continue;
709
710 if (QUERY_FLAG (ob, FLAG_WIZ))
711 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
712 else
713 buf.printf ("- %s.\n", query_name (tmp));
714
715 object *head = tmp->head_ ();
716
717 if (head->inv)
718 if ((head->type != CONTAINER && head->type != FLESH)
719 || QUERY_FLAG (ob, FLAG_WIZ))
720 buf << head->query_inventory (ob, " ");
721
722 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
723 break;
724 }
725
726 if (buf.empty ())
727 pl->failmsg ("You see nothing there.");
728 else
729 pl->infobox (MSG_CHANNEL ("lookat"), buf);
730}
731
732/** Client wants to look at some object. Lets do so. */
733void
734LookAt (char *buf, int len, player *pl)
735{
736 char *cp;
737
738 int dx = atoi (buf);
739 if (!(cp = strchr (buf, ' ')))
836 return; 740 return;
837 741
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); 742 int dy = atoi (cp);
894 743
744 if (player *opl = pl->observe->contr)
745 if (client *ns = opl->ns)
746 {
895 if (FABS (dx) > pl->ns->mapx / 2 || FABS (dy) > pl->ns->mapy / 2) 747 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
896 return; 748 return;
897 749
898 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2]) 750 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
899 return; 751 return;
752 }
900 753
901 look_at (pl->ob, dx, dy); 754 look_at (pl, dx, dy);
902} 755}
903 756
904/** Move an object to a new location */ 757/** Move an object to a new location */
905void 758void
906esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 759esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
907{ 760{
908 object *op, *env;
909
910 op = esrv_get_ob_from_count (pl, tag); 761 object *op = esrv_get_ob_from_count (pl, tag);
911 if (!op) 762 if (!op)
912 { 763 {
913 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 764 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
914 return; 765 return;
915 } 766 }
… …
922 /* If it is an active container, then we should drop all objects 773 /* If it is an active container, then we should drop all objects
923 * in the container and not the container itself. 774 * in the container and not the container itself.
924 */ 775 */
925 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
926 { 777 {
927 object *current, *next; 778 int cnt = MAX_ITEM_PER_DROP;
928 779
929 for (current = op->inv; current != NULL; current = next) 780 for (object *current = op->inv; current && cnt--; )
930 { 781 {
931 next = current->below; 782 object *next = current->below;
932 drop_object (pl, current, 0); 783 drop_object (pl, current, 0);
784 current = next;
933 } 785 }
934 786
935 esrv_update_item (UPD_WEIGHT, pl, op); 787 if (cnt <= 0)
788 op->failmsg ("Only dropped some items, can't drop that many items at once.");
936 } 789 }
937 else 790 else
938 drop_object (pl, op, nrof); 791 drop_object (pl, op, nrof);
939 792
940 return; 793 return;
… …
948 pl->contr->count = nrof; 801 pl->contr->count = nrof;
949 pick_up (pl, op); 802 pick_up (pl, op);
950 return; 803 return;
951 } 804 }
952 805
953 env = esrv_get_ob_from_count (pl, to); 806 object *env = esrv_get_ob_from_count (pl, to);
954 if (!env) 807 if (!env)
955 { 808 {
956 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 809 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
957 return; 810 return;
958 } 811 }
… …
960 /* put_object_in_sack presumes that necessary sanity checking 813 /* put_object_in_sack presumes that necessary sanity checking
961 * has already been done (eg, it can be picked up and fits in 814 * 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 815 * 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. 816 * an make sure env is in fact a container for that matter.
964 */ 817 */
965 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 818 if (env->type == CONTAINER
819 && can_pick (pl, op)
820 && sack_can_hold (pl, env, op, nrof))
966 put_object_in_sack (pl, env, op, nrof); 821 put_object_in_sack (pl, env, op, nrof);
967} 822}
968 823

Diff Legend

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