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

Diff Legend

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