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.49 by root, Fri Jun 8 09:20:20 2007 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Crossfire TRT, the Multiplayer Online Role Playing Game.
3 3 *
4 * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Crossfire TRT 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 * Crossfire TRT is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 9 * under the terms of the GNU General Public License as published by the Free
9 the Free Software Foundation; either version 2 of the License, or 10 * Software Foundation; either version 2 of the License, or (at your option)
10 (at your option) any later version. 11 * 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
15 GNU General Public License for more details. 16 * for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License along
18 along with this program; if not, write to the Free Software 19 * with Crossfire TRT; if not, write to the Free Software Foundation, Inc. 51
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
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 <crossfire@schmorp.de>
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
42
43#if 0
44tag_t
45client_container::tag () const
46{
47 switch (type)
48 {
49 case CC_INVENTORY:
50 return ns->pl->count;
51 case CC_MAPSPACE:
52 return 0;
53 case CC_CONTAINER:
54 return env->count;
55 }
56
57 abort ();
58}
59
60void
61client_container::clear ()
62{
63 switch (type)
64 {
65 case CC_INVENTORY:
66 abort ();
67
68 case CC_MAPSPACE:
69 case CC_CONTAINER:
70 ns->send_packet_printf ("delinv %d", tag ());
71 break;
72 }
73
74 for (iterator i = begin (); i != end (); ++i)
75 i->op->seen_by = 0;
76
77 vector< refitem, slice_allocator<refitem> >::clear ();
78}
79
80inline iterator
81client_container::merge_item (iterator i, object *op)
82{
83 if (i != end () && i->op == op)
84 return ++i;
85
86 if (op->seen_by)
87 return; // seen by another entity already
88
89 op->seen_by = this;
90
91 refitem ref;
92 ref.op = op;
93
94 return insert (i, ref);
95}
96
97void
98client_container::update (int offset)
99{
100 iterator i = begin ();
101
102 switch (type)
103 {
104 case CC_INVENTORY:
105 case CC_CONTAINER:
106 {
107 object *env = type == CC_INVENTORY
108 ? ns->pl->ob
109 : this->env;
110
111 // pass 1, erase all objects no longer in container
112 for (iterator j = begin (); j != end (); ++j)
113 if (j->op->env != env)
114 {
115 j->op->seen_by = 0;
116 erase (j);
117 }
118
119 // pass 2 merge items
120 for (object *op = env->inv; op; op = op->below)
121 {
122 if (--offset < 0)
123 i = merge_item (i, op);
124 else if (offset < -FLOORBOX_PAGESIZE)
125 break;
126 }
127 }
128 break;
129
130 case CC_MAPSPACE:
131 {
132 // pass 1, erase all objects no longer on space
133 for (iterator j = begin (); j != end (); ++j)
134 if (j->op->x != x || j->op->y != y || j->op->map != map)
135 {
136 j->op->seen_by = 0;
137 erase (j);
138 }
139
140 // pass 2 merge items
141 for (object *op = GET_MAP_OB (map, x, y); op; op = op->above)
142 {
143 if (--offset < 0)
144 i = merge_item (i, op);
145 else if (offset < -FLOORBOX_PAGESIZE)
146 break;
147 }
148 }
149 break;
150 }
151
152 // pass 3, erase all extra items
153 for (iterator j = i; j != end (); ++j)
154 j->op->seen_by = 0;
155
156 if (i != end ())
157 erase (i, end ());
158}
159
160void
161client_container::set_mapspace (maptile *map, int x, int y)
162{
163 if (type == CC_MAPSPACE
164 && this->map == map
165 && this->x == x
166 && this->y == y)
167 return;
168
169 clear ();
170
171 type = CC_MAPSPACE;
172 this->map = map;
173 this->x = x;
174 this->y = y;
175}
176
177void
178client_container::set_container (object *env)
179{
180}
181#endif
44 182
45/******************************************************************************* 183/*******************************************************************************
46 * 184 *
47 * Functions related to sending object data to the client. 185 * Functions related to sending object data to the client.
48 * 186 *
49 ******************************************************************************/ 187 ******************************************************************************/
50 188
51/** 189/**
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 190 * This is a similar to query_name, but returns flags
74 * to be sended to client. 191 * to be sent to client.
75 */ 192 */
76unsigned int 193unsigned int
77query_flags (object *op) 194query_flags (object *op)
78{ 195{
79 unsigned int flags = 0; 196 unsigned int flags = 0;
80 197
81 if (QUERY_FLAG (op, FLAG_APPLIED)) 198 if (QUERY_FLAG (op, FLAG_APPLIED))
82 { 199 {
83 switch (op->type) 200 switch (op->type)
84 { 201 {
85 case BOW: 202 case BOW:
86 case WAND: 203 case WAND:
87 case ROD: 204 case ROD:
88 case HORN: 205 case HORN:
89 flags = a_readied; 206 flags = a_readied;
90 break; 207 break;
91 case WEAPON: 208 case WEAPON:
92 flags = a_wielded; 209 flags = a_wielded;
93 break; 210 break;
94 case SKILL: 211 case SKILL:
95 case ARMOUR: 212 case ARMOUR:
96 case HELMET: 213 case HELMET:
97 case SHIELD: 214 case SHIELD:
98 case RING: 215 case RING:
99 case BOOTS: 216 case BOOTS:
100 case GLOVES: 217 case GLOVES:
101 case AMULET: 218 case AMULET:
102 case GIRDLE: 219 case GIRDLE:
103 case BRACERS: 220 case BRACERS:
104 case CLOAK: 221 case CLOAK:
105 flags = a_worn; 222 flags = a_worn;
106 break; 223 break;
107 case CONTAINER: 224 case CONTAINER:
108 flags = a_active; 225 flags = a_active;
109 break; 226 break;
110 default: 227 default:
111 flags = a_applied; 228 flags = a_applied;
112 break; 229 break;
113 } 230 }
114 } 231 }
232
115 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 233 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
116 flags |= F_OPEN; 234 flags |= F_OPEN;
117 235
118 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
119 { 237 {
120 if (QUERY_FLAG (op, FLAG_DAMNED)) 238 if (QUERY_FLAG (op, FLAG_DAMNED))
121 flags |= F_DAMNED; 239 flags |= F_DAMNED;
122 else if (QUERY_FLAG (op, FLAG_CURSED)) 240 else if (QUERY_FLAG (op, FLAG_CURSED))
123 flags |= F_CURSED; 241 flags |= F_CURSED;
124 } 242 }
243
125 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 244 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
126 flags |= F_MAGIC; 245 flags |= F_MAGIC;
127 if (QUERY_FLAG (op, FLAG_UNPAID)) 246 if (QUERY_FLAG (op, FLAG_UNPAID))
128 flags |= F_UNPAID; 247 flags |= F_UNPAID;
129 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 248 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
130 flags |= F_LOCKED; 249 flags |= F_LOCKED;
131 250
132 return flags; 251 return flags;
133} 252}
134 253
135/* Used in the send_look to put object head into SockList 254/* 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 255 * sl for socket ns. Need socket to know if we need to send
137 * animation of face to the client. 256 * animation of face to the client.
138 */ 257 */
139static void 258static void
140add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 259add_object_to_socklist (client &ns, packet &sl, object *head)
141{ 260{
142 int flags, len, anim_speed; 261 int flags, len, anim_speed;
143 char item_n[MAX_BUF]; 262 char item_n[MAX_BUF];
144 const char *item_p; 263 const char *item_p;
145 264
146 flags = query_flags (head); 265 flags = query_flags (head);
147 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
148 flags |= F_NOPICK; 267 flags |= F_NOPICK;
149 268
150 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
151 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
152 271
153 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 272 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
154 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
155 274
156 sl << uint32 (head->count) 275 sl << uint32 (head->count)
157 << uint32 (flags) 276 << uint32 (flags)
158 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
159 << uint32 (head->face->number); 278 << uint32 (head->face);
160 279
161 if (!head->custom_name) 280 if (!head->custom_name)
162 { 281 {
163 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
164 item_n[127] = 0; 283 item_n[127] = 0;
… …
185 { 304 {
186 if (head->anim_speed) 305 if (head->anim_speed)
187 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
188 else 307 else
189 { 308 {
190 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
191 anim_speed = 255; 310 anim_speed = 255;
192 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
193 anim_speed = 1; 312 anim_speed = 1;
194 else 313 else
195 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
196 } 315 }
197 316
198 if (anim_speed > 255) 317 if (anim_speed > 255)
199 anim_speed = 255; 318 anim_speed = 255;
200 } 319 }
… …
206 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
207 326
208 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
209} 328}
210 329
211
212/** 330/**
213 * Send the look window. Don't need to do animations here 331 * 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 332 * This sends all the faces to the client, not just updates. This is
215 * because object ordering would otherwise be inconsistent 333 * because object ordering would otherwise be inconsistent.
216 */ 334 */
217
218void 335void
219esrv_draw_look (object *pl) 336esrv_draw_look (player *pl)
220{ 337{
221 object *tmp, *last;
222 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
223 char buf[MAX_BUF];
224 339
340 object *ob = pl->ob;
341
225 if (!pl->contr->socket.update_look) 342 if (!pl->ns->update_look)
226 { 343 {
227 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 344 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
228 return; 345 return;
229 } 346 }
230 else 347 else
231 pl->contr->socket.update_look = 0; 348 pl->ns->update_look = 0;
232 349
233 if (QUERY_FLAG (pl, FLAG_REMOVED) 350 if (QUERY_FLAG (ob, FLAG_REMOVED)
234 || !pl->map 351 || !ob->map
235 || pl->map->in_memory != MAP_IN_MEMORY 352 || ob->map->in_memory != MAP_IN_MEMORY
236 || out_of_map (pl->map, pl->x, pl->y)) 353 || out_of_map (ob->map, ob->x, ob->y))
237 return; 354 return;
238 355
239 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above); 356 pl->ns->send_packet ("delinv 0");
240 357
241 SockList sl (MAXSOCKBUF); 358 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); 359 sl.printf ("item%d ", pl->ns->itemcmd);
246 360
247 sl << uint32 (0); 361 sl << uint32 (0);
248 362
249 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 363 pl->ns->send_face (empty_face);
250 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 364 pl->ns->flush_fx ();
251 365
252 if (pl->contr->socket.look_position) 366 if (pl->ns->look_position)
253 { 367 {
368 char buf[80];
369 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
370
254 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 371 sl << uint32 (0x80000000 | (pl->ns->look_position - FLOORBOX_PAGESIZE))
255 << uint32 (0) 372 << uint32 (0)
256 << sint32 (-1) 373 << sint32 (-1)
257 << uint32 (empty_face->number); 374 << uint32 (empty_face)
258 375 << data8 (buf)
259 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261 sl << uint16 (0) 376 << uint16 (0)
262 << uint8 (0) 377 << uint8 (0)
263 << uint32 (0); 378 << uint32 (0);
264 379
265 if (pl->contr->socket.itemcmd == 2) 380 if (pl->ns->itemcmd == 2)
266 sl << uint16 (0); 381 sl << uint16 (0);
267 } 382 }
268 383
384 object *tmp = ob->ms ().top;
269 for (last = NULL; tmp != last; tmp = tmp->below) 385 for (object *last = 0; tmp != last; tmp = tmp->below)
270 { 386 {
271 object *head; 387 object *head;
272 388
273 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 389 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
274 { 390 {
275 last = tmp->below; /* assumes double floor mode */ 391 last = tmp->below; /* assumes double floor mode */
276 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 392 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
277 last = last->below; 393 last = last->below;
278 } 394 }
279 395
280 if (LOOK_OBJ (tmp)) 396 if (tmp->client_visible ())
281 { 397 {
282 if (++start_look < pl->contr->socket.look_position) 398 if (++start_look < pl->ns->look_position)
283 continue; 399 continue;
284 400
285 end_look++; 401 end_look++;
286 402
287 if (end_look > NUM_LOOK_OBJECTS) 403 if (end_look > FLOORBOX_PAGESIZE)
288 { 404 {
289 /* What we basically do is make a 'fake' object - when the user applies it, 405 /* 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. 406 * we notice the special tag the object has, and act accordingly.
291 */ 407 */
292 SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); 408 sl << uint32 (0x80000000 | (pl->ns->look_position + FLOORBOX_PAGESIZE))
293 SockList_AddInt (&sl, 0); 409 << uint32 (0)
294 SockList_AddInt (&sl, (uint32) - 1); 410 << uint32 ((uint32) - 1)
295 SockList_AddInt (&sl, empty_face->number); 411 << uint32 (empty_face)
296 sprintf (buf, "Click here to see next group of items"); 412 << data8 ("Apply this to see next group of items")
297 add_stringlen_to_sockbuf (buf, &sl); 413 << uint16 (0)
298 SockList_AddShort (&sl, 0); 414 << uint8 (0)
299 SockList_AddChar (&sl, 0); 415 << uint32 (0);
300 SockList_AddInt (&sl, 0); 416
301 if (pl->contr->socket.itemcmd == 2) 417 if (pl->ns->itemcmd == 2)
302 SockList_AddShort (&sl, 0); 418 sl << uint16 (0);
419
303 break; 420 break;
304 } 421 }
422
305 if (tmp->head) 423 if (tmp->head)
306 head = tmp->head; 424 head = tmp->head;
307 else 425 else
308 head = tmp; 426 head = tmp;
309 427
310 add_object_to_socklist (pl->contr->socket, sl, head); 428 add_object_to_socklist (*pl->ns, sl, head);
311 got_one++; 429 got_one++;
312 430
313 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 431 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
314 { 432 {
315 Send_With_Handling (&pl->contr->socket, &sl); 433 pl->ns->send_packet (sl);
434
435 sl.reset ();
316 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 436 sl.printf ("item%d ", pl->ns->itemcmd);
317 sl.len = strlen ((char *) sl.buf); 437 sl << uint32 (0);
318 SockList_AddInt (&sl, 0);
319 got_one = 0; 438 got_one = 0;
320 } 439 }
321 } /* If LOOK_OBJ() */ 440 }
322 } 441 }
323 442
324 if (got_one) 443 if (got_one)
325 Send_With_Handling (&pl->contr->socket, &sl); 444 pl->ns->send_packet (sl);
326 445
327 sl.free ();
328} 446}
329 447
330/** 448/**
331 * Sends whole inventory. 449 * Sends whole inventory.
332 */ 450 */
333void 451void
334esrv_send_inventory (object *pl, object *op) 452esrv_send_inventory (object *pl, object *op)
335{ 453{
336 object *tmp; 454 if (!pl->contr->ns)//D
455 return;
456
337 int got_one = 0; 457 int got_one = 0;
338 SockList sl;
339 458
340 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 459 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
341 460
342 sprintf ((char *) sl.buf, "delinv %d", op->count); 461 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); 462 sl.printf ("item%d ", pl->contr->ns->itemcmd);
347 sl.len = strlen ((char *) sl.buf);
348 463
349 SockList_AddInt (&sl, op->count); 464 sl << uint32 (op->count);
350 465
351 for (tmp = op->inv; tmp; tmp = tmp->below) 466 for (object *tmp = op->inv; tmp; tmp = tmp->below)
352 { 467 {
353 object *head; 468 object *head;
354 469
355 if (tmp->head) 470 if (tmp->head)
356 head = tmp->head; 471 head = tmp->head;
357 else 472 else
358 head = tmp; 473 head = tmp;
359 474
360 if (LOOK_OBJ (head)) 475 if (head->client_visible ())
361 { 476 {
362 add_object_to_socklist (pl->contr->socket, sl, head); 477 add_object_to_socklist (*pl->contr->ns, sl, head);
363 478
364 got_one++; 479 got_one++;
365 480
366 /* IT is possible for players to accumulate a huge amount of 481 /* IT is possible for players to accumulate a huge amount of
367 * items (especially with some of the bags out there) to 482 * items (especially with some of the bags out there) to
368 * overflow the buffer. IF so, send multiple item commands. 483 * overflow the buffer. IF so, send multiple item commands.
369 */ 484 */
370 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 485 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
371 { 486 {
372 Send_With_Handling (&pl->contr->socket, &sl); 487 pl->contr->ns->send_packet (sl);
488
489 sl.reset ();
373 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
374 sl.len = strlen ((char *) sl.buf); 491 sl << uint32 (op->count);
375 SockList_AddInt (&sl, op->count);
376 got_one = 0; 492 got_one = 0;
377 } 493 }
378 } /* If LOOK_OBJ() */ 494 }
379 } 495 }
496
380 if (got_one) 497 if (got_one)
381 Send_With_Handling (&pl->contr->socket, &sl); 498 pl->contr->ns->send_packet (sl);
382 sl.free ();
383} 499}
384 500
385/** 501/**
386 * Updates object *op for player *pl. 502 * Updates object *op for player *pl.
387 * 503 *
388 * flags is a list of values to update 504 * flags is a list of values to update
389 * to the client (as defined in newclient.h - might as well use the 505 * to the client (as defined in newclient.h - might as well use the
390 * same value both places. 506 * same value both places.
391 */ 507 */
392
393void 508void
394esrv_update_item (int flags, object *pl, object *op) 509esrv_update_item (int flags, object *pl, object *op)
395{ 510{
396 SockList sl;
397
398 /* If we have a request to send the player item, skip a few checks. */ 511 /* If we have a request to send the player item, skip a few checks. */
399 if (op != pl) 512 if (op != pl)
400 { 513 {
401 if (!LOOK_OBJ (op)) 514 if (!op->client_visible ())
402 return; 515 return;
403 /* we remove the check for op->env, because in theory, the object 516 /* we remove the check for op->env, because in theory, the object
404 * is hopefully in the same place, so the client should preserve 517 * is hopefully in the same place, so the client should preserve
405 * order. 518 * order.
406 */ 519 */
407 } 520 }
408 521
522 client *ns = pl->contr->ns;
523 if (!ns)
524 return;
525
409 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 526 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
410 { 527 {
411 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 528 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
412 * this is happening - we can set a breakpoint here in the debugger 529 * this is happening - we can set a breakpoint here in the debugger
413 * and track back the call. 530 * and track back the call.
414 */ 531 */
415 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 532 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
416 } 533 }
417 534
418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 535 packet sl ("upditem");
419 536
420 strcpy ((char *) sl.buf, "upditem "); 537 sl << uint8 (flags);
421 sl.len = strlen ((char *) sl.buf);
422
423 SockList_AddChar (&sl, (char) flags);
424 538
425 if (op->head) 539 if (op->head)
426 op = op->head; 540 op = op->head;
427 541
428 SockList_AddInt (&sl, op->count); 542 sl << uint32 (op->count);
429 543
430 if (flags & UPD_LOCATION) 544 if (flags & UPD_LOCATION)
431 SockList_AddInt (&sl, op->env ? op->env->count : 0); 545 sl << uint32 (op->env ? op->env->count : 0);
432 546
433 if (flags & UPD_FLAGS) 547 if (flags & UPD_FLAGS)
434 SockList_AddInt (&sl, query_flags (op)); 548 sl << uint32 (query_flags (op));
435 549
436 if (flags & UPD_WEIGHT) 550 if (flags & UPD_WEIGHT)
437 { 551 {
438 sint32 weight = WEIGHT (op); 552 sint32 weight = WEIGHT (op);
439 553
440 SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 554 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
555
441 if (pl == op) 556 if (pl == op)
442 {
443 op->contr->last_weight = weight; 557 ns->last_weight = weight;
444 }
445 } 558 }
446 559
447 if (flags & UPD_FACE) 560 if (flags & UPD_FACE)
448 { 561 {
449 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 562 ns->send_face (op->face);
450 esrv_send_face (&pl->contr->socket, op->face->number, 0); 563 ns->flush_fx ();
451 SockList_AddInt (&sl, op->face->number); 564 sl << uint32 (op->face);
452 } 565 }
453 566
454 if (flags & UPD_NAME) 567 if (flags & UPD_NAME)
455 { 568 {
456 int len; 569 int len;
… …
473 } 586 }
474 587
475 strncpy (item_n + len + 1, item_p, 127); 588 strncpy (item_n + len + 1, item_p, 127);
476 item_n[254] = 0; 589 item_n[254] = 0;
477 len += strlen (item_n + 1 + len) + 1; 590 len += strlen (item_n + 1 + len) + 1;
478 SockList_AddChar (&sl, (char) len); 591
479 memcpy (sl.buf + sl.len, item_n, len); 592 sl << data8 (item_n, len);
480 sl.len += len;
481 } 593 }
482 594
483 if (flags & UPD_ANIM) 595 if (flags & UPD_ANIM)
484 SockList_AddShort (&sl, op->animation_id); 596 sl << uint16 (op->animation_id);
485 597
486 if (flags & UPD_ANIMSPEED) 598 if (flags & UPD_ANIMSPEED)
487 { 599 {
488 int anim_speed = 0; 600 int anim_speed = 0;
489 601
… …
491 { 603 {
492 if (op->anim_speed) 604 if (op->anim_speed)
493 anim_speed = op->anim_speed; 605 anim_speed = op->anim_speed;
494 else 606 else
495 { 607 {
496 if (FABS (op->speed) < 0.001) 608 if (fabs (op->speed) < 0.001)
497 anim_speed = 255; 609 anim_speed = 255;
498 else if (FABS (op->speed) >= 1.0) 610 else if (fabs (op->speed) >= 1.0)
499 anim_speed = 1; 611 anim_speed = 1;
500 else 612 else
501 anim_speed = (int) (1.0 / FABS (op->speed)); 613 anim_speed = (int) (1.0 / fabs (op->speed));
502 } 614 }
615
503 if (anim_speed > 255) 616 if (anim_speed > 255)
504 anim_speed = 255; 617 anim_speed = 255;
505 } 618 }
506 SockList_AddChar (&sl, (char) anim_speed); 619
620 sl << uint8 (anim_speed);
507 } 621 }
622
508 if (flags & UPD_NROF) 623 if (flags & UPD_NROF)
509 SockList_AddInt (&sl, op->nrof); 624 sl << uint32 (op->nrof);
510 625
511 Send_With_Handling (&pl->contr->socket, &sl); 626 pl->contr->ns->send_packet (sl);
512 sl.free ();
513} 627}
514 628
515/** 629/**
516 * Sends item's info to player. 630 * Sends item's info to player.
517 */ 631 */
518void 632void
519esrv_send_item (object *pl, object *op) 633esrv_send_item (object *pl, object *op)
520{ 634{
521 SockList sl; 635 if (!pl->contr->ns)
636 return;
522 637
523 /* If this is not the player object, do some more checks */ 638 /* If this is not the player object, do some more checks */
524 if (op != pl) 639 if (op != pl)
525 { 640 {
526 /* We only send 'visibile' objects to the client */ 641 /* We only send 'visibile' objects to the client */
527 if (!LOOK_OBJ (op)) 642 if (!op->client_visible ())
528 return; 643 return;
644
529 /* if the item is on the ground, mark that the look needs to 645 /* if the item is on the ground, mark that the look needs to
530 * be updated. 646 * be updated.
531 */ 647 */
532 if (!op->env) 648 if (!op->env)
533 { 649 {
534 pl->contr->socket.update_look = 1; 650 pl->contr->ns->floorbox_update ();
535 return; 651 return;
536 } 652 }
537 } 653 }
538 654
539 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 655 packet sl;
540 656
541 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 657 sl.printf ("item%d ", pl->contr->ns->itemcmd);
542 sl.len = strlen ((char *) sl.buf);
543 658
544 if (op->head) 659 if (op->head)
545 op = op->head; 660 op = op->head;
546 661
547 SockList_AddInt (&sl, op->env ? op->env->count : 0); 662 sl << uint32 (op->env ? op->env->count : 0);
548 663
549 add_object_to_socklist (pl->contr->socket, sl, op); 664 add_object_to_socklist (*pl->contr->ns, sl, op);
550 665
551 Send_With_Handling (&pl->contr->socket, &sl); 666 pl->contr->ns->send_packet (sl);
552 SET_FLAG (op, FLAG_CLIENT_SENT); 667 SET_FLAG (op, FLAG_CLIENT_SENT);
553
554 sl.free ();
555} 668}
556 669
557/** 670/**
558 * Tells the client to delete an item. Uses the item 671 * Tells the client to delete an item. Uses the item
559 * command with a -1 location. 672 * command with a -1 location.
560 */ 673 */
561
562void 674void
563esrv_del_item (player *pl, int tag) 675esrv_del_item (player *pl, int tag)
564{ 676{
565 SockList sl; 677 if (!pl->ns)
678 return;
566 679
567 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 680 packet sl ("delitem");
568 681
569 strcpy ((char *) sl.buf, "delitem "); 682 sl << uint32 (tag);
570 sl.len = strlen ((char *) sl.buf);
571 SockList_AddInt (&sl, tag);
572 683
573 Send_With_Handling (&pl->socket, &sl); 684 pl->ns->send_packet (sl);
574 sl.free ();
575} 685}
576 686
577 687
578/******************************************************************************* 688/*******************************************************************************
579 * 689 *
… …
583 693
584/** 694/**
585 * Takes a player and object count (tag) and returns the actual object 695 * Takes a player and object count (tag) and returns the actual object
586 * pointer, or null if it can't be found. 696 * pointer, or null if it can't be found.
587 */ 697 */
588
589object * 698object *
590esrv_get_ob_from_count (object *pl, tag_t count) 699esrv_get_ob_from_count (object *pl, tag_t count)
591{ 700{
592 object *op, *tmp;
593
594 if (pl->count == count) 701 if (pl->count == count)
595 return pl; 702 return pl;
596 703
597 for (op = pl->inv; op; op = op->below) 704 for (object *op = pl->inv; op; op = op->below)
598 if (op->count == count) 705 if (op->count == count)
599 return op; 706 return op;
600 else if (op->type == CONTAINER && pl->container == op) 707 else if (op->type == CONTAINER && pl->container == op)
601 for (tmp = op->inv; tmp; tmp = tmp->below) 708 for (object *tmp = op->inv; tmp; tmp = tmp->below)
602 if (tmp->count == count) 709 if (tmp->count == count)
603 return tmp; 710 return tmp;
604 711
605 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 712 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) 713 if (op->head && op->head->count == count)
607 return op; 714 return op;
608 else if (op->count == count) 715 else if (op->count == count)
609 return op; 716 return op;
610 else if (op->type == CONTAINER && pl->container == op) 717 else if (op->type == CONTAINER && pl->container == op)
611 for (tmp = op->inv; tmp; tmp = tmp->below) 718 for (object *tmp = op->inv; tmp; tmp = tmp->below)
612 if (tmp->count == count) 719 if (tmp->count == count)
613 return tmp; 720 return tmp;
614 721
722#if 0
723 /* If the high bit is set, player examined a pseudo object. */
724 if (count & 0x80000000)
725 return 0;
726#endif
727
615 return NULL; 728 return 0;
616} 729}
617
618 730
619/** Client wants to examine some object. So lets do so. */ 731/** Client wants to examine some object. So lets do so. */
620void 732void
621ExamineCmd (char *buf, int len, player *pl) 733ExamineCmd (char *buf, int len, player *pl)
622{ 734{
623 tag_t tag = atoi (buf); 735 tag_t tag = atoi (buf);
624 736
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); 737 object *op = esrv_get_ob_from_count (pl->ob, tag);
630 738
631 if (!op) 739 if (!op)
632 { 740 {
633 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag); 741 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
… …
635 } 743 }
636 744
637 examine (pl->ob, op); 745 examine (pl->ob, op);
638} 746}
639 747
748/** Client wants to examine some object. So lets do so. */
749void
750ExCmd (char *buf, int len, player *pl)
751{
752 tag_t tag = atoi (buf);
753
754 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
755 {
756 std::string s = op->describe (pl->ob);
757
758 packet sl ("ex");
759 sl << ber32 (tag) << s.c_str ();
760
761 pl->ns->send_packet (sl);
762 }
763}
764
640/** Client wants to apply some object. Lets do so. */ 765/** Client wants to apply some object. Lets do so. */
641void 766void
642ApplyCmd (char *buf, int len, player *pl) 767ApplyCmd (char *buf, int len, player *pl)
643{ 768{
644 tag_t tag = atoi (buf); 769 tag_t tag = atoi (buf);
645 770
… …
650 return; 775 return;
651 776
652 /* If the high bit is set, player applied a pseudo object. */ 777 /* If the high bit is set, player applied a pseudo object. */
653 if (tag & 0x80000000) 778 if (tag & 0x80000000)
654 { 779 {
655 pl->socket.look_position = tag & 0x7fffffff; 780 pl->ns->look_position = tag & 0x7fffffff;
656 pl->socket.update_look = 1; 781 pl->ns->floorbox_update ();
657 return; 782 return;
658 } 783 }
659 784
660 object *op = esrv_get_ob_from_count (pl->ob, tag); 785 object *op = esrv_get_ob_from_count (pl->ob, tag);
661 786
… …
666 } 791 }
667 792
668 player_apply (pl->ob, op, 0, 0); 793 player_apply (pl->ob, op, 0, 0);
669} 794}
670 795
671/** Client wants to apply some object. Lets do so. */ 796/** Client wants to lock some object. Lets do so. */
672void 797void
673LockItem (uint8 *data, int len, player *pl) 798LockItem (char *data, int len, player *pl)
674{ 799{
675 int flag = data[0]; 800 int flag = data[0];
676 tag_t tag = net_uint32 (data + 1); 801 tag_t tag = net_uint32 ((uint8 *)data + 1);
677 object *op = esrv_get_ob_from_count (pl->ob, tag); 802 object *op = esrv_get_ob_from_count (pl->ob, tag);
678 803
679 if (!op) 804 if (!op)
680 { 805 {
681 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 806 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
688 SET_FLAG (op, FLAG_INV_LOCKED); 813 SET_FLAG (op, FLAG_INV_LOCKED);
689 814
690 esrv_update_item (UPD_FLAGS, pl->ob, op); 815 esrv_update_item (UPD_FLAGS, pl->ob, op);
691} 816}
692 817
693/** Client wants to apply some object. Lets do so. */ 818/** Client wants to mark some object. Lets do so. */
694void 819void
695MarkItem (uint8 * data, int len, player *pl) 820MarkItem (char *data, int len, player *pl)
696{ 821{
697 tag_t tag = net_uint32 (data); 822 tag_t tag = net_uint32 ((uint8 *)data);
698 object *op = esrv_get_ob_from_count (pl->ob, tag); 823 object *op = esrv_get_ob_from_count (pl->ob, tag);
699 824
700 if (!op) 825 if (!op)
701 { 826 {
702 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 827 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
711 * look_at prints items on the specified square. 836 * look_at prints items on the specified square.
712 * 837 *
713 * [ removed EARTHWALL check and added check for containers inventory. 838 * [ removed EARTHWALL check and added check for containers inventory.
714 * Tero.Haatanen@lut.fi ] 839 * Tero.Haatanen@lut.fi ]
715 */ 840 */
716void 841static void
717look_at (object *op, int dx, int dy) 842look_at (player *pl, int dx, int dy)
718{ 843{
719 object *tmp; 844 object *ob = pl->ob;
720 int flag = 0;
721 sint16 x, y;
722 maptile *m;
723 845
724 x = op->x + dx; 846 maptile *m = pl->observe->map;
725 y = op->y + dy; 847 sint16 x = pl->observe->x + dx;
848 sint16 y = pl->observe->y + dy;
726 849
727 if (out_of_map (op->map, x, y))
728 return;
729
730 m = get_map_from_coord (op->map, &x, &y);
731 if (!m) 850 if (!m)
732 return; 851 return;
733 852
734 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 853 if (!xy_normalise (m, x, y))
735 854 {
736 for (; tmp != NULL; tmp = tmp->below) 855 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
856 return;
737 { 857 }
858
859 int flag = 0;
860
861 for (object *tmp = m->at (x, y).top; tmp; tmp = tmp->below)
862 {
738 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 863 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
739 continue; 864 continue;
740 865
741 if (!flag) 866 if (!flag)
742 { 867 {
743 if (dx || dy) 868 if (dx || dy)
744 new_draw_info (NDI_UNIQUE, 0, op, "There you see:"); 869 new_draw_info (NDI_UNIQUE, 0, ob, "There you see:");
745 else 870 else
746 {
747 clear_win_info (op);
748 new_draw_info (NDI_UNIQUE, 0, op, "You see:"); 871 new_draw_info (NDI_UNIQUE, 0, ob, "You see:");
749 } 872
750 flag = 1; 873 flag = 1;
751 } 874 }
752 875
753 if (QUERY_FLAG (op, FLAG_WIZ)) 876 if (QUERY_FLAG (ob, FLAG_WIZ))
754 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count); 877 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s (%d).", query_name (tmp), tmp->count);
755 else 878 else
756 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp)); 879 new_draw_info_format (NDI_UNIQUE, 0, ob, "- %s.", query_name (tmp));
757 880
758 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) && 881 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
759 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ)) 882 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (ob, FLAG_WIZ))
760 inventory (op, tmp->head == NULL ? tmp : tmp->head); 883 inventory (ob, tmp->head == NULL ? tmp : tmp->head);
761 884
762 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */ 885 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
763 break; 886 break;
764 } 887 }
765 888
766 if (!flag) 889 if (!flag)
767 { 890 {
768 if (dx || dy) 891 if (dx || dy)
769 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there."); 892 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing there.");
770 else 893 else
771 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 894 new_draw_info (NDI_UNIQUE, 0, ob, "You see nothing.");
772 } 895 }
773} 896}
774
775
776 897
777/** Client wants to look at some object. Lets do so. */ 898/** Client wants to look at some object. Lets do so. */
778void 899void
779LookAt (char *buf, int len, player *pl) 900LookAt (char *buf, int len, player *pl)
780{ 901{
781 int dx, dy;
782 char *cp; 902 char *cp;
783 903
784 dx = atoi (buf); 904 int dx = atoi (buf);
785 if (!(cp = strchr (buf, ' '))) 905 if (!(cp = strchr (buf, ' ')))
786 {
787 return;
788 }
789 dy = atoi (cp);
790
791 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2)
792 return; 906 return;
793 907
908 int dy = atoi (cp);
909
910 if (player *opl = pl->observe->contr)
911 if (client *ns = opl->ns)
912 {
913 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
914 return;
915
794 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 916 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
795 return; 917 return;
918 }
796 919
797 look_at (pl->ob, dx, dy); 920 look_at (pl, dx, dy);
798} 921}
799 922
800/** Move an object to a new location */ 923/** Move an object to a new location */
801void 924void
802esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 925esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
… …
810 return; 933 return;
811 } 934 }
812 935
813 if (!to) 936 if (!to)
814 { /* drop it to the ground */ 937 { /* drop it to the ground */
815
816/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818 if (op->map && !op->env) 938 if (op->map && !op->env)
819 {
820
821/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822 return; 939 return;
823 } 940
824 /* If it is an active container, then we should drop all objects 941 /* If it is an active container, then we should drop all objects
825 * in the container and not the container itself. 942 * in the container and not the container itself.
826 */ 943 */
827 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 944 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828 { 945 {
… …
831 for (current = op->inv; current != NULL; current = next) 948 for (current = op->inv; current != NULL; current = next)
832 { 949 {
833 next = current->below; 950 next = current->below;
834 drop_object (pl, current, 0); 951 drop_object (pl, current, 0);
835 } 952 }
953
836 esrv_update_item (UPD_WEIGHT, pl, op); 954 esrv_update_item (UPD_WEIGHT, pl, op);
837 } 955 }
838 else 956 else
839 {
840 drop_object (pl, op, nrof); 957 drop_object (pl, op, nrof);
841 } 958
842 return; 959 return;
843 } 960 }
844 else if (to == pl->count) 961 else if (to == pl->count)
845 { /* pick it up to the inventory */ 962 { /* pick it up to the inventory */
846 /* return if player has already picked it up */ 963 /* return if player has already picked it up */
… …
849 966
850 pl->contr->count = nrof; 967 pl->contr->count = nrof;
851 pick_up (pl, op); 968 pick_up (pl, op);
852 return; 969 return;
853 } 970 }
971
854 env = esrv_get_ob_from_count (pl, to); 972 env = esrv_get_ob_from_count (pl, to);
855 if (!env) 973 if (!env)
856 { 974 {
857 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 975 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858 return; 976 return;
859 } 977 }
978
860 /* put_object_in_sack presumes that necessary sanity checking 979 /* put_object_in_sack presumes that necessary sanity checking
861 * has already been done (eg, it can be picked up and fits in 980 * 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 981 * 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. 982 * an make sure env is in fact a container for that matter.
864 */ 983 */
865 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 984 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
866 {
867 put_object_in_sack (pl, env, op, nrof); 985 put_object_in_sack (pl, env, op, nrof);
868 }
869} 986}
987

Diff Legend

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