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.10 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC

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

Diff Legend

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