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.95 by root, Wed Apr 28 11:39:45 2010 UTC

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

Diff Legend

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