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

Diff Legend

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