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

Diff Legend

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