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.5 by root, Sun Sep 10 13:43:33 2006 UTC vs.
Revision 1.51 by root, Tue Jul 24 04:55:35 2007 UTC

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

Diff Legend

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