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

Diff Legend

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