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.8 by root, Sat Sep 16 22:24:13 2006 UTC vs.
Revision 1.47 by root, Tue Jun 5 13:05:03 2007 UTC

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

Diff Legend

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