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.20 by root, Thu Dec 14 20:39:54 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 */
38#include <newclient.h> 36#include <object.h>
39#include <newserver.h>
40#include <sproto.h> 37#include <sproto.h>
41 38
42/** 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 */
43#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
44 181
45/******************************************************************************* 182/*******************************************************************************
46 * 183 *
47 * Functions related to sending object data to the client. 184 * Functions related to sending object data to the client.
48 * 185 *
49 ******************************************************************************/ 186 ******************************************************************************/
50 187
51/** 188/**
52 * This is a similar to query_name, but returns flags 189 * This is a similar to query_name, but returns flags
53 * to be sended to client. 190 * to be sent to client.
54 */ 191 */
55unsigned int 192unsigned int
56query_flags (object *op) 193query_flags (object *op)
57{ 194{
58 unsigned int flags = 0; 195 unsigned int flags = 0;
59 196
60 if (QUERY_FLAG (op, FLAG_APPLIED)) 197 if (QUERY_FLAG (op, FLAG_APPLIED))
61 {
62 switch (op->type) 198 switch (op->type)
63 { 199 {
64 case BOW: 200 case BOW:
65 case WAND: 201 case WAND:
66 case ROD: 202 case ROD:
67 case HORN: 203 case HORN:
68 flags = a_readied; 204 flags = a_readied;
69 break; 205 break;
70 case WEAPON: 206 case WEAPON:
71 flags = a_wielded; 207 flags = a_wielded;
72 break; 208 break;
73 case SKILL: 209 case SKILL:
74 case ARMOUR: 210 case ARMOUR:
75 case HELMET: 211 case HELMET:
76 case SHIELD: 212 case SHIELD:
77 case RING: 213 case RING:
78 case BOOTS: 214 case BOOTS:
79 case GLOVES: 215 case GLOVES:
80 case AMULET: 216 case AMULET:
81 case GIRDLE: 217 case GIRDLE:
82 case BRACERS: 218 case BRACERS:
83 case CLOAK: 219 case CLOAK:
84 flags = a_worn; 220 flags = a_worn;
85 break; 221 break;
86 case CONTAINER: 222 case CONTAINER:
87 flags = a_active; 223 flags = a_active;
88 break; 224 break;
89 default: 225 default:
90 flags = a_applied; 226 flags = a_applied;
91 break; 227 break;
92 } 228 }
93 } 229
94 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))))
95 flags |= F_OPEN; 231 flags |= F_OPEN;
96 232
97 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 233 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
98 { 234 {
99 if (QUERY_FLAG (op, FLAG_DAMNED)) 235 if (QUERY_FLAG (op, FLAG_DAMNED))
100 flags |= F_DAMNED; 236 flags |= F_DAMNED;
101 else if (QUERY_FLAG (op, FLAG_CURSED)) 237 else if (QUERY_FLAG (op, FLAG_CURSED))
102 flags |= F_CURSED; 238 flags |= F_CURSED;
103 } 239 }
240
104 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))
105 flags |= F_MAGIC; 242 flags |= F_MAGIC;
106 if (QUERY_FLAG (op, FLAG_UNPAID)) 243 if (QUERY_FLAG (op, FLAG_UNPAID))
107 flags |= F_UNPAID; 244 flags |= F_UNPAID;
108 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 245 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
114/* Used in the send_look to put object head into packet 251/* Used in the send_look to put object head into packet
115 * sl for socket ns. Need socket to know if we need to send 252 * sl for socket ns. Need socket to know if we need to send
116 * animation of face to the client. 253 * animation of face to the client.
117 */ 254 */
118static void 255static void
119add_object_to_socklist (client_socket &ns, packet &sl, object *head) 256add_object_to_socklist (client &ns, packet &sl, object *head)
120{ 257{
121 int flags, len, anim_speed; 258 int flags, len, anim_speed;
122 char item_n[MAX_BUF]; 259 char item_n[MAX_BUF];
123 const char *item_p; 260 const char *item_p;
124 261
125 flags = query_flags (head); 262 flags = query_flags (head);
126 if (QUERY_FLAG (head, FLAG_NO_PICK)) 263 if (QUERY_FLAG (head, FLAG_NO_PICK))
127 flags |= F_NOPICK; 264 flags |= F_NOPICK;
128 265
129 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 266 ns.send_face (head->face, -50);
130 esrv_send_face (&ns, head->face->number, 0); 267 ns.flush_fx ();
131 268
132 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])
133 esrv_send_animation (&ns, head->animation_id); 270 ns.send_animation (head->animation_id);
134 271
135 sl << uint32 (head->count) 272 sl << uint32 (head->count)
136 << uint32 (flags) 273 << uint32 (flags)
137 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 274 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
138 << uint32 (head->face->number); 275 << uint32 (head->face);
139 276
140 if (!head->custom_name) 277 if (!head->custom_name)
141 { 278 {
142 strncpy (item_n, query_base_name (head, 0), 127); 279 strncpy (item_n, query_base_name (head, 0), 127);
143 item_n[127] = 0; 280 item_n[127] = 0;
… …
164 { 301 {
165 if (head->anim_speed) 302 if (head->anim_speed)
166 anim_speed = head->anim_speed; 303 anim_speed = head->anim_speed;
167 else 304 else
168 { 305 {
169 if (FABS (head->speed) < 0.001) 306 if (fabs (head->speed) < 0.001)
170 anim_speed = 255; 307 anim_speed = 255;
171 else if (FABS (head->speed) >= 1.0) 308 else if (fabs (head->speed) >= 1.0)
172 anim_speed = 1; 309 anim_speed = 1;
173 else 310 else
174 anim_speed = (int) (1.0 / FABS (head->speed)); 311 anim_speed = (int) (1.0 / fabs (head->speed));
175 } 312 }
176 313
177 if (anim_speed > 255) 314 if (anim_speed > 255)
178 anim_speed = 255; 315 anim_speed = 255;
179 } 316 }
… …
185 sl << uint16 (head->client_type); 322 sl << uint16 (head->client_type);
186 323
187 SET_FLAG (head, FLAG_CLIENT_SENT); 324 SET_FLAG (head, FLAG_CLIENT_SENT);
188} 325}
189 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"
190 340
191/** 341/**
192 * Send the look window. Don't need to do animations here 342 * Send the look window. Don't need to do animations here
193 * 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
194 * because object ordering would otherwise be inconsistent 344 * because object ordering would otherwise be inconsistent.
195 */ 345 */
196
197void 346void
198esrv_draw_look (object *pl) 347esrv_draw_look (player *pl)
199{ 348{
200 object *tmp, *last; 349 object *ob = pl->ob;
201 int got_one = 0, start_look = 0, end_look = 0;
202 char buf[MAX_BUF];
203 350
204 if (!pl->contr->socket->update_look) 351 if (!pl->ns->update_look)
205 { 352 {
206 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);
207 return; 354 return;
208 } 355 }
209 else 356
210 pl->contr->socket->update_look = 0; 357 pl->ns->update_look = 0;
211 358
212 if (QUERY_FLAG (pl, FLAG_REMOVED) 359 if (QUERY_FLAG (ob, FLAG_REMOVED)
213 || !pl->map 360 || !ob->map
214 || pl->map->in_memory != MAP_IN_MEMORY 361 || ob->map->in_memory != MAP_ACTIVE
215 || out_of_map (pl->map, pl->x, pl->y)) 362 || out_of_map (ob->map, ob->x, ob->y))
216 return; 363 return;
217 364
218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 365 pl->ns->send_packet ("delinv 0");
219 ;
220 366
221 packet sl; 367 packet sl;
222
223 pl->contr->socket->send_packet ("delinv 0");
224
225 sl.printf ("item%d ", pl->contr->socket->itemcmd); 368 sl.printf ("item%d ", pl->ns->itemcmd);
226 369
227 sl << uint32 (0); 370 sl << uint32 (0);
228 371
229 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 372 int start_pos = pl->ns->look_position;
230 esrv_send_face (pl->contr->socket, empty_face->number, 0); 373 bool dirty = false;
231 374
232 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 }
233 { 405 }
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 406
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))
414 << uint32 (0)
415 << uint32 ((uint32) - 1)
416 << uint32 (need_face_now (pl, FINGER_DOWN))
417 << data8 ("Apply this to see the items below")
418 << uint16 (0)
419 << uint8 (0)
420 << uint32 (0);
421
422 if (pl->ns->itemcmd == 2)
423 sl << uint16 (0);
424
425 dirty = true;
426 }
427
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)
441 {
442 pl->ns->send_packet (sl);
443
444 sl.reset ();
445 sl.printf ("item%d ", pl->ns->itemcmd);
446 sl << uint32 (0);
447
448 dirty = false;
449 }
450 }
451
452 if (start_pos)
453 {
454 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
235 << uint32 (0) 455 << uint32 (0)
236 << sint32 (-1) 456 << sint32 (-1)
237 << uint32 (empty_face->number); 457 << uint32 (need_face_now (pl, FINGER_UP))
238 458 << data8 ("Apply this to see the items higher up")
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241 sl << uint16 (0) 459 << uint16 (0)
242 << uint8 (0) 460 << uint8 (0)
243 << uint32 (0); 461 << uint32 (0);
244 462
245 if (pl->contr->socket->itemcmd == 2) 463 if (pl->ns->itemcmd == 2)
246 sl << uint16 (0); 464 sl << uint16 (0);
247 }
248 465
249 for (last = NULL; tmp != last; tmp = tmp->below) 466 dirty = true;
250 { 467 }
251 object *head;
252 468
253 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 469 if (dirty)
254 {
255 last = tmp->below; /* assumes double floor mode */
256 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
257 last = last->below;
258 }
259
260 if (LOOK_OBJ (tmp))
261 {
262 if (++start_look < pl->contr->socket->look_position)
263 continue;
264
265 end_look++;
266
267 if (end_look > NUM_LOOK_OBJECTS)
268 {
269 /* What we basically do is make a 'fake' object - when the user applies it,
270 * we notice the special tag the object has, and act accordingly.
271 */
272 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
273 << uint32 (0)
274 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number);
276
277 sl.printf ("Click here to see next group of items");
278
279 sl << uint16 (0)
280 << uint8 (0)
281 << uint32 (0);
282
283 if (pl->contr->socket->itemcmd == 2)
284 sl << uint16 (0);
285
286 break;
287 }
288
289 if (tmp->head)
290 head = tmp->head;
291 else
292 head = tmp;
293
294 add_object_to_socklist (*pl->contr->socket, sl, head);
295 got_one++;
296
297 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 {
299 pl->contr->socket->send_packet (sl);
300
301 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket->itemcmd);
303 sl << uint32 (0);
304 got_one = 0;
305 }
306 } /* If LOOK_OBJ() */
307 }
308
309 if (got_one)
310 pl->contr->socket->send_packet (sl); 470 pl->ns->send_packet (sl);
311
312} 471}
313 472
314/** 473/**
315 * Sends whole inventory. 474 * Sends whole inventory.
316 */ 475 */
317void 476void
318esrv_send_inventory (object *pl, object *op) 477esrv_send_inventory (object *pl, object *op)
319{ 478{
320 object *tmp; 479 if (!pl->contr->ns)//D
480 return;
481
321 int got_one = 0; 482 int got_one = 0;
322 483
484 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
485
323 packet sl; 486 packet sl;
324
325 sl.printf ("delinv %d", op->count);
326 pl->contr->socket->send_packet (sl);
327
328 sl.reset ();
329 sl.printf ("item%d ", pl->contr->socket->itemcmd); 487 sl.printf ("item%d ", pl->contr->ns->itemcmd);
330 488
331 sl << uint32 (op->count); 489 sl << uint32 (op->count);
332 490
333 for (tmp = op->inv; tmp; tmp = tmp->below) 491 for (object *tmp = op->inv; tmp; tmp = tmp->below)
334 { 492 {
335 object *head; 493 object *head;
336 494
337 if (tmp->head) 495 if (tmp->head)
338 head = tmp->head; 496 head = tmp->head;
339 else 497 else
340 head = tmp; 498 head = tmp;
341 499
342 if (LOOK_OBJ (head)) 500 if (head->client_visible ())
343 { 501 {
344 add_object_to_socklist (*pl->contr->socket, sl, head); 502 add_object_to_socklist (*pl->contr->ns, sl, head);
345 503
346 got_one++; 504 got_one++;
347 505
348 /* IT is possible for players to accumulate a huge amount of 506 /* IT is possible for players to accumulate a huge amount of
349 * items (especially with some of the bags out there) to 507 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 508 * overflow the buffer. IF so, send multiple item commands.
351 */ 509 */
352 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 510 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
353 { 511 {
354 pl->contr->socket->send_packet (sl); 512 pl->contr->ns->send_packet (sl);
355 513
356 sl.reset (); 514 sl.reset ();
357 sl.printf ("item%d ", pl->contr->socket->itemcmd); 515 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 sl << uint32 (op->count); 516 sl << uint32 (op->count);
359 got_one = 0; 517 got_one = 0;
360 } 518 }
361 } /* If LOOK_OBJ() */ 519 }
362 } 520 }
363 521
364 if (got_one) 522 if (got_one)
365 pl->contr->socket->send_packet (sl); 523 pl->contr->ns->send_packet (sl);
366
367} 524}
368 525
369/** 526/**
370 * Updates object *op for player *pl. 527 * Updates object *op for player *pl.
371 * 528 *
372 * flags is a list of values to update 529 * flags is a list of values to update
373 * 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
374 * same value both places. 531 * same value both places.
375 */ 532 */
376
377void 533void
378esrv_update_item (int flags, object *pl, object *op) 534esrv_update_item (int flags, object *pl, object *op)
379{ 535{
380 /* 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. */
381 if (op != pl) 537 if (op != pl && !op->client_visible ())
382 {
383 if (!LOOK_OBJ (op))
384 return; 538 return;
385 /* we remove the check for op->env, because in theory, the object 539
386 * is hopefully in the same place, so the client should preserve 540 client *ns = pl->contr->ns;
387 * order. 541 if (!ns)
388 */ 542 return;
389 }
390 543
391 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 544 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
392 { 545 {
393 /* 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
394 * 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
395 * and track back the call. 548 * and track back the call.
396 */ 549 */
397 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);
398 } 551 }
399 552
400 packet sl; 553 packet sl ("upditem");
401 554
402 sl << "upditem "
403 << uint8 (flags); 555 sl << uint8 (flags);
404 556
405 if (op->head)
406 op = op->head; 557 op = op->head_ ();
407 558
408 sl << uint32 (op->count); 559 sl << uint32 (op->count);
409 560
410 if (flags & UPD_LOCATION) 561 if (flags & UPD_LOCATION)
411 sl << uint32 (op->env ? op->env->count : 0); 562 sl << uint32 (op->env ? op->env->count : 0);
… …
413 if (flags & UPD_FLAGS) 564 if (flags & UPD_FLAGS)
414 sl << uint32 (query_flags (op)); 565 sl << uint32 (query_flags (op));
415 566
416 if (flags & UPD_WEIGHT) 567 if (flags & UPD_WEIGHT)
417 { 568 {
418 sint32 weight = WEIGHT (op); 569 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
419 570
420 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
421
422 if (pl == op) 571 if (op)
423 op->contr->last_weight = weight; 572 ns->last_weight = weight;
573
574 sl << uint32 (weight);
424 } 575 }
425 576
426 if (flags & UPD_FACE) 577 if (flags & UPD_FACE)
427 { 578 {
428 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 579 ns->send_face (op->face, -50);
429 esrv_send_face (pl->contr->socket, op->face->number, 0); 580 ns->flush_fx ();
430
431 sl << uint32 (op->face->number); 581 sl << uint32 (op->face);
432 } 582 }
433 583
434 if (flags & UPD_NAME) 584 if (flags & UPD_NAME)
435 { 585 {
436 int len; 586 int len;
… …
470 { 620 {
471 if (op->anim_speed) 621 if (op->anim_speed)
472 anim_speed = op->anim_speed; 622 anim_speed = op->anim_speed;
473 else 623 else
474 { 624 {
475 if (FABS (op->speed) < 0.001) 625 if (fabs (op->speed) < 0.001)
476 anim_speed = 255; 626 anim_speed = 255;
477 else if (FABS (op->speed) >= 1.0) 627 else if (fabs (op->speed) >= 1.0)
478 anim_speed = 1; 628 anim_speed = 1;
479 else 629 else
480 anim_speed = (int) (1.0 / FABS (op->speed)); 630 anim_speed = (int) (1.0 / fabs (op->speed));
481 } 631 }
482 632
483 if (anim_speed > 255) 633 if (anim_speed > 255)
484 anim_speed = 255; 634 anim_speed = 255;
485 } 635 }
… …
488 } 638 }
489 639
490 if (flags & UPD_NROF) 640 if (flags & UPD_NROF)
491 sl << uint32 (op->nrof); 641 sl << uint32 (op->nrof);
492 642
493 pl->contr->socket->send_packet (sl); 643 pl->contr->ns->send_packet (sl);
494} 644}
495 645
496/** 646/**
497 * Sends item's info to player. 647 * Sends item's info to player.
498 */ 648 */
499void 649void
500esrv_send_item (object *pl, object *op) 650esrv_send_item (object *pl, object *op)
501{ 651{
502 /* If this is not the player object, do some more checks */ 652 if (!pl->contr->ns)
503 if (op != pl)
504 {
505 /* We only send 'visibile' objects to the client */
506 if (!LOOK_OBJ (op))
507 return; 653 return;
508 /* if the item is on the ground, mark that the look needs to 654
509 * be updated. 655 /* We only send 'visible' objects to the client, and sometimes the player */
510 */ 656 if (!op->client_visible () && op->type != PLAYER)
511 if (!op->env)
512 {
513 pl->contr->socket->update_look = 1;
514 return; 657 return;
515 }
516 }
517 658
518 packet sl; 659 packet sl;
519 660
520 sl.printf ("item%d ", pl->contr->socket->itemcmd); 661 sl.printf ("item%d ", pl->contr->ns->itemcmd);
521 662
522 if (op->head)
523 op = op->head; 663 op = op->head_ ();
524 664
525 sl << uint32 (op->env ? op->env->count : 0); 665 sl << uint32 (op->env ? op->env->count : 0);
526 666
527 add_object_to_socklist (*pl->contr->socket, sl, op); 667 add_object_to_socklist (*pl->contr->ns, sl, op);
528 668
529 pl->contr->socket->send_packet (sl); 669 pl->contr->ns->send_packet (sl);
530 SET_FLAG (op, FLAG_CLIENT_SENT); 670 SET_FLAG (op, FLAG_CLIENT_SENT);
531
532} 671}
533 672
534/** 673/**
535 * Tells the client to delete an item. Uses the item 674 * Tells the client to delete an item.
536 * command with a -1 location.
537 */ 675 */
538
539void 676void
540esrv_del_item (player *pl, int tag) 677esrv_del_item (player *pl, int tag)
541{ 678{
542 packet sl; 679 if (!pl->ns)
680 return;
543 681
544 sl << "delitem " 682 packet sl ("delitem");
683
545 << uint32 (tag); 684 sl << uint32 (tag);
546 685
547 pl->socket->send_packet (sl); 686 pl->ns->send_packet (sl);
548} 687}
549 688
550 689
551/******************************************************************************* 690/*******************************************************************************
552 * 691 *
… …
556 695
557/** 696/**
558 * 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
559 * pointer, or null if it can't be found. 698 * pointer, or null if it can't be found.
560 */ 699 */
561
562object * 700object *
563esrv_get_ob_from_count (object *pl, tag_t count) 701esrv_get_ob_from_count (object *pl, tag_t count)
564{ 702{
565 object *op, *tmp;
566
567 if (pl->count == count) 703 if (pl->count == count)
568 return pl; 704 return pl;
569 705
570 for (op = pl->inv; op; op = op->below) 706 for (object *op = pl->inv; op; op = op->below)
571 if (op->count == count) 707 if (op->count == count)
572 return op; 708 return op;
573 else if (op->type == CONTAINER && pl->container == op) 709 else if (op->type == CONTAINER && pl->container == op)
574 for (tmp = op->inv; tmp; tmp = tmp->below) 710 for (object *tmp = op->inv; tmp; tmp = tmp->below)
575 if (tmp->count == count) 711 if (tmp->count == count)
576 return tmp; 712 return tmp;
577 713
578 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)
579 if (op->head != NULL && op->head->count == count) 715 if (op->head && op->head->count == count)
580 return op; 716 return op;
581 else if (op->count == count) 717 else if (op->count == count)
582 return op; 718 return op;
583 else if (op->type == CONTAINER && pl->container == op) 719 else if (op->type == CONTAINER && pl->container == op)
584 for (tmp = op->inv; tmp; tmp = tmp->below) 720 for (object *tmp = op->inv; tmp; tmp = tmp->below)
585 if (tmp->count == count) 721 if (tmp->count == count)
586 return tmp; 722 return tmp;
587 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
588 return NULL; 730 return 0;
589} 731}
590
591 732
592/** Client wants to examine some object. So lets do so. */ 733/** Client wants to examine some object. So lets do so. */
593void 734void
594ExamineCmd (char *buf, int len, player *pl) 735ExamineCmd (char *buf, int len, player *pl)
595{ 736{
596 tag_t tag = atoi (buf); 737 tag_t tag = atoi (buf);
597
598 /* If the high bit is set, player examined a pseudo object. */
599 if (tag & 0x80000000)
600 return;
601
602 object *op = esrv_get_ob_from_count (pl->ob, tag);
603
604 if (!op)
605 {
606 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
607 return;
608 }
609
610 examine (pl->ob, op);
611}
612
613/** Client wants to apply some object. Lets do so. */
614void
615ApplyCmd (char *buf, int len, player *pl)
616{
617 tag_t tag = atoi (buf);
618
619 /* sort of a hack, but if the player saves and the player then manually
620 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
621 */
622 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
623 return;
624 738
625 /* If the high bit is set, player applied a pseudo object. */ 739 /* If the high bit is set, player applied a pseudo object. */
626 if (tag & 0x80000000) 740 if (tag & 0x80000000)
627 { 741 {
628 pl->socket->look_position = tag & 0x7fffffff; 742 pl->ns->look_position = tag & 0x7fffffff;
629 pl->socket->update_look = 1; 743 pl->ns->floorbox_update ();
630 return; 744 return;
631 } 745 }
632 746
633 object *op = esrv_get_ob_from_count (pl->ob, tag); 747 object *op = esrv_get_ob_from_count (pl->ob, tag);
634 748
635 if (!op) 749 if (!op)
636 { 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 {
637 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);
638 return; 794 return;
639 } 795 }
640 796
641 player_apply (pl->ob, op, 0, 0); 797 player_apply (pl->ob, op, 0, 0);
642} 798}
643 799
644/** Client wants to apply some object. Lets do so. */ 800/** Client wants to lock some object. Lets do so. */
645void 801void
646LockItem (uint8 *data, int len, player *pl) 802LockItem (char *data, int len, player *pl)
647{ 803{
648 int flag = data[0]; 804 int flag = data[0];
649 tag_t tag = net_uint32 (data + 1); 805 tag_t tag = net_uint32 ((uint8 *)data + 1);
650 object *op = esrv_get_ob_from_count (pl->ob, tag); 806 object *op = esrv_get_ob_from_count (pl->ob, tag);
651 807
652 if (!op) 808 if (!op)
653 { 809 {
654 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");
655 return; 811 return;
656 } 812 }
657 813
658 if (!flag) 814 if (!flag)
659 CLEAR_FLAG (op, FLAG_INV_LOCKED); 815 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
661 SET_FLAG (op, FLAG_INV_LOCKED); 817 SET_FLAG (op, FLAG_INV_LOCKED);
662 818
663 esrv_update_item (UPD_FLAGS, pl->ob, op); 819 esrv_update_item (UPD_FLAGS, pl->ob, op);
664} 820}
665 821
666/** Client wants to apply some object. Lets do so. */ 822/** Client wants to mark some object. Lets do so. */
667void 823void
668MarkItem (uint8 * data, int len, player *pl) 824MarkItem (char *data, int len, player *pl)
669{ 825{
670 tag_t tag = net_uint32 (data); 826 tag_t tag = net_uint32 ((uint8 *)data);
671 object *op = esrv_get_ob_from_count (pl->ob, tag); 827 object *op = esrv_get_ob_from_count (pl->ob, tag);
672 828
673 if (!op) 829 if (!op)
674 { 830 {
675 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 831 pl->failmsg ("Could not find object to mark");
676 return; 832 return;
677 } 833 }
678 834
679 pl->mark = op; 835 pl->mark = op;
680 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)));
681} 837}
682 838
683/** 839/**
684 * look_at prints items on the specified square. 840 * look_at prints items on the specified square.
685 * 841 *
686 * [ removed EARTHWALL check and added check for containers inventory. 842 * [ removed EARTHWALL check and added check for containers inventory.
687 * Tero.Haatanen@lut.fi ] 843 * Tero.Haatanen@lut.fi ]
688 */ 844 */
689void 845static void
690look_at (object *op, int dx, int dy) 846look_at (player *pl, int dx, int dy)
691{ 847{
692 object *tmp; 848 dynbuf_text buf;
693 int flag = 0; 849 object *ob = pl->ob;
694 sint16 x, y;
695 maptile *m;
696 850
697 x = op->x + dx; 851 if (!pl->observe->map)
698 y = op->y + dy;
699
700 if (out_of_map (op->map, x, y))
701 return; 852 return;
702 853
703 m = get_map_from_coord (op->map, &x, &y); 854 mapxy pos (pl->observe);
704 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, ' ')))
705 return; 893 return;
706 894
707 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
708
709 for (; tmp != NULL; tmp = tmp->below)
710 {
711 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
712 continue;
713
714 if (!flag)
715 {
716 if (dx || dy)
717 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
718 else
719 {
720 clear_win_info (op);
721 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
722 }
723 flag = 1;
724 }
725
726 if (QUERY_FLAG (op, FLAG_WIZ))
727 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
728 else
729 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
730
731 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
732 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
733 inventory (op, tmp->head == NULL ? tmp : tmp->head);
734
735 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
736 break;
737 }
738
739 if (!flag)
740 {
741 if (dx || dy)
742 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
743 else
744 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
745 }
746}
747
748
749
750/** Client wants to look at some object. Lets do so. */
751void
752LookAt (char *buf, int len, player *pl)
753{
754 int dx, dy;
755 char *cp;
756
757 dx = atoi (buf);
758 if (!(cp = strchr (buf, ' ')))
759 {
760 return;
761 }
762 dy = atoi (cp); 895 int dy = atoi (cp);
763 896
764 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)
765 return; 901 return;
766 902
767 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])
768 return; 904 return;
905 }
769 906
770 look_at (pl->ob, dx, dy); 907 look_at (pl, dx, dy);
771} 908}
772 909
773/** Move an object to a new location */ 910/** Move an object to a new location */
774void 911void
775esrv_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)
… …
791 /* 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
792 * in the container and not the container itself. 929 * in the container and not the container itself.
793 */ 930 */
794 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 931 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
795 { 932 {
796 object *current, *next; 933 int cnt = MAX_ITEM_PER_DROP;
797 934
798 for (current = op->inv; current != NULL; current = next) 935 for (object *current = op->inv; current; )
799 { 936 {
800 next = current->below; 937 object *next = current->below;
938
801 drop_object (pl, current, 0); 939 drop_object (pl, current, 0);
940
941 if (--cnt <= 0) break;
942
943 current = next;
802 } 944 }
803 945
804 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.");
805 } 948 }
806 else 949 else
807 {
808 drop_object (pl, op, nrof); 950 drop_object (pl, op, nrof);
809 } 951
810 return; 952 return;
811 } 953 }
812 else if (to == pl->count) 954 else if (to == pl->count)
813 { /* pick it up to the inventory */ 955 { /* pick it up to the inventory */
814 /* return if player has already picked it up */ 956 /* return if player has already picked it up */
… …
830 /* put_object_in_sack presumes that necessary sanity checking 972 /* put_object_in_sack presumes that necessary sanity checking
831 * 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
832 * 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
833 * 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.
834 */ 976 */
835 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 977 if (env->type == CONTAINER
836 { 978 && can_pick (pl, op)
979 && sack_can_hold (pl, env, op, nrof))
837 put_object_in_sack (pl, env, op, nrof); 980 put_object_in_sack (pl, env, op, nrof);
838 }
839} 981}
840 982

Diff Legend

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