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

Diff Legend

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