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.43 by root, Tue Apr 3 00:21:38 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))
109 flags |= F_LOCKED; 249 flags |= F_LOCKED;
110 250
111 return flags; 251 return flags;
112} 252}
113 253
114/* Used in the send_look to put object head into SockList 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 (NewSocket &ns, SockList &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 SockList sl (MAXSOCKBUF); 356 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); 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 {
366 char buf[80];
367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
368
234 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
235 << uint32 (0) 370 << uint32 (0)
236 << sint32 (-1) 371 << sint32 (-1)
237 << uint32 (empty_face->number); 372 << uint32 (empty_face)
238 373 << data8 (buf)
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241 sl << uint16 (0) 374 << uint16 (0)
242 << uint8 (0) 375 << uint8 (0)
243 << uint32 (0); 376 << uint32 (0);
244 377
245 if (pl->contr->socket.itemcmd == 2) 378 if (pl->contr->ns->itemcmd == 2)
246 sl << uint16 (0); 379 sl << uint16 (0);
247 } 380 }
248 381
382 object *tmp = pl->ms ().top;
249 for (last = NULL; tmp != last; tmp = tmp->below) 383 for (object *last = 0; tmp != last; tmp = tmp->below)
250 { 384 {
251 object *head; 385 object *head;
252 386
253 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
254 { 388 {
255 last = tmp->below; /* assumes double floor mode */ 389 last = tmp->below; /* assumes double floor mode */
256 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 390 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
257 last = last->below; 391 last = last->below;
258 } 392 }
259 393
260 if (LOOK_OBJ (tmp)) 394 if (tmp->client_visible ())
261 { 395 {
262 if (++start_look < pl->contr->socket.look_position) 396 if (++start_look < pl->contr->ns->look_position)
263 continue; 397 continue;
264 398
265 end_look++; 399 end_look++;
266 400
267 if (end_look > NUM_LOOK_OBJECTS) 401 if (end_look > FLOORBOX_PAGESIZE)
268 { 402 {
269 /* 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,
270 * we notice the special tag the object has, and act accordingly. 404 * we notice the special tag the object has, and act accordingly.
271 */ 405 */
272 sl << uint32 (0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)) 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
273 << uint32 (0) 407 << uint32 (0)
274 << uint32 ((uint32) - 1) 408 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number); 409 << uint32 (empty_face)
276 410 << 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) 411 << uint16 (0)
280 << uint8 (0) 412 << uint8 (0)
281 << uint32 (0); 413 << uint32 (0);
282 414
283 if (pl->contr->socket.itemcmd == 2) 415 if (pl->contr->ns->itemcmd == 2)
284 sl << uint16 (0); 416 sl << uint16 (0);
285 417
286 break; 418 break;
287 } 419 }
288 420
289 if (tmp->head) 421 if (tmp->head)
290 head = tmp->head; 422 head = tmp->head;
291 else 423 else
292 head = tmp; 424 head = tmp;
293 425
294 add_object_to_socklist (pl->contr->socket, sl, head); 426 add_object_to_socklist (*pl->contr->ns, sl, head);
295 got_one++; 427 got_one++;
296 428
297 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 { 430 {
299 Send_With_Handling (&pl->contr->socket, &sl); 431 pl->contr->ns->send_packet (sl);
300 432
301 sl.reset (); 433 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket.itemcmd); 434 sl.printf ("item%d ", pl->contr->ns->itemcmd);
303 sl << uint32 (0); 435 sl << uint32 (0);
304 got_one = 0; 436 got_one = 0;
305 } 437 }
306 } /* If LOOK_OBJ() */ 438 }
307 } 439 }
308 440
309 if (got_one) 441 if (got_one)
310 Send_With_Handling (&pl->contr->socket, &sl); 442 pl->contr->ns->send_packet (sl);
311 443
312 sl.free ();
313} 444}
314 445
315/** 446/**
316 * Sends whole inventory. 447 * Sends whole inventory.
317 */ 448 */
318void 449void
319esrv_send_inventory (object *pl, object *op) 450esrv_send_inventory (object *pl, object *op)
320{ 451{
321 object *tmp; 452 if (!pl->contr->ns)//D
453 return;
454
322 int got_one = 0; 455 int got_one = 0;
323 456
324 SockList sl (MAXSOCKBUF); 457 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
325 458
326 sl.printf ("delinv %d", op->count); 459 packet sl;
327 Send_With_Handling (&pl->contr->socket, &sl);
328
329 sl.reset ();
330 sl.printf ("item%d ", pl->contr->socket.itemcmd); 460 sl.printf ("item%d ", pl->contr->ns->itemcmd);
331 461
332 sl << uint32 (op->count); 462 sl << uint32 (op->count);
333 463
334 for (tmp = op->inv; tmp; tmp = tmp->below) 464 for (object *tmp = op->inv; tmp; tmp = tmp->below)
335 { 465 {
336 object *head; 466 object *head;
337 467
338 if (tmp->head) 468 if (tmp->head)
339 head = tmp->head; 469 head = tmp->head;
340 else 470 else
341 head = tmp; 471 head = tmp;
342 472
343 if (LOOK_OBJ (head)) 473 if (head->client_visible ())
344 { 474 {
345 add_object_to_socklist (pl->contr->socket, sl, head); 475 add_object_to_socklist (*pl->contr->ns, sl, head);
346 476
347 got_one++; 477 got_one++;
348 478
349 /* IT is possible for players to accumulate a huge amount of 479 /* IT is possible for players to accumulate a huge amount of
350 * items (especially with some of the bags out there) to 480 * items (especially with some of the bags out there) to
351 * overflow the buffer. IF so, send multiple item commands. 481 * overflow the buffer. IF so, send multiple item commands.
352 */ 482 */
353 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 483 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
354 { 484 {
355 Send_With_Handling (&pl->contr->socket, &sl); 485 pl->contr->ns->send_packet (sl);
486
487 sl.reset ();
356 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 488 sl.printf ("item%d ", pl->contr->ns->itemcmd);
357 sl.len = strlen ((char *) sl.buf);
358 sl << uint32 (op->count); 489 sl << uint32 (op->count);
359 got_one = 0; 490 got_one = 0;
360 } 491 }
361 } /* If LOOK_OBJ() */ 492 }
362 } 493 }
363 494
364 if (got_one) 495 if (got_one)
365 Send_With_Handling (&pl->contr->socket, &sl); 496 pl->contr->ns->send_packet (sl);
366
367 sl.free ();
368} 497}
369 498
370/** 499/**
371 * Updates object *op for player *pl. 500 * Updates object *op for player *pl.
372 * 501 *
373 * flags is a list of values to update 502 * flags is a list of values to update
374 * 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
375 * same value both places. 504 * same value both places.
376 */ 505 */
377
378void 506void
379esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
380{ 508{
381 /* 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. */
382 if (op != pl) 510 if (op != pl)
383 { 511 {
384 if (!LOOK_OBJ (op)) 512 if (!op->client_visible ())
385 return; 513 return;
386 /* 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
387 * is hopefully in the same place, so the client should preserve 515 * is hopefully in the same place, so the client should preserve
388 * order. 516 * order.
389 */ 517 */
390 } 518 }
391 519
520 client *ns = pl->contr->ns;
521 if (!ns)
522 return;
523
392 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
393 { 525 {
394 /* 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
395 * 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
396 * and track back the call. 528 * and track back the call.
397 */ 529 */
398 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);
399 } 531 }
400 532
401 SockList sl (MAXSOCKBUF); 533 packet sl ("upditem");
402 534
403 sl << "upditem "
404 << uint8 (flags); 535 sl << uint8 (flags);
405 536
406 if (op->head) 537 if (op->head)
407 op = op->head; 538 op = op->head;
408 539
409 sl << uint32 (op->count); 540 sl << uint32 (op->count);
… …
419 sint32 weight = WEIGHT (op); 550 sint32 weight = WEIGHT (op);
420 551
421 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
422 553
423 if (pl == op) 554 if (pl == op)
424 op->contr->last_weight = weight; 555 ns->last_weight = weight;
425 } 556 }
426 557
427 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
428 { 559 {
429 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
430 esrv_send_face (&pl->contr->socket, op->face->number, 0); 561 ns->flush_fx ();
431
432 sl << uint32 (op->face->number); 562 sl << uint32 (op->face);
433 } 563 }
434 564
435 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
436 { 566 {
437 int len; 567 int len;
… …
471 { 601 {
472 if (op->anim_speed) 602 if (op->anim_speed)
473 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
474 else 604 else
475 { 605 {
476 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
477 anim_speed = 255; 607 anim_speed = 255;
478 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
479 anim_speed = 1; 609 anim_speed = 1;
480 else 610 else
481 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
482 } 612 }
483 613
484 if (anim_speed > 255) 614 if (anim_speed > 255)
485 anim_speed = 255; 615 anim_speed = 255;
486 } 616 }
… …
489 } 619 }
490 620
491 if (flags & UPD_NROF) 621 if (flags & UPD_NROF)
492 sl << uint32 (op->nrof); 622 sl << uint32 (op->nrof);
493 623
494 Send_With_Handling (&pl->contr->socket, &sl); 624 pl->contr->ns->send_packet (sl);
495 sl.free ();
496} 625}
497 626
498/** 627/**
499 * Sends item's info to player. 628 * Sends item's info to player.
500 */ 629 */
501void 630void
502esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
503{ 632{
633 if (!pl->contr->ns)
634 return;
635
504 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
505 if (op != pl) 637 if (op != pl)
506 { 638 {
507 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
508 if (!LOOK_OBJ (op)) 640 if (!op->client_visible ())
509 return; 641 return;
642
510 /* 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
511 * be updated. 644 * be updated.
512 */ 645 */
513 if (!op->env) 646 if (!op->env)
514 { 647 {
515 pl->contr->socket.update_look = 1; 648 pl->contr->ns->floorbox_update ();
516 return; 649 return;
517 } 650 }
518 } 651 }
519 652
520 SockList sl (MAXSOCKBUF); 653 packet sl;
521 654
522 sl.printf ("item%d ", pl->contr->socket.itemcmd); 655 sl.printf ("item%d ", pl->contr->ns->itemcmd);
523 656
524 if (op->head) 657 if (op->head)
525 op = op->head; 658 op = op->head;
526 659
527 sl << uint32 (op->env ? op->env->count : 0); 660 sl << uint32 (op->env ? op->env->count : 0);
528 661
529 add_object_to_socklist (pl->contr->socket, sl, op); 662 add_object_to_socklist (*pl->contr->ns, sl, op);
530 663
531 Send_With_Handling (&pl->contr->socket, &sl); 664 pl->contr->ns->send_packet (sl);
532 SET_FLAG (op, FLAG_CLIENT_SENT); 665 SET_FLAG (op, FLAG_CLIENT_SENT);
533
534 sl.free ();
535} 666}
536 667
537/** 668/**
538 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
539 * command with a -1 location. 670 * 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 *
… …
577 else if (op->type == CONTAINER && pl->container == op) 708 else if (op->type == CONTAINER && pl->container == op)
578 for (tmp = op->inv; tmp; tmp = tmp->below) 709 for (tmp = op->inv; tmp; tmp = tmp->below)
579 if (tmp->count == count) 710 if (tmp->count == count)
580 return tmp; 711 return tmp;
581 712
582 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 713 for (op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
583 if (op->head != NULL && op->head->count == count) 714 if (op->head && op->head->count == count)
584 return op; 715 return op;
585 else if (op->count == count) 716 else if (op->count == count)
586 return op; 717 return op;
587 else if (op->type == CONTAINER && pl->container == op) 718 else if (op->type == CONTAINER && pl->container == op)
588 for (tmp = op->inv; tmp; tmp = tmp->below) 719 for (tmp = op->inv; tmp; tmp = tmp->below)
589 if (tmp->count == count) 720 if (tmp->count == count)
590 return tmp; 721 return tmp;
591 722
592 return NULL; 723 return 0;
593} 724}
594 725
595 726
596/** Client wants to examine some object. So lets do so. */ 727/** Client wants to examine some object. So lets do so. */
597void 728void
… …
612 } 743 }
613 744
614 examine (pl->ob, op); 745 examine (pl->ob, op);
615} 746}
616 747
617/** Client wants to apply some object. Lets do so. */ 748/** Client wants to apply some object. Lets do so. */
618void 749void
619ApplyCmd (char *buf, int len, player *pl) 750ApplyCmd (char *buf, int len, player *pl)
620{ 751{
621 tag_t tag = atoi (buf); 752 tag_t tag = atoi (buf);
622 753
… …
627 return; 758 return;
628 759
629 /* If the high bit is set, player applied a pseudo object. */ 760 /* If the high bit is set, player applied a pseudo object. */
630 if (tag & 0x80000000) 761 if (tag & 0x80000000)
631 { 762 {
632 pl->socket.look_position = tag & 0x7fffffff; 763 pl->ns->look_position = tag & 0x7fffffff;
633 pl->socket.update_look = 1; 764 pl->ns->floorbox_update ();
634 return; 765 return;
635 } 766 }
636 767
637 object *op = esrv_get_ob_from_count (pl->ob, tag); 768 object *op = esrv_get_ob_from_count (pl->ob, tag);
638 769
… …
643 } 774 }
644 775
645 player_apply (pl->ob, op, 0, 0); 776 player_apply (pl->ob, op, 0, 0);
646} 777}
647 778
648/** Client wants to apply some object. Lets do so. */ 779/** Client wants to lock some object. Lets do so. */
649void 780void
650LockItem (uint8 *data, int len, player *pl) 781LockItem (char *data, int len, player *pl)
651{ 782{
652 int flag = data[0]; 783 int flag = data[0];
653 tag_t tag = net_uint32 (data + 1); 784 tag_t tag = net_uint32 ((uint8 *)data + 1);
654 object *op = esrv_get_ob_from_count (pl->ob, tag); 785 object *op = esrv_get_ob_from_count (pl->ob, tag);
655 786
656 if (!op) 787 if (!op)
657 { 788 {
658 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 789 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
… …
665 SET_FLAG (op, FLAG_INV_LOCKED); 796 SET_FLAG (op, FLAG_INV_LOCKED);
666 797
667 esrv_update_item (UPD_FLAGS, pl->ob, op); 798 esrv_update_item (UPD_FLAGS, pl->ob, op);
668} 799}
669 800
670/** Client wants to apply some object. Lets do so. */ 801/** Client wants to mark some object. Lets do so. */
671void 802void
672MarkItem (uint8 * data, int len, player *pl) 803MarkItem (char *data, int len, player *pl)
673{ 804{
674 tag_t tag = net_uint32 (data); 805 tag_t tag = net_uint32 ((uint8 *)data);
675 object *op = esrv_get_ob_from_count (pl->ob, tag); 806 object *op = esrv_get_ob_from_count (pl->ob, tag);
676 807
677 if (!op) 808 if (!op)
678 { 809 {
679 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 810 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
… …
706 837
707 m = get_map_from_coord (op->map, &x, &y); 838 m = get_map_from_coord (op->map, &x, &y);
708 if (!m) 839 if (!m)
709 return; 840 return;
710 841
711 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above); 842 for (tmp = GET_MAP_OB (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
712 843
713 for (; tmp != NULL; tmp = tmp->below) 844 for (; tmp != NULL; tmp = tmp->below)
714 { 845 {
715 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 846 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
716 continue; 847 continue;
… …
747 else 878 else
748 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 879 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
749 } 880 }
750} 881}
751 882
752
753
754/** Client wants to look at some object. Lets do so. */ 883/** Client wants to look at some object. Lets do so. */
755void 884void
756LookAt (char *buf, int len, player *pl) 885LookAt (char *buf, int len, player *pl)
757{ 886{
758 int dx, dy; 887 int dx, dy;
… …
763 { 892 {
764 return; 893 return;
765 } 894 }
766 dy = atoi (cp); 895 dy = atoi (cp);
767 896
768 if (FABS (dx) > pl->socket.mapx / 2 || FABS (dy) > pl->socket.mapy / 2) 897 if (fabs (dx) > pl->ns->mapx / 2 || fabs (dy) > pl->ns->mapy / 2)
769 return; 898 return;
770 899
771 if (pl->blocked_los[dx + pl->socket.mapx / 2][dy + pl->socket.mapy / 2]) 900 if (pl->blocked_los[dx + pl->ns->mapx / 2][dy + pl->ns->mapy / 2])
772 return; 901 return;
773 902
774 look_at (pl->ob, dx, dy); 903 look_at (pl->ob, dx, dy);
775} 904}
776 905
… …
806 } 935 }
807 936
808 esrv_update_item (UPD_WEIGHT, pl, op); 937 esrv_update_item (UPD_WEIGHT, pl, op);
809 } 938 }
810 else 939 else
811 {
812 drop_object (pl, op, nrof); 940 drop_object (pl, op, nrof);
813 } 941
814 return; 942 return;
815 } 943 }
816 else if (to == pl->count) 944 else if (to == pl->count)
817 { /* pick it up to the inventory */ 945 { /* pick it up to the inventory */
818 /* return if player has already picked it up */ 946 /* return if player has already picked it up */
… …
835 * has already been done (eg, it can be picked up and fits in 963 * 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 964 * 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. 965 * an make sure env is in fact a container for that matter.
838 */ 966 */
839 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 967 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
840 {
841 put_object_in_sack (pl, env, op, nrof); 968 put_object_in_sack (pl, env, op, nrof);
842 }
843} 969}
844 970

Diff Legend

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