ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.13 by root, Thu Dec 14 00:13:26 2006 UTC vs.
Revision 1.64 by root, Mon May 5 22:03:22 2008 UTC

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

Diff Legend

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