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.79 by root, Mon Oct 12 14:00:59 2009 UTC

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

Diff Legend

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