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.49 by root, Fri Jun 8 09:20:20 2007 UTC vs.
Revision 1.105 by root, Wed Nov 14 23:24:27 2018 UTC

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

Diff Legend

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