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.3 by root, Tue Aug 29 08:01:38 2006 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC

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

Diff Legend

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