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.24 by root, Sat Dec 16 22:14:42 2006 UTC vs.
Revision 1.70 by root, Sun Aug 31 02:01:41 2008 UTC

1/* 1/*
2 CrossFire, A Multiplayer game for X-windows 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
4 Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
5 Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (©) 1992,2007 Frank Tore Johansen
6 7 *
7 This program is free software; you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify
8 it under the terms of the GNU General Public License as published by 9 * it under the terms of the GNU General Public License as published by
9 the Free Software Foundation; either version 2 of the License, or 10 * the Free Software Foundation, either version 3 of the License, or
10 (at your option) any later version. 11 * (at your option) any later version.
11 12 *
12 This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 GNU General Public License for more details. 16 * GNU General Public License for more details.
16 17 *
17 You should have received a copy of the GNU General Public License 18 * You should have received a copy of the GNU General Public License
18 along with this program; if not, write to the Free Software 19 * along with this program. If not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 20 *
20 21 * The authors can be reached via e-mail to <support@deliantra.net>
21 The author can be reached via e-mail to <crossfire@schmorp.de>
22*/ 22 */
23 23
24/** 24/**
25 * \file 25 * \file
26 * Client/server logic. 26 * Client/server logic.
27 * 27 *
28 * \date 2003-12-02 28 * \date 2003-12-02
29 * 29 *
30 * This containes item logic for client/server. It doesn't contain 30 * This contains item logic for client/server. It doesn't contain
31 * the actual commands that send the data, but does contain 31 * the actual commands that send the data, but does contain
32 * the logic for what items should be sent. 32 * the logic for what items should be sent.
33 */ 33 */
34 34
35#include <global.h> 35#include <global.h>
36#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
37#include <sproto.h> 37#include <sproto.h>
38 38
39/** This is the maximum number of bytes we expect any one item to take up */ 39/** This is the maximum number of bytes we expect any one item to take up */
40#define MAXITEMLEN 300 40#define MAXITEMLEN 300
41 41
… …
53query_flags (object *op) 53query_flags (object *op)
54{ 54{
55 unsigned int flags = 0; 55 unsigned int flags = 0;
56 56
57 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
58 {
59 switch (op->type) 58 switch (op->type)
60 { 59 {
61 case BOW: 60 case BOW:
62 case WAND: 61 case WAND:
63 case ROD: 62 case ROD:
64 case HORN: 63 case HORN:
65 flags = a_readied; 64 flags = a_readied;
66 break; 65 break;
67 case WEAPON: 66 case WEAPON:
68 flags = a_wielded; 67 flags = a_wielded;
69 break; 68 break;
70 case SKILL: 69 case SKILL:
71 case ARMOUR: 70 case ARMOUR:
72 case HELMET: 71 case HELMET:
73 case SHIELD: 72 case SHIELD:
74 case RING: 73 case RING:
75 case BOOTS: 74 case BOOTS:
76 case GLOVES: 75 case GLOVES:
77 case AMULET: 76 case AMULET:
78 case GIRDLE: 77 case GIRDLE:
79 case BRACERS: 78 case BRACERS:
80 case CLOAK: 79 case CLOAK:
81 flags = a_worn; 80 flags = a_worn;
82 break; 81 break;
83 case CONTAINER: 82 case CONTAINER:
84 flags = a_active; 83 flags = a_active;
85 break; 84 break;
86 default: 85 default:
87 flags = a_applied; 86 flags = a_applied;
88 break; 87 break;
89 } 88 }
90 }
91 89
92 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED)))) 90 if (op->type == CONTAINER && ((op->env && op->env->container == op) || (!op->env && QUERY_FLAG (op, FLAG_APPLIED))))
93 flags |= F_OPEN; 91 flags |= F_OPEN;
94 92
95 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
… …
115 * animation of face to the client. 113 * animation of face to the client.
116 */ 114 */
117static void 115static void
118add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
119{ 117{
120 int flags, len, anim_speed;
121 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
122 const char *item_p; 119 const char *item_p;
123 120
124 flags = query_flags (head); 121 int flags = query_flags (head);
125 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
126 flags |= F_NOPICK; 123 flags |= F_NOPICK;
127 124
128 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 125 ns.send_face (head->face, -50);
129 esrv_send_face (&ns, head->face->number, 0); 126 ns.flush_fx ();
130 127
131 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id]) 128 if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
132 esrv_send_animation (&ns, head->animation_id); 129 ns.send_animation (head->animation_id);
133 130
134 sl << uint32 (head->count) 131 sl << uint32 (head->count)
135 << uint32 (flags) 132 << uint32 (flags)
136 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
137 << uint32 (head->face->number); 134 << uint32 (head->face);
135
136 int len;
138 137
139 if (!head->custom_name) 138 if (!head->custom_name)
140 { 139 {
141 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
142 item_n[127] = 0; 141 item_n[127] = 0;
… …
156 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
157 156
158 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
159 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
160 159
161 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
162 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
163 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
164 if (head->anim_speed)
165 anim_speed = head->anim_speed;
166 else
167 {
168 if (FABS (head->speed) < 0.001)
169 anim_speed = 255;
170 else if (FABS (head->speed) >= 1.0)
171 anim_speed = 1;
172 else
173 anim_speed = (int) (1.0 / FABS (head->speed));
174 }
175
176 if (anim_speed > 255)
177 anim_speed = 255;
178 }
179 163
180 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
181 << uint32 (head->nrof); 165 << uint32 (head->nrof);
182 166
183 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
184 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
185
186 SET_FLAG (head, FLAG_CLIENT_SENT);
187} 169}
188 170
171static faceidx
172need_face_now (player *pl, const char *name)
173{
174 faceidx face = face_find (name, empty_face);
175
176 pl->ns->send_face (face, -50);
177 pl->ns->flush_fx ();
178
179 return face;
180}
181
182#define FINGER_UP "finger_up.x11"
183#define FINGER_DOWN "finger_down.x11"
189 184
190/** 185/**
191 * Send the look window. Don't need to do animations here 186 * Send the look window. Don't need to do animations here
192 * This sends all the faces to the client, not just updates. This is 187 * This sends all the faces to the client, not just updates. This is
193 * because object ordering would otherwise be inconsistent. 188 * because object ordering would otherwise be inconsistent.
194 */ 189 */
195void 190void
196esrv_draw_look (object *pl) 191esrv_draw_look (player *pl)
197{ 192{
198 object *tmp, *last; 193 object *ob = pl->ob;
199 int got_one = 0, start_look = 0, end_look = 0;
200 char buf[MAX_BUF];
201 194
202 if (!pl->contr->socket->update_look) 195 if (!pl->ns->update_look)
203 { 196 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 197 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
205 return; 198 return;
206 } 199 }
207 else 200
208 pl->contr->socket->update_look = 0; 201 pl->ns->update_look = 0;
209 202
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 203 if (QUERY_FLAG (ob, FLAG_REMOVED)
211 || !pl->map 204 || !ob->map
212 || pl->map->in_memory != MAP_IN_MEMORY 205 || ob->map->in_memory != MAP_ACTIVE
213 || out_of_map (pl->map, pl->x, pl->y)) 206 || out_of_map (ob->map, ob->x, ob->y))
214 return; 207 return;
215 208
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 209 pl->ns->send_packet ("delinv 0");
217 ;
218 210
219 packet sl; 211 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
224 213
225 sl << uint32 (0); 214 sl << uint32 (0);
226 215
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 216 int start_pos = pl->ns->look_position;
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 217 bool dirty = false;
229 218
230 if (pl->contr->socket->look_position) 219 mapspace &ms = ob->ms ();
220
221 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
222 // start from the top
223 object *items [FLOORBOX_PAGESIZE];
224 int item_idx = 0, item_cnt = 0;
225 int pos = 0;
226
227 // find our items by walking down
228 object *item = ms.top;
229
230 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
231 {
232 if (!item->client_visible ())
233 continue;
234
235 if (++pos < start_pos)
236 continue;
237
238 // record item
239 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
240 item_cnt++;
241
242 // stop at first floor
243 if (item->flag [FLAG_IS_FLOOR])
244 {
245 // we are finished, don't append "next group of items"
246 // by setting item to ms.bot it becomes zero which is checked after the while loop
247 item = ms.bot;
248 }
231 { 249 }
232 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
234 250
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 251 // see if there are more if we cared - we ignore invisible objects
252 if (item)
253 {
254 /* What we basically do is make a 'fake' object - when the user applies it,
255 * we notice the special tag the object has, and act accordingly.
256 */
257 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
236 << uint32 (0) 258 << uint32 (0)
237 << sint32 (-1) 259 << uint32 ((uint32) - 1)
238 << uint32 (empty_face->number) 260 << uint32 (need_face_now (pl, FINGER_DOWN))
239 << data8 (buf) 261 << data8 ("Apply this to see the items below")
240 << uint16 (0) 262 << uint16 (0)
241 << uint8 (0) 263 << uint8 (0)
242 << uint32 (0); 264 << uint32 (0);
243 265
244 if (pl->contr->socket->itemcmd == 2) 266 if (pl->ns->itemcmd == 2)
245 sl << uint16 (0); 267 sl << uint16 (0);
246 }
247 268
248 for (last = NULL; tmp != last; tmp = tmp->below) 269 dirty = true;
249 { 270 }
250 object *head;
251 271
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 272 // now send out all items in the ring buffer in reverse order
273 while (item_cnt)
274 {
275 --item_cnt;
276 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
277 object *item = items [item_idx];
278
279 add_object_to_socklist (*pl->ns, sl, item->head_ ());
280
281 dirty = true;
282
283 // if packet got too large, send it and begin a new one
284 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
253 { 285 {
254 last = tmp->below; /* assumes double floor mode */ 286 pl->ns->send_packet (sl);
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 287
256 last = last->below; 288 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0);
291
292 dirty = false;
257 } 293 }
258
259 if (LOOK_OBJ (tmp))
260 {
261 if (++start_look < pl->contr->socket->look_position)
262 continue;
263
264 end_look++;
265
266 if (end_look > NUM_LOOK_OBJECTS)
267 {
268 /* What we basically do is make a 'fake' object - when the user applies it,
269 * we notice the special tag the object has, and act accordingly.
270 */
271 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
272 << uint32 (0)
273 << uint32 ((uint32) - 1)
274 << uint32 (empty_face->number)
275 << data8 ("Apply this to see next group of items")
276 << uint16 (0)
277 << uint8 (0)
278 << uint32 (0);
279
280 if (pl->contr->socket->itemcmd == 2)
281 sl << uint16 (0);
282
283 break;
284 }
285
286 if (tmp->head)
287 head = tmp->head;
288 else
289 head = tmp;
290
291 add_object_to_socklist (*pl->contr->socket, sl, head);
292 got_one++;
293
294 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
295 {
296 pl->contr->socket->send_packet (sl);
297
298 sl.reset ();
299 sl.printf ("item%d ", pl->contr->socket->itemcmd);
300 sl << uint32 (0);
301 got_one = 0;
302 }
303 }
304 } 294 }
305 295
306 if (got_one) 296 if (start_pos)
297 {
298 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
299 << uint32 (0)
300 << sint32 (-1)
301 << uint32 (need_face_now (pl, FINGER_UP))
302 << data8 ("Apply this to see the items higher up")
303 << uint16 (0)
304 << uint8 (0)
305 << uint32 (0);
306
307 if (pl->ns->itemcmd == 2)
308 sl << uint16 (0);
309
310 dirty = true;
311 }
312
313 if (dirty)
307 pl->contr->socket->send_packet (sl); 314 pl->ns->send_packet (sl);
308
309} 315}
310 316
311/** 317/**
312 * Sends whole inventory. 318 * Sends whole inventory.
313 */ 319 */
314void 320void
315esrv_send_inventory (object *pl, object *op) 321esrv_send_inventory (object *pl, object *op)
316{ 322{
317 object *tmp; 323 if (!pl->contr->ns)//D
324 return;
325
318 int got_one = 0; 326 int got_one = 0;
319 327
328 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
329
320 packet sl; 330 packet sl;
321
322 sl.printf ("delinv %d", op->count);
323 pl->contr->socket->send_packet (sl);
324
325 sl.reset ();
326 sl.printf ("item%d ", pl->contr->socket->itemcmd); 331 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 332
328 sl << uint32 (op->count); 333 sl << uint32 (op->count);
329 334
330 for (tmp = op->inv; tmp; tmp = tmp->below) 335 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 336 {
332 object *head; 337 object *head;
333 338
334 if (tmp->head) 339 if (tmp->head)
335 head = tmp->head; 340 head = tmp->head;
336 else 341 else
337 head = tmp; 342 head = tmp;
338 343
339 if (LOOK_OBJ (head)) 344 if (head->client_visible ())
340 { 345 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 346 add_object_to_socklist (*pl->contr->ns, sl, head);
342 347
343 got_one++; 348 got_one++;
344 349
345 /* IT is possible for players to accumulate a huge amount of 350 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 351 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 352 * overflow the buffer. IF so, send multiple item commands.
348 */ 353 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 354 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
350 { 355 {
351 pl->contr->socket->send_packet (sl); 356 pl->contr->ns->send_packet (sl);
352 357
353 sl.reset (); 358 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 359 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 360 sl << uint32 (op->count);
356 got_one = 0; 361 got_one = 0;
357 } 362 }
358 } /* If LOOK_OBJ() */ 363 }
359 } 364 }
360 365
361 if (got_one) 366 if (got_one)
362 pl->contr->socket->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
363} 368}
364 369
365/** 370/**
366 * Updates object *op for player *pl. 371 * Updates object *op for player *pl.
367 * 372 *
368 * flags is a list of values to update 373 * flags is a list of values to update
369 * to the client (as defined in newclient.h - might as well use the 374 * to the client (as defined in newclient.h - might as well use the
370 * same value both places. 375 * same value both places.
371 */ 376 */
372
373void 377void
374esrv_update_item (int flags, object *pl, object *op) 378esrv_update_item (int flags, object *pl, object *op)
375{ 379{
376 /* If we have a request to send the player item, skip a few checks. */ 380 /* If we have a request to send the player item, skip a few checks. */
377 if (op != pl) 381 if (op != pl && !op->client_visible ())
378 {
379 if (!LOOK_OBJ (op))
380 return; 382 return;
381 /* we remove the check for op->env, because in theory, the object
382 * is hopefully in the same place, so the client should preserve
383 * order.
384 */
385 }
386 383
387 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 384 client *ns = pl->contr->ns;
388 { 385 if (!ns)
389 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 386 return;
390 * this is happening - we can set a breakpoint here in the debugger
391 * and track back the call.
392 */
393 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
394 }
395 387
396 packet sl; 388 packet sl ("upditem");
397 389
398 sl << "upditem "
399 << uint8 (flags); 390 sl << uint8 (flags);
400 391
401 if (op->head)
402 op = op->head; 392 op = op->head_ ();
403 393
404 sl << uint32 (op->count); 394 sl << uint32 (op->count);
405 395
406 if (flags & UPD_LOCATION) 396 if (flags & UPD_LOCATION)
407 sl << uint32 (op->env ? op->env->count : 0); 397 sl << uint32 (op->env ? op->env->count : 0);
… …
409 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
410 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
411 401
412 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
413 { 403 {
414 sint32 weight = WEIGHT (op); 404 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
415 405
416 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
417
418 if (pl == op) 406 if (op)
419 op->contr->last_weight = weight; 407 ns->last_weight = weight;
408
409 sl << uint32 (weight);
420 } 410 }
421 411
422 if (flags & UPD_FACE) 412 if (flags & UPD_FACE)
423 { 413 {
424 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 414 ns->send_face (op->face, -50);
425 esrv_send_face (pl->contr->socket, op->face->number, 0); 415 ns->flush_fx ();
426
427 sl << uint32 (op->face->number); 416 sl << uint32 (op->face);
428 } 417 }
429 418
430 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
431 { 420 {
432 int len; 421 int len;
… …
466 { 455 {
467 if (op->anim_speed) 456 if (op->anim_speed)
468 anim_speed = op->anim_speed; 457 anim_speed = op->anim_speed;
469 else 458 else
470 { 459 {
471 if (FABS (op->speed) < 0.001) 460 if (fabs (op->speed) < 0.001)
472 anim_speed = 255; 461 anim_speed = 255;
473 else if (FABS (op->speed) >= 1.0) 462 else if (fabs (op->speed) >= 1.0)
474 anim_speed = 1; 463 anim_speed = 1;
475 else 464 else
476 anim_speed = (int) (1.0 / FABS (op->speed)); 465 anim_speed = (int) (1.0 / fabs (op->speed));
477 } 466 }
478 467
479 if (anim_speed > 255) 468 if (anim_speed > 255)
480 anim_speed = 255; 469 anim_speed = 255;
481 } 470 }
… …
484 } 473 }
485 474
486 if (flags & UPD_NROF) 475 if (flags & UPD_NROF)
487 sl << uint32 (op->nrof); 476 sl << uint32 (op->nrof);
488 477
489 pl->contr->socket->send_packet (sl); 478 pl->contr->ns->send_packet (sl);
490} 479}
491 480
492/** 481/**
493 * Sends item's info to player. 482 * Sends item's info to player.
494 */ 483 */
495void 484void
496esrv_send_item (object *pl, object *op) 485esrv_send_item (object *pl, object *op)
497{ 486{
498 /* If this is not the player object, do some more checks */ 487 if (!pl->contr->ns)
499 if (op != pl)
500 {
501 /* We only send 'visibile' objects to the client */
502 if (!LOOK_OBJ (op))
503 return; 488 return;
504 /* if the item is on the ground, mark that the look needs to 489
505 * be updated. 490 /* We only send 'visible' objects to the client, and sometimes the player */
506 */ 491 if (!op->client_visible () && op->type != PLAYER)
507 if (!op->env)
508 {
509 pl->contr->socket->update_look = 1;
510 return; 492 return;
511 }
512 }
513 493
514 packet sl; 494 packet sl;
515 495
516 sl.printf ("item%d ", pl->contr->socket->itemcmd); 496 sl.printf ("item%d ", pl->contr->ns->itemcmd);
517 497
518 if (op->head)
519 op = op->head; 498 op = op->head_ ();
520 499
521 sl << uint32 (op->env ? op->env->count : 0); 500 sl << uint32 (op->env ? op->env->count : 0);
522 501
523 add_object_to_socklist (*pl->contr->socket, sl, op); 502 add_object_to_socklist (*pl->contr->ns, sl, op);
524 503
525 pl->contr->socket->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
526 SET_FLAG (op, FLAG_CLIENT_SENT);
527} 505}
528 506
529/** 507/**
530 * Tells the client to delete an item. Uses the item 508 * Tells the client to delete an item.
531 * command with a -1 location.
532 */ 509 */
533
534void 510void
535esrv_del_item (player *pl, int tag) 511esrv_del_item (player *pl, int tag)
536{ 512{
537 packet sl; 513 if (!pl->ns)
514 return;
538 515
539 sl << "delitem " 516 packet sl ("delitem");
517
540 << uint32 (tag); 518 sl << uint32 (tag);
541 519
542 pl->socket->send_packet (sl); 520 pl->ns->send_packet (sl);
543} 521}
544 522
545 523
546/******************************************************************************* 524/*******************************************************************************
547 * 525 *
… …
551 529
552/** 530/**
553 * Takes a player and object count (tag) and returns the actual object 531 * Takes a player and object count (tag) and returns the actual object
554 * pointer, or null if it can't be found. 532 * pointer, or null if it can't be found.
555 */ 533 */
556
557object * 534object *
558esrv_get_ob_from_count (object *pl, tag_t count) 535esrv_get_ob_from_count (object *pl, tag_t count)
559{ 536{
560 object *op, *tmp;
561
562 if (pl->count == count) 537 if (pl->count == count)
563 return pl; 538 return pl;
564 539
565 for (op = pl->inv; op; op = op->below) 540 for (object *op = pl->inv; op; op = op->below)
566 if (op->count == count) 541 if (op->count == count)
567 return op; 542 return op;
568 else if (op->type == CONTAINER && pl->container == op) 543 else if (op->type == CONTAINER && pl->container == op)
569 for (tmp = op->inv; tmp; tmp = tmp->below) 544 for (object *tmp = op->inv; tmp; tmp = tmp->below)
570 if (tmp->count == count) 545 if (tmp->count == count)
571 return tmp; 546 return tmp;
572 547
573 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 548 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
574 if (op->head && op->head->count == count) 549 if (op->head && op->head->count == count)
575 return op; 550 return op;
576 else if (op->count == count) 551 else if (op->count == count)
577 return op; 552 return op;
578 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container == op)
579 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
580 if (tmp->count == count) 555 if (tmp->count == count)
581 return tmp; 556 return tmp;
582 557
558#if 0
559 /* If the high bit is set, player examined a pseudo object. */
560 if (count & 0x80000000)
561 return 0;
562#endif
563
583 return 0; 564 return 0;
584} 565}
585 566
586
587/** Client wants to examine some object. So lets do so. */ 567/** Client wants to examine some object. So lets do so. */
588void 568void
589ExamineCmd (char *buf, int len, player *pl) 569ExamineCmd (char *buf, int len, player *pl)
590{ 570{
591 tag_t tag = atoi (buf); 571 tag_t tag = atoi (buf);
592
593 /* If the high bit is set, player examined a pseudo object. */
594 if (tag & 0x80000000)
595 return;
596
597 object *op = esrv_get_ob_from_count (pl->ob, tag);
598
599 if (!op)
600 {
601 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
602 return;
603 }
604
605 examine (pl->ob, op);
606}
607
608/** Client wants to apply some object. Lets do so. */
609void
610ApplyCmd (char *buf, int len, player *pl)
611{
612 tag_t tag = atoi (buf);
613
614 /* sort of a hack, but if the player saves and the player then manually
615 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
616 */
617 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
618 return;
619 572
620 /* If the high bit is set, player applied a pseudo object. */ 573 /* If the high bit is set, player applied a pseudo object. */
621 if (tag & 0x80000000) 574 if (tag & 0x80000000)
622 { 575 {
623 pl->socket->look_position = tag & 0x7fffffff; 576 pl->ns->look_position = tag & 0x7fffffff;
624 pl->socket->update_look = 1; 577 pl->ns->floorbox_update ();
625 return; 578 return;
626 } 579 }
627 580
628 object *op = esrv_get_ob_from_count (pl->ob, tag); 581 object *op = esrv_get_ob_from_count (pl->ob, tag);
629 582
630 if (!op) 583 if (!op)
631 { 584 {
585 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
586 return;
587 }
588
589 examine (pl->ob, op);
590}
591
592/** Client wants to examine some object. So lets do so. */
593void
594ExCmd (char *buf, int len, player *pl)
595{
596 tag_t tag = atoi (buf);
597
598 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
599 {
600 std::string s = op->describe (pl->ob);
601
602 if (msg_is_special (s.c_str (), false))
603 cfperl_expand_cfpod (pl, s);
604
605 packet sl ("ex");
606 sl << ber32 (tag) << s.c_str ();
607
608 pl->ns->send_packet (sl);
609 }
610}
611
612/** Client wants to apply some object. Lets do so. */
613void
614ApplyCmd (char *buf, int len, player *pl)
615{
616 tag_t tag = atoi (buf);
617
618 /* If the high bit is set, player applied a pseudo object. */
619 if (tag & 0x80000000)
620 {
621 pl->ns->look_position = tag & 0x7fffffff;
622 pl->ns->floorbox_update ();
623 return;
624 }
625
626 object *op = esrv_get_ob_from_count (pl->ob, tag);
627
628 if (!op)
629 {
632 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 630 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
633 return; 631 return;
634 } 632 }
635 633
636 player_apply (pl->ob, op, 0, 0); 634 player_apply (pl->ob, op, 0, 0);
637} 635}
638 636
639/** Client wants to apply some object. Lets do so. */ 637/** Client wants to lock some object. Lets do so. */
640void 638void
641LockItem (char *data, int len, player *pl) 639LockItem (char *data, int len, player *pl)
642{ 640{
643 int flag = data[0]; 641 int flag = data[0];
644 tag_t tag = net_uint32 ((uint8 *)data + 1); 642 tag_t tag = net_uint32 ((uint8 *)data + 1);
645 object *op = esrv_get_ob_from_count (pl->ob, tag); 643 object *op = esrv_get_ob_from_count (pl->ob, tag);
646 644
647 if (!op) 645 if (!op)
648 { 646 {
649 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 647 pl->failmsg ("Could not find object to lock/unlock");
650 return; 648 return;
651 } 649 }
652 650
653 if (!flag) 651 if (!flag)
654 CLEAR_FLAG (op, FLAG_INV_LOCKED); 652 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
656 SET_FLAG (op, FLAG_INV_LOCKED); 654 SET_FLAG (op, FLAG_INV_LOCKED);
657 655
658 esrv_update_item (UPD_FLAGS, pl->ob, op); 656 esrv_update_item (UPD_FLAGS, pl->ob, op);
659} 657}
660 658
661/** Client wants to apply some object. Lets do so. */ 659/** Client wants to mark some object. Lets do so. */
662void 660void
663MarkItem (char *data, int len, player *pl) 661MarkItem (char *data, int len, player *pl)
664{ 662{
665 tag_t tag = net_uint32 ((uint8 *)data); 663 tag_t tag = net_uint32 ((uint8 *)data);
666 object *op = esrv_get_ob_from_count (pl->ob, tag); 664 object *op = esrv_get_ob_from_count (pl->ob, tag);
667 665
668 if (!op) 666 if (!op)
669 { 667 {
670 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 668 pl->failmsg ("Could not find object to mark");
671 return; 669 return;
672 } 670 }
673 671
674 pl->mark = op; 672 pl->mark = op;
675 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 673 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
676} 674}
677 675
678/** 676/**
679 * look_at prints items on the specified square. 677 * look_at prints items on the specified square.
680 * 678 *
681 * [ removed EARTHWALL check and added check for containers inventory. 679 * [ removed EARTHWALL check and added check for containers inventory.
682 * Tero.Haatanen@lut.fi ] 680 * Tero.Haatanen@lut.fi ]
683 */ 681 */
684void 682static void
685look_at (object *op, int dx, int dy) 683look_at (player *pl, int dx, int dy)
686{ 684{
687 object *tmp; 685 dynbuf_text buf;
688 int flag = 0; 686 object *ob = pl->ob;
689 sint16 x, y;
690 maptile *m;
691 687
692 x = op->x + dx; 688 if (!pl->observe->map)
693 y = op->y + dy;
694
695 if (out_of_map (op->map, x, y))
696 return; 689 return;
697 690
698 m = get_map_from_coord (op->map, &x, &y); 691 mapxy pos (pl->observe);
699 if (!m) 692 pos.move (dx, dy);
693
694 if (pos.normalise ())
695 for (object *tmp = pos->top; tmp; tmp = tmp->below)
696 {
697 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
698 continue;
699
700 if (QUERY_FLAG (ob, FLAG_WIZ))
701 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
702 else
703 buf.printf ("- %s.\n", query_name (tmp));
704
705 object *head = tmp->head_ ();
706
707 if (head->inv)
708 if ((head->type != CONTAINER && head->type != FLESH)
709 || QUERY_FLAG (ob, FLAG_WIZ))
710 buf << head->query_inventory (ob, " ");
711
712 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
713 break;
714 }
715
716 if (buf.empty ())
717 pl->failmsg ("You see nothing there.");
718 else
719 pl->infobox (MSG_CHANNEL ("lookat"), buf);
720}
721
722/** Client wants to look at some object. Lets do so. */
723void
724LookAt (char *buf, int len, player *pl)
725{
726 char *cp;
727
728 int dx = atoi (buf);
729 if (!(cp = strchr (buf, ' ')))
700 return; 730 return;
701 731
702 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
703
704 for (; tmp != NULL; tmp = tmp->below)
705 {
706 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
707 continue;
708
709 if (!flag)
710 {
711 if (dx || dy)
712 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
713 else
714 {
715 clear_win_info (op);
716 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
717 }
718 flag = 1;
719 }
720
721 if (QUERY_FLAG (op, FLAG_WIZ))
722 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
723 else
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
725
726 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
727 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
728 inventory (op, tmp->head == NULL ? tmp : tmp->head);
729
730 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
731 break;
732 }
733
734 if (!flag)
735 {
736 if (dx || dy)
737 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
738 else
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
740 }
741}
742
743
744
745/** Client wants to look at some object. Lets do so. */
746void
747LookAt (char *buf, int len, player *pl)
748{
749 int dx, dy;
750 char *cp;
751
752 dx = atoi (buf);
753 if (!(cp = strchr (buf, ' ')))
754 {
755 return;
756 }
757 dy = atoi (cp); 732 int dy = atoi (cp);
758 733
759 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 734 if (player *opl = pl->observe->contr)
735 if (client *ns = opl->ns)
736 {
737 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
760 return; 738 return;
761 739
762 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 740 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
763 return; 741 return;
742 }
764 743
765 look_at (pl->ob, dx, dy); 744 look_at (pl, dx, dy);
766} 745}
767 746
768/** Move an object to a new location */ 747/** Move an object to a new location */
769void 748void
770esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 749esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
771{ 750{
772 object *op, *env;
773
774 op = esrv_get_ob_from_count (pl, tag); 751 object *op = esrv_get_ob_from_count (pl, tag);
775 if (!op) 752 if (!op)
776 { 753 {
777 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 754 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
778 return; 755 return;
779 } 756 }
… …
786 /* If it is an active container, then we should drop all objects 763 /* If it is an active container, then we should drop all objects
787 * in the container and not the container itself. 764 * in the container and not the container itself.
788 */ 765 */
789 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 766 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
790 { 767 {
791 object *current, *next; 768 int cnt = MAX_ITEM_PER_DROP;
792 769
793 for (current = op->inv; current != NULL; current = next) 770 for (object *current = op->inv; current && cnt--; )
794 { 771 {
795 next = current->below; 772 object *next = current->below;
796 drop_object (pl, current, 0); 773 drop_object (pl, current, 0);
774 current = next;
797 } 775 }
798 776
799 esrv_update_item (UPD_WEIGHT, pl, op); 777 if (cnt <= 0)
778 op->failmsg ("Only dropped some items, can't drop that many items at once.");
800 } 779 }
801 else 780 else
802 drop_object (pl, op, nrof); 781 drop_object (pl, op, nrof);
803 782
804 return; 783 return;
… …
812 pl->contr->count = nrof; 791 pl->contr->count = nrof;
813 pick_up (pl, op); 792 pick_up (pl, op);
814 return; 793 return;
815 } 794 }
816 795
817 env = esrv_get_ob_from_count (pl, to); 796 object *env = esrv_get_ob_from_count (pl, to);
818 if (!env) 797 if (!env)
819 { 798 {
820 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 799 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
821 return; 800 return;
822 } 801 }
… …
824 /* put_object_in_sack presumes that necessary sanity checking 803 /* put_object_in_sack presumes that necessary sanity checking
825 * has already been done (eg, it can be picked up and fits in 804 * has already been done (eg, it can be picked up and fits in
826 * in a sack, so check for those things. We should also check 805 * in a sack, so check for those things. We should also check
827 * an make sure env is in fact a container for that matter. 806 * an make sure env is in fact a container for that matter.
828 */ 807 */
829 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 808 if (env->type == CONTAINER
809 && can_pick (pl, op)
810 && sack_can_hold (pl, env, op, nrof))
830 put_object_in_sack (pl, env, op, nrof); 811 put_object_in_sack (pl, env, op, nrof);
831} 812}
832 813

Diff Legend

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