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.13 by root, Thu Dec 14 00:13:26 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
51/**
52 * Adds string to socklist.
53 *
54 * This is a simple function that we use a lot here. It basically
55 * adds the specified buffer into the socklist, but prepends a
56 * single byte in length. If the data is longer than that byte, it is
57 * truncated approprately.
58 */
59inline void
60add_stringlen_to_sockbuf (const char *buf, SockList * sl)
61{
62 int len;
63
64 len = strlen (buf);
65 if (len > 255)
66 len = 255;
67 SockList_AddChar (sl, (char) len);
68 strncpy ((char *) sl->buf + sl->len, buf, len);
69 sl->len += len;
70}
71 188
72/** 189/**
73 * This is a similar to query_name, but returns flags 190 * This is a similar to query_name, but returns flags
74 * to be sended to client. 191 * to be sent to client.
75 */ 192 */
76unsigned int 193unsigned int
77query_flags (object *op) 194query_flags (object *op)
78{ 195{
79 unsigned int flags = 0; 196 unsigned int flags = 0;
80 197
81 if (QUERY_FLAG (op, FLAG_APPLIED)) 198 if (QUERY_FLAG (op, FLAG_APPLIED))
82 { 199 {
83 switch (op->type) 200 switch (op->type)
84 { 201 {
85 case BOW: 202 case BOW:
86 case WAND: 203 case WAND:
87 case ROD: 204 case ROD:
88 case HORN: 205 case HORN:
89 flags = a_readied; 206 flags = a_readied;
90 break; 207 break;
91 case WEAPON: 208 case WEAPON:
92 flags = a_wielded; 209 flags = a_wielded;
93 break; 210 break;
94 case SKILL: 211 case SKILL:
95 case ARMOUR: 212 case ARMOUR:
96 case HELMET: 213 case HELMET:
97 case SHIELD: 214 case SHIELD:
98 case RING: 215 case RING:
99 case BOOTS: 216 case BOOTS:
100 case GLOVES: 217 case GLOVES:
101 case AMULET: 218 case AMULET:
102 case GIRDLE: 219 case GIRDLE:
103 case BRACERS: 220 case BRACERS:
104 case CLOAK: 221 case CLOAK:
105 flags = a_worn; 222 flags = a_worn;
106 break; 223 break;
107 case CONTAINER: 224 case CONTAINER:
108 flags = a_active; 225 flags = a_active;
109 break; 226 break;
110 default: 227 default:
111 flags = a_applied; 228 flags = a_applied;
112 break; 229 break;
113 } 230 }
114 } 231 }
232
115 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))))
116 flags |= F_OPEN; 234 flags |= F_OPEN;
117 235
118 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 236 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
119 { 237 {
120 if (QUERY_FLAG (op, FLAG_DAMNED)) 238 if (QUERY_FLAG (op, FLAG_DAMNED))
121 flags |= F_DAMNED; 239 flags |= F_DAMNED;
122 else if (QUERY_FLAG (op, FLAG_CURSED)) 240 else if (QUERY_FLAG (op, FLAG_CURSED))
123 flags |= F_CURSED; 241 flags |= F_CURSED;
124 } 242 }
243
125 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))
126 flags |= F_MAGIC; 245 flags |= F_MAGIC;
127 if (QUERY_FLAG (op, FLAG_UNPAID)) 246 if (QUERY_FLAG (op, FLAG_UNPAID))
128 flags |= F_UNPAID; 247 flags |= F_UNPAID;
129 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 248 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
130 flags |= F_LOCKED; 249 flags |= F_LOCKED;
131 250
132 return flags; 251 return flags;
133} 252}
134 253
135/* Used in the send_look to put object head into SockList 254/* Used in the send_look to put object head into packet
136 * 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
137 * animation of face to the client. 256 * animation of face to the client.
138 */ 257 */
139static void 258static void
140add_object_to_socklist (NewSocket &ns, SockList &sl, object *head) 259add_object_to_socklist (client &ns, packet &sl, object *head)
141{ 260{
142 int flags, len, anim_speed; 261 int flags, len, anim_speed;
143 char item_n[MAX_BUF]; 262 char item_n[MAX_BUF];
144 const char *item_p; 263 const char *item_p;
145 264
146 flags = query_flags (head); 265 flags = query_flags (head);
147 if (QUERY_FLAG (head, FLAG_NO_PICK)) 266 if (QUERY_FLAG (head, FLAG_NO_PICK))
148 flags |= F_NOPICK; 267 flags |= F_NOPICK;
149 268
150 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 269 ns.send_face (head->face);
151 esrv_send_face (&ns, head->face->number, 0); 270 ns.flush_fx ();
152 271
153 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])
154 esrv_send_animation (&ns, head->animation_id); 273 ns.send_animation (head->animation_id);
155 274
156 sl << uint32 (head->count) 275 sl << uint32 (head->count)
157 << uint32 (flags) 276 << uint32 (flags)
158 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 277 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
159 << uint32 (head->face->number); 278 << uint32 (head->face);
160 279
161 if (!head->custom_name) 280 if (!head->custom_name)
162 { 281 {
163 strncpy (item_n, query_base_name (head, 0), 127); 282 strncpy (item_n, query_base_name (head, 0), 127);
164 item_n[127] = 0; 283 item_n[127] = 0;
… …
185 { 304 {
186 if (head->anim_speed) 305 if (head->anim_speed)
187 anim_speed = head->anim_speed; 306 anim_speed = head->anim_speed;
188 else 307 else
189 { 308 {
190 if (FABS (head->speed) < 0.001) 309 if (fabs (head->speed) < 0.001)
191 anim_speed = 255; 310 anim_speed = 255;
192 else if (FABS (head->speed) >= 1.0) 311 else if (fabs (head->speed) >= 1.0)
193 anim_speed = 1; 312 anim_speed = 1;
194 else 313 else
195 anim_speed = (int) (1.0 / FABS (head->speed)); 314 anim_speed = (int) (1.0 / fabs (head->speed));
196 } 315 }
197 316
198 if (anim_speed > 255) 317 if (anim_speed > 255)
199 anim_speed = 255; 318 anim_speed = 255;
200 } 319 }
… …
206 sl << uint16 (head->client_type); 325 sl << uint16 (head->client_type);
207 326
208 SET_FLAG (head, FLAG_CLIENT_SENT); 327 SET_FLAG (head, FLAG_CLIENT_SENT);
209} 328}
210 329
211
212/** 330/**
213 * Send the look window. Don't need to do animations here 331 * Send the look window. Don't need to do animations here
214 * 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
215 * because object ordering would otherwise be inconsistent 333 * because object ordering would otherwise be inconsistent.
216 */ 334 */
217
218void 335void
219esrv_draw_look (object *pl) 336esrv_draw_look (object *pl)
220{ 337{
221 object *tmp, *last;
222 int got_one = 0, start_look = 0, end_look = 0; 338 int got_one = 0, start_look = 0, end_look = 0;
223 char buf[MAX_BUF];
224 339
225 if (!pl->contr->socket.update_look) 340 if (!pl->contr->ns->update_look)
226 { 341 {
227 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);
228 return; 343 return;
229 } 344 }
230 else 345 else
231 pl->contr->socket.update_look = 0; 346 pl->contr->ns->update_look = 0;
232 347
233 if (QUERY_FLAG (pl, FLAG_REMOVED) 348 if (QUERY_FLAG (pl, FLAG_REMOVED)
234 || !pl->map 349 || !pl->map
235 || pl->map->in_memory != MAP_IN_MEMORY 350 || pl->map->in_memory != MAP_IN_MEMORY
236 || out_of_map (pl->map, pl->x, pl->y)) 351 || out_of_map (pl->map, pl->x, pl->y))
237 return; 352 return;
238 353
239 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");
240 355
241 SockList sl (MAXSOCKBUF); 356 packet sl;
242
243 Write_String_To_Socket (&pl->contr->socket, "delinv 0", sizeof ("delinv 0") - 1);
244
245 sl.printf ("item%d ", pl->contr->socket.itemcmd); 357 sl.printf ("item%d ", pl->contr->ns->itemcmd);
246 358
247 sl << uint32 (0); 359 sl << uint32 (0);
248 360
249 if (!(pl->contr->socket.faces_sent[empty_face->number] & NS_FACESENT_FACE)) 361 pl->contr->ns->send_face (empty_face);
250 esrv_send_face (&pl->contr->socket, empty_face->number, 0); 362 pl->contr->ns->flush_fx ();
251 363
252 if (pl->contr->socket.look_position) 364 if (pl->contr->ns->look_position)
253 { 365 {
366 char buf[80];
367 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
368
254 sl << uint32 (0x80000000 | (pl->contr->socket.look_position - NUM_LOOK_OBJECTS)) 369 sl << uint32 (0x80000000 | (pl->contr->ns->look_position - FLOORBOX_PAGESIZE))
255 << uint32 (0) 370 << uint32 (0)
256 << sint32 (-1) 371 << sint32 (-1)
257 << uint32 (empty_face->number); 372 << uint32 (empty_face)
258 373 << data8 (buf)
259 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
260
261 sl << uint16 (0) 374 << uint16 (0)
262 << uint8 (0) 375 << uint8 (0)
263 << uint32 (0); 376 << uint32 (0);
264 377
265 if (pl->contr->socket.itemcmd == 2) 378 if (pl->contr->ns->itemcmd == 2)
266 sl << uint16 (0); 379 sl << uint16 (0);
267 } 380 }
268 381
382 object *tmp = pl->ms ().top;
269 for (last = NULL; tmp != last; tmp = tmp->below) 383 for (object *last = 0; tmp != last; tmp = tmp->below)
270 { 384 {
271 object *head; 385 object *head;
272 386
273 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 387 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last)
274 { 388 {
275 last = tmp->below; /* assumes double floor mode */ 389 last = tmp->below; /* assumes double floor mode */
276 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 390 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
277 last = last->below; 391 last = last->below;
278 } 392 }
279 393
280 if (LOOK_OBJ (tmp)) 394 if (tmp->client_visible ())
281 { 395 {
282 if (++start_look < pl->contr->socket.look_position) 396 if (++start_look < pl->contr->ns->look_position)
283 continue; 397 continue;
284 398
285 end_look++; 399 end_look++;
286 400
287 if (end_look > NUM_LOOK_OBJECTS) 401 if (end_look > FLOORBOX_PAGESIZE)
288 { 402 {
289 /* 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,
290 * we notice the special tag the object has, and act accordingly. 404 * we notice the special tag the object has, and act accordingly.
291 */ 405 */
292 SockList_AddInt (&sl, 0x80000000 | (pl->contr->socket.look_position + NUM_LOOK_OBJECTS)); 406 sl << uint32 (0x80000000 | (pl->contr->ns->look_position + FLOORBOX_PAGESIZE))
293 SockList_AddInt (&sl, 0); 407 << uint32 (0)
294 SockList_AddInt (&sl, (uint32) - 1); 408 << uint32 ((uint32) - 1)
295 SockList_AddInt (&sl, empty_face->number); 409 << uint32 (empty_face)
296 sprintf (buf, "Click here to see next group of items"); 410 << data8 ("Apply this to see next group of items")
297 add_stringlen_to_sockbuf (buf, &sl); 411 << uint16 (0)
298 SockList_AddShort (&sl, 0); 412 << uint8 (0)
299 SockList_AddChar (&sl, 0); 413 << uint32 (0);
300 SockList_AddInt (&sl, 0); 414
301 if (pl->contr->socket.itemcmd == 2) 415 if (pl->contr->ns->itemcmd == 2)
302 SockList_AddShort (&sl, 0); 416 sl << uint16 (0);
417
303 break; 418 break;
304 } 419 }
420
305 if (tmp->head) 421 if (tmp->head)
306 head = tmp->head; 422 head = tmp->head;
307 else 423 else
308 head = tmp; 424 head = tmp;
309 425
310 add_object_to_socklist (pl->contr->socket, sl, head); 426 add_object_to_socklist (*pl->contr->ns, sl, head);
311 got_one++; 427 got_one++;
312 428
313 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 429 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
314 { 430 {
315 Send_With_Handling (&pl->contr->socket, &sl); 431 pl->contr->ns->send_packet (sl);
432
433 sl.reset ();
316 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 434 sl.printf ("item%d ", pl->contr->ns->itemcmd);
317 sl.len = strlen ((char *) sl.buf); 435 sl << uint32 (0);
318 SockList_AddInt (&sl, 0);
319 got_one = 0; 436 got_one = 0;
320 } 437 }
321 } /* If LOOK_OBJ() */ 438 }
322 } 439 }
323 440
324 if (got_one) 441 if (got_one)
325 Send_With_Handling (&pl->contr->socket, &sl); 442 pl->contr->ns->send_packet (sl);
326 443
327 sl.free ();
328} 444}
329 445
330/** 446/**
331 * Sends whole inventory. 447 * Sends whole inventory.
332 */ 448 */
333void 449void
334esrv_send_inventory (object *pl, object *op) 450esrv_send_inventory (object *pl, object *op)
335{ 451{
336 object *tmp; 452 if (!pl->contr->ns)//D
453 return;
454
337 int got_one = 0; 455 int got_one = 0;
338 SockList sl;
339 456
340 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 457 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
341 458
342 sprintf ((char *) sl.buf, "delinv %d", op->count); 459 packet sl;
343 sl.len = strlen ((char *) sl.buf);
344 Send_With_Handling (&pl->contr->socket, &sl);
345
346 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 460 sl.printf ("item%d ", pl->contr->ns->itemcmd);
347 sl.len = strlen ((char *) sl.buf);
348 461
349 SockList_AddInt (&sl, op->count); 462 sl << uint32 (op->count);
350 463
351 for (tmp = op->inv; tmp; tmp = tmp->below) 464 for (object *tmp = op->inv; tmp; tmp = tmp->below)
352 { 465 {
353 object *head; 466 object *head;
354 467
355 if (tmp->head) 468 if (tmp->head)
356 head = tmp->head; 469 head = tmp->head;
357 else 470 else
358 head = tmp; 471 head = tmp;
359 472
360 if (LOOK_OBJ (head)) 473 if (head->client_visible ())
361 { 474 {
362 add_object_to_socklist (pl->contr->socket, sl, head); 475 add_object_to_socklist (*pl->contr->ns, sl, head);
363 476
364 got_one++; 477 got_one++;
365 478
366 /* IT is possible for players to accumulate a huge amount of 479 /* IT is possible for players to accumulate a huge amount of
367 * items (especially with some of the bags out there) to 480 * items (especially with some of the bags out there) to
368 * overflow the buffer. IF so, send multiple item commands. 481 * overflow the buffer. IF so, send multiple item commands.
369 */ 482 */
370 if (sl.len >= (MAXSOCKBUF - MAXITEMLEN)) 483 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
371 { 484 {
372 Send_With_Handling (&pl->contr->socket, &sl); 485 pl->contr->ns->send_packet (sl);
486
487 sl.reset ();
373 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 488 sl.printf ("item%d ", pl->contr->ns->itemcmd);
374 sl.len = strlen ((char *) sl.buf); 489 sl << uint32 (op->count);
375 SockList_AddInt (&sl, op->count);
376 got_one = 0; 490 got_one = 0;
377 } 491 }
378 } /* If LOOK_OBJ() */ 492 }
379 } 493 }
494
380 if (got_one) 495 if (got_one)
381 Send_With_Handling (&pl->contr->socket, &sl); 496 pl->contr->ns->send_packet (sl);
382 sl.free ();
383} 497}
384 498
385/** 499/**
386 * Updates object *op for player *pl. 500 * Updates object *op for player *pl.
387 * 501 *
388 * flags is a list of values to update 502 * flags is a list of values to update
389 * 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
390 * same value both places. 504 * same value both places.
391 */ 505 */
392
393void 506void
394esrv_update_item (int flags, object *pl, object *op) 507esrv_update_item (int flags, object *pl, object *op)
395{ 508{
396 SockList sl;
397
398 /* 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. */
399 if (op != pl) 510 if (op != pl)
400 { 511 {
401 if (!LOOK_OBJ (op)) 512 if (!op->client_visible ())
402 return; 513 return;
403 /* 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
404 * is hopefully in the same place, so the client should preserve 515 * is hopefully in the same place, so the client should preserve
405 * order. 516 * order.
406 */ 517 */
407 } 518 }
408 519
520 client *ns = pl->contr->ns;
521 if (!ns)
522 return;
523
409 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 524 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
410 { 525 {
411 /* 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
412 * 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
413 * and track back the call. 528 * and track back the call.
414 */ 529 */
415 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);
416 } 531 }
417 532
418 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 533 packet sl ("upditem");
419 534
420 strcpy ((char *) sl.buf, "upditem "); 535 sl << uint8 (flags);
421 sl.len = strlen ((char *) sl.buf);
422
423 SockList_AddChar (&sl, (char) flags);
424 536
425 if (op->head) 537 if (op->head)
426 op = op->head; 538 op = op->head;
427 539
428 SockList_AddInt (&sl, op->count); 540 sl << uint32 (op->count);
429 541
430 if (flags & UPD_LOCATION) 542 if (flags & UPD_LOCATION)
431 SockList_AddInt (&sl, op->env ? op->env->count : 0); 543 sl << uint32 (op->env ? op->env->count : 0);
432 544
433 if (flags & UPD_FLAGS) 545 if (flags & UPD_FLAGS)
434 SockList_AddInt (&sl, query_flags (op)); 546 sl << uint32 (query_flags (op));
435 547
436 if (flags & UPD_WEIGHT) 548 if (flags & UPD_WEIGHT)
437 { 549 {
438 sint32 weight = WEIGHT (op); 550 sint32 weight = WEIGHT (op);
439 551
440 SockList_AddInt (&sl, QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 552 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
553
441 if (pl == op) 554 if (pl == op)
442 {
443 op->contr->last_weight = weight; 555 ns->last_weight = weight;
444 }
445 } 556 }
446 557
447 if (flags & UPD_FACE) 558 if (flags & UPD_FACE)
448 { 559 {
449 if (!(pl->contr->socket.faces_sent[op->face->number] & NS_FACESENT_FACE)) 560 ns->send_face (op->face);
450 esrv_send_face (&pl->contr->socket, op->face->number, 0); 561 ns->flush_fx ();
451 SockList_AddInt (&sl, op->face->number); 562 sl << uint32 (op->face);
452 } 563 }
453 564
454 if (flags & UPD_NAME) 565 if (flags & UPD_NAME)
455 { 566 {
456 int len; 567 int len;
… …
473 } 584 }
474 585
475 strncpy (item_n + len + 1, item_p, 127); 586 strncpy (item_n + len + 1, item_p, 127);
476 item_n[254] = 0; 587 item_n[254] = 0;
477 len += strlen (item_n + 1 + len) + 1; 588 len += strlen (item_n + 1 + len) + 1;
478 SockList_AddChar (&sl, (char) len); 589
479 memcpy (sl.buf + sl.len, item_n, len); 590 sl << data8 (item_n, len);
480 sl.len += len;
481 } 591 }
482 592
483 if (flags & UPD_ANIM) 593 if (flags & UPD_ANIM)
484 SockList_AddShort (&sl, op->animation_id); 594 sl << uint16 (op->animation_id);
485 595
486 if (flags & UPD_ANIMSPEED) 596 if (flags & UPD_ANIMSPEED)
487 { 597 {
488 int anim_speed = 0; 598 int anim_speed = 0;
489 599
… …
491 { 601 {
492 if (op->anim_speed) 602 if (op->anim_speed)
493 anim_speed = op->anim_speed; 603 anim_speed = op->anim_speed;
494 else 604 else
495 { 605 {
496 if (FABS (op->speed) < 0.001) 606 if (fabs (op->speed) < 0.001)
497 anim_speed = 255; 607 anim_speed = 255;
498 else if (FABS (op->speed) >= 1.0) 608 else if (fabs (op->speed) >= 1.0)
499 anim_speed = 1; 609 anim_speed = 1;
500 else 610 else
501 anim_speed = (int) (1.0 / FABS (op->speed)); 611 anim_speed = (int) (1.0 / fabs (op->speed));
502 } 612 }
613
503 if (anim_speed > 255) 614 if (anim_speed > 255)
504 anim_speed = 255; 615 anim_speed = 255;
505 } 616 }
506 SockList_AddChar (&sl, (char) anim_speed); 617
618 sl << uint8 (anim_speed);
507 } 619 }
620
508 if (flags & UPD_NROF) 621 if (flags & UPD_NROF)
509 SockList_AddInt (&sl, op->nrof); 622 sl << uint32 (op->nrof);
510 623
511 Send_With_Handling (&pl->contr->socket, &sl); 624 pl->contr->ns->send_packet (sl);
512 sl.free ();
513} 625}
514 626
515/** 627/**
516 * Sends item's info to player. 628 * Sends item's info to player.
517 */ 629 */
518void 630void
519esrv_send_item (object *pl, object *op) 631esrv_send_item (object *pl, object *op)
520{ 632{
521 SockList sl; 633 if (!pl->contr->ns)
634 return;
522 635
523 /* If this is not the player object, do some more checks */ 636 /* If this is not the player object, do some more checks */
524 if (op != pl) 637 if (op != pl)
525 { 638 {
526 /* We only send 'visibile' objects to the client */ 639 /* We only send 'visibile' objects to the client */
527 if (!LOOK_OBJ (op)) 640 if (!op->client_visible ())
528 return; 641 return;
642
529 /* 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
530 * be updated. 644 * be updated.
531 */ 645 */
532 if (!op->env) 646 if (!op->env)
533 { 647 {
534 pl->contr->socket.update_look = 1; 648 pl->contr->ns->floorbox_update ();
535 return; 649 return;
536 } 650 }
537 } 651 }
538 652
539 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 653 packet sl;
540 654
541 sprintf ((char *) sl.buf, "item%d ", pl->contr->socket.itemcmd); 655 sl.printf ("item%d ", pl->contr->ns->itemcmd);
542 sl.len = strlen ((char *) sl.buf);
543 656
544 if (op->head) 657 if (op->head)
545 op = op->head; 658 op = op->head;
546 659
547 SockList_AddInt (&sl, op->env ? op->env->count : 0); 660 sl << uint32 (op->env ? op->env->count : 0);
548 661
549 add_object_to_socklist (pl->contr->socket, sl, op); 662 add_object_to_socklist (*pl->contr->ns, sl, op);
550 663
551 Send_With_Handling (&pl->contr->socket, &sl); 664 pl->contr->ns->send_packet (sl);
552 SET_FLAG (op, FLAG_CLIENT_SENT); 665 SET_FLAG (op, FLAG_CLIENT_SENT);
553
554 sl.free ();
555} 666}
556 667
557/** 668/**
558 * Tells the client to delete an item. Uses the item 669 * Tells the client to delete an item. Uses the item
559 * command with a -1 location. 670 * command with a -1 location.
560 */ 671 */
561
562void 672void
563esrv_del_item (player *pl, int tag) 673esrv_del_item (player *pl, int tag)
564{ 674{
565 SockList sl; 675 if (!pl->ns)
676 return;
566 677
567 sl.buf = (unsigned char *) malloc (MAXSOCKBUF); 678 packet sl ("delitem");
568 679
569 strcpy ((char *) sl.buf, "delitem "); 680 sl << uint32 (tag);
570 sl.len = strlen ((char *) sl.buf);
571 SockList_AddInt (&sl, tag);
572 681
573 Send_With_Handling (&pl->socket, &sl); 682 pl->ns->send_packet (sl);
574 sl.free ();
575} 683}
576 684
577 685
578/******************************************************************************* 686/*******************************************************************************
579 * 687 *
… …
583 691
584/** 692/**
585 * 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
586 * pointer, or null if it can't be found. 694 * pointer, or null if it can't be found.
587 */ 695 */
588
589object * 696object *
590esrv_get_ob_from_count (object *pl, tag_t count) 697esrv_get_ob_from_count (object *pl, tag_t count)
591{ 698{
592 object *op, *tmp;
593
594 if (pl->count == count) 699 if (pl->count == count)
595 return pl; 700 return pl;
596 701
597 for (op = pl->inv; op; op = op->below) 702 for (object *op = pl->inv; op; op = op->below)
598 if (op->count == count) 703 if (op->count == count)
599 return op; 704 return op;
600 else if (op->type == CONTAINER && pl->container == op) 705 else if (op->type == CONTAINER && pl->container == op)
601 for (tmp = op->inv; tmp; tmp = tmp->below) 706 for (object *tmp = op->inv; tmp; tmp = tmp->below)
602 if (tmp->count == count) 707 if (tmp->count == count)
603 return tmp; 708 return tmp;
604 709
605 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)
606 if (op->head != NULL && op->head->count == count) 711 if (op->head && op->head->count == count)
607 return op; 712 return op;
608 else if (op->count == count) 713 else if (op->count == count)
609 return op; 714 return op;
610 else if (op->type == CONTAINER && pl->container == op) 715 else if (op->type == CONTAINER && pl->container == op)
611 for (tmp = op->inv; tmp; tmp = tmp->below) 716 for (object *tmp = op->inv; tmp; tmp = tmp->below)
612 if (tmp->count == count) 717 if (tmp->count == count)
613 return tmp; 718 return tmp;
614 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
615 return NULL; 726 return 0;
616} 727}
617
618 728
619/** Client wants to examine some object. So lets do so. */ 729/** Client wants to examine some object. So lets do so. */
620void 730void
621ExamineCmd (char *buf, int len, player *pl) 731ExamineCmd (char *buf, int len, player *pl)
622{ 732{
623 tag_t tag = atoi (buf); 733 tag_t tag = atoi (buf);
624
625 /* If the high bit is set, player examined a pseudo object. */
626 if (tag & 0x80000000)
627 return;
628 734
629 object *op = esrv_get_ob_from_count (pl->ob, tag); 735 object *op = esrv_get_ob_from_count (pl->ob, tag);
630 736
631 if (!op) 737 if (!op)
632 { 738 {
… …
635 } 741 }
636 742
637 examine (pl->ob, op); 743 examine (pl->ob, op);
638} 744}
639 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
640/** Client wants to apply some object. Lets do so. */ 763/** Client wants to apply some object. Lets do so. */
641void 764void
642ApplyCmd (char *buf, int len, player *pl) 765ApplyCmd (char *buf, int len, player *pl)
643{ 766{
644 tag_t tag = atoi (buf); 767 tag_t tag = atoi (buf);
645 768
… …
650 return; 773 return;
651 774
652 /* If the high bit is set, player applied a pseudo object. */ 775 /* If the high bit is set, player applied a pseudo object. */
653 if (tag & 0x80000000) 776 if (tag & 0x80000000)
654 { 777 {
655 pl->socket.look_position = tag & 0x7fffffff; 778 pl->ns->look_position = tag & 0x7fffffff;
656 pl->socket.update_look = 1; 779 pl->ns->floorbox_update ();
657 return; 780 return;
658 } 781 }
659 782
660 object *op = esrv_get_ob_from_count (pl->ob, tag); 783 object *op = esrv_get_ob_from_count (pl->ob, tag);
661 784
… …
666 } 789 }
667 790
668 player_apply (pl->ob, op, 0, 0); 791 player_apply (pl->ob, op, 0, 0);
669} 792}
670 793
671/** Client wants to apply some object. Lets do so. */ 794/** Client wants to lock some object. Lets do so. */
672void 795void
673LockItem (uint8 *data, int len, player *pl) 796LockItem (char *data, int len, player *pl)
674{ 797{
675 int flag = data[0]; 798 int flag = data[0];
676 tag_t tag = net_uint32 (data + 1); 799 tag_t tag = net_uint32 ((uint8 *)data + 1);
677 object *op = esrv_get_ob_from_count (pl->ob, tag); 800 object *op = esrv_get_ob_from_count (pl->ob, tag);
678 801
679 if (!op) 802 if (!op)
680 { 803 {
681 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");
… …
688 SET_FLAG (op, FLAG_INV_LOCKED); 811 SET_FLAG (op, FLAG_INV_LOCKED);
689 812
690 esrv_update_item (UPD_FLAGS, pl->ob, op); 813 esrv_update_item (UPD_FLAGS, pl->ob, op);
691} 814}
692 815
693/** Client wants to apply some object. Lets do so. */ 816/** Client wants to mark some object. Lets do so. */
694void 817void
695MarkItem (uint8 * data, int len, player *pl) 818MarkItem (char *data, int len, player *pl)
696{ 819{
697 tag_t tag = net_uint32 (data); 820 tag_t tag = net_uint32 ((uint8 *)data);
698 object *op = esrv_get_ob_from_count (pl->ob, tag); 821 object *op = esrv_get_ob_from_count (pl->ob, tag);
699 822
700 if (!op) 823 if (!op)
701 { 824 {
702 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");
… …
729 852
730 m = get_map_from_coord (op->map, &x, &y); 853 m = get_map_from_coord (op->map, &x, &y);
731 if (!m) 854 if (!m)
732 return; 855 return;
733 856
734 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 ;
735 859
736 for (; tmp != NULL; tmp = tmp->below) 860 for (; tmp; tmp = tmp->below)
737 { 861 {
738 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ)) 862 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
739 continue; 863 continue;
740 864
741 if (!flag) 865 if (!flag)
… …
770 else 894 else
771 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing."); 895 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
772 } 896 }
773} 897}
774 898
775
776
777/** Client wants to look at some object. Lets do so. */ 899/** Client wants to look at some object. Lets do so. */
778void 900void
779LookAt (char *buf, int len, player *pl) 901LookAt (char *buf, int len, player *pl)
780{ 902{
781 int dx, dy; 903 int dx, dy;
782 char *cp; 904 char *cp;
783 905
784 dx = atoi (buf); 906 dx = atoi (buf);
785 if (!(cp = strchr (buf, ' '))) 907 if (!(cp = strchr (buf, ' ')))
786 {
787 return; 908 return;
788 } 909
789 dy = atoi (cp); 910 dy = atoi (cp);
790
791 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)
792 return; 912 return;
793 913
794 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])
795 return; 915 return;
796 916
797 look_at (pl->ob, dx, dy); 917 look_at (pl->ob, dx, dy);
798} 918}
799 919
… …
810 return; 930 return;
811 } 931 }
812 932
813 if (!to) 933 if (!to)
814 { /* drop it to the ground */ 934 { /* drop it to the ground */
815
816/* LOG(llevDebug, "Drop it on the ground.\n");*/
817
818 if (op->map && !op->env) 935 if (op->map && !op->env)
819 {
820
821/* LOG(llevDebug,"Dropping object to ground that is already on ground\n");*/
822 return; 936 return;
823 } 937
824 /* If it is an active container, then we should drop all objects 938 /* If it is an active container, then we should drop all objects
825 * in the container and not the container itself. 939 * in the container and not the container itself.
826 */ 940 */
827 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 941 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
828 { 942 {
… …
831 for (current = op->inv; current != NULL; current = next) 945 for (current = op->inv; current != NULL; current = next)
832 { 946 {
833 next = current->below; 947 next = current->below;
834 drop_object (pl, current, 0); 948 drop_object (pl, current, 0);
835 } 949 }
950
836 esrv_update_item (UPD_WEIGHT, pl, op); 951 esrv_update_item (UPD_WEIGHT, pl, op);
837 } 952 }
838 else 953 else
839 {
840 drop_object (pl, op, nrof); 954 drop_object (pl, op, nrof);
841 } 955
842 return; 956 return;
843 } 957 }
844 else if (to == pl->count) 958 else if (to == pl->count)
845 { /* pick it up to the inventory */ 959 { /* pick it up to the inventory */
846 /* return if player has already picked it up */ 960 /* return if player has already picked it up */
… …
849 963
850 pl->contr->count = nrof; 964 pl->contr->count = nrof;
851 pick_up (pl, op); 965 pick_up (pl, op);
852 return; 966 return;
853 } 967 }
968
854 env = esrv_get_ob_from_count (pl, to); 969 env = esrv_get_ob_from_count (pl, to);
855 if (!env) 970 if (!env)
856 { 971 {
857 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 972 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
858 return; 973 return;
859 } 974 }
975
860 /* put_object_in_sack presumes that necessary sanity checking 976 /* put_object_in_sack presumes that necessary sanity checking
861 * 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
862 * 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
863 * 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.
864 */ 980 */
865 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))
866 {
867 put_object_in_sack (pl, env, op, nrof); 982 put_object_in_sack (pl, env, op, nrof);
868 }
869} 983}
984

Diff Legend

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