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

Diff Legend

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