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.50 by root, Sun Jul 1 05:00:20 2007 UTC

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

Diff Legend

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