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.21 by root, Fri Dec 15 00:34:17 2006 UTC vs.
Revision 1.44 by root, Mon Apr 23 19:10:17 2007 UTC

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

Diff Legend

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