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

Diff Legend

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