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

Diff Legend

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