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.21 by root, Fri Dec 15 00:34:17 2006 UTC

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

Diff Legend

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