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.42 by root, Wed Mar 14 00:04:59 2007 UTC

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

Diff Legend

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