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

Diff Legend

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