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

Diff Legend

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