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

Diff Legend

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