ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/socket/item.C
(Generate patch)

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

Diff Legend

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