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.58 by root, Tue Apr 15 14:21:04 2008 UTC

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

Diff Legend

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