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.15 by root, Thu Dec 14 01:12:35 2006 UTC vs.
Revision 1.66 by root, Tue May 6 19:42:53 2008 UTC

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

Diff Legend

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