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.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.69 by root, Mon Jul 14 23:47:06 2008 UTC

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

Diff Legend

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