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.3 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.79 by root, Mon Oct 12 14:00:59 2009 UTC

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

Diff Legend

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