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.4 by root, Sun Sep 3 00:18:43 2006 UTC vs.
Revision 1.43 by root, Tue Apr 3 00:21:38 2007 UTC

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

Diff Legend

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