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.49 by root, Fri Jun 8 09:20:20 2007 UTC

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

Diff Legend

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