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.69 by root, Mon Jul 14 23:47:06 2008 UTC

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

Diff Legend

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