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

Diff Legend

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