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

Diff Legend

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