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

Diff Legend

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