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.27 by root, Wed Dec 20 01:19:11 2006 UTC vs.
Revision 1.77 by root, Mon Jan 12 03:40:21 2009 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)
217 ;
218
219 pl->contr->socket->send_packet ("delinv 0"); 209 pl->ns->send_packet ("delinv 0");
220 210
221 packet sl; 211 packet sl;
222 sl.printf ("item%d ", pl->contr->socket->itemcmd); 212 sl.printf ("item%d ", pl->ns->itemcmd);
223 213
224 sl << uint32 (0); 214 sl << uint32 (0);
225 215
226 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 216 int start_pos = pl->ns->look_position;
227 esrv_send_face (pl->contr->socket, empty_face->number, 0); 217 bool dirty = false;
228 218
229 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 }
230 { 249 }
231 char buf[80];
232 snprintf (buf, 80, "Apply this to see %d previous items", FLOORBOX_PAGESIZE);
233 250
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 */
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - FLOORBOX_PAGESIZE)) 257 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
235 << uint32 (0) 258 << uint32 (0)
236 << sint32 (-1) 259 << uint32 ((uint32) - 1)
237 << uint32 (empty_face->number) 260 << uint32 (need_face_now (pl, FINGER_DOWN))
238 << data8 (buf) 261 << data8 ("Apply this to see the items below")
239 << uint16 (0) 262 << uint16 (0)
240 << uint8 (0) 263 << uint8 (0)
241 << uint32 (0); 264 << uint32 (0);
242 265
243 if (pl->contr->socket->itemcmd == 2) 266 if (pl->ns->itemcmd == 2)
244 sl << uint16 (0); 267 sl << uint16 (0);
245 }
246 268
247 for (last = NULL; tmp != last; tmp = tmp->below) 269 dirty = true;
248 { 270 }
249 object *head;
250 271
251 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)
252 { 285 {
253 last = tmp->below; /* assumes double floor mode */ 286 pl->ns->send_packet (sl);
254 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 287
255 last = last->below; 288 sl.reset ();
289 sl.printf ("item%d ", pl->ns->itemcmd);
290 sl << uint32 (0);
291
292 dirty = false;
256 } 293 }
257
258 if (LOOK_OBJ (tmp))
259 {
260 if (++start_look < pl->contr->socket->look_position)
261 continue;
262
263 end_look++;
264
265 if (end_look > FLOORBOX_PAGESIZE)
266 {
267 /* What we basically do is make a 'fake' object - when the user applies it,
268 * we notice the special tag the object has, and act accordingly.
269 */
270 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + FLOORBOX_PAGESIZE))
271 << uint32 (0)
272 << uint32 ((uint32) - 1)
273 << uint32 (empty_face->number)
274 << data8 ("Apply this to see next group of items")
275 << uint16 (0)
276 << uint8 (0)
277 << uint32 (0);
278
279 if (pl->contr->socket->itemcmd == 2)
280 sl << uint16 (0);
281
282 break;
283 }
284
285 if (tmp->head)
286 head = tmp->head;
287 else
288 head = tmp;
289
290 add_object_to_socklist (*pl->contr->socket, sl, head);
291 got_one++;
292
293 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
294 {
295 pl->contr->socket->send_packet (sl);
296
297 sl.reset ();
298 sl.printf ("item%d ", pl->contr->socket->itemcmd);
299 sl << uint32 (0);
300 got_one = 0;
301 }
302 }
303 } 294 }
304 295
305 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)
306 pl->contr->socket->send_packet (sl); 314 pl->ns->send_packet (sl);
307
308} 315}
309 316
310/** 317/**
311 * Sends whole inventory. 318 * Sends whole inventory.
312 */ 319 */
313void 320void
314esrv_send_inventory (object *pl, object *op) 321esrv_send_inventory (object *pl, object *op)
315{ 322{
316 object *tmp; 323 if (!pl->contr->ns)//D
324 return;
325
317 int got_one = 0; 326 int got_one = 0;
318 327
319
320 pl->contr->socket->send_packet_printf ("delinv %d", op->count); 328 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
321 329
322 packet sl; 330 packet sl;
323 sl.printf ("item%d ", pl->contr->socket->itemcmd); 331 sl.printf ("item%d ", pl->contr->ns->itemcmd);
324 332
325 sl << uint32 (op->count); 333 sl << uint32 (op->count);
326 334
327 for (tmp = op->inv; tmp; tmp = tmp->below) 335 for (object *tmp = op->inv; tmp; tmp = tmp->below)
328 { 336 {
329 object *head; 337 object *head;
330 338
331 if (tmp->head) 339 if (tmp->head)
332 head = tmp->head; 340 head = tmp->head;
333 else 341 else
334 head = tmp; 342 head = tmp;
335 343
336 if (LOOK_OBJ (head)) 344 if (head->client_visible ())
337 { 345 {
338 add_object_to_socklist (*pl->contr->socket, sl, head); 346 add_object_to_socklist (*pl->contr->ns, sl, head);
339 347
340 got_one++; 348 got_one++;
341 349
342 /* IT is possible for players to accumulate a huge amount of 350 /* IT is possible for players to accumulate a huge amount of
343 * items (especially with some of the bags out there) to 351 * items (especially with some of the bags out there) to
344 * overflow the buffer. IF so, send multiple item commands. 352 * overflow the buffer. IF so, send multiple item commands.
345 */ 353 */
346 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 354 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
347 { 355 {
348 pl->contr->socket->send_packet (sl); 356 pl->contr->ns->send_packet (sl);
349 357
350 sl.reset (); 358 sl.reset ();
351 sl.printf ("item%d ", pl->contr->socket->itemcmd); 359 sl.printf ("item%d ", pl->contr->ns->itemcmd);
352 sl << uint32 (op->count); 360 sl << uint32 (op->count);
353 got_one = 0; 361 got_one = 0;
354 } 362 }
355 } /* If LOOK_OBJ() */ 363 }
356 } 364 }
357 365
358 if (got_one) 366 if (got_one)
359 pl->contr->socket->send_packet (sl); 367 pl->contr->ns->send_packet (sl);
360} 368}
361 369
362/** 370/**
363 * Updates object *op for player *pl. 371 * Updates object *op for player *pl.
364 * 372 *
365 * flags is a list of values to update 373 * flags is a list of values to update
366 * 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
367 * same value both places. 375 * same value both places.
368 */ 376 */
369
370void 377void
371esrv_update_item (int flags, object *pl, object *op) 378esrv_update_item (int flags, object *pl, object *op)
372{ 379{
373 /* 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. */
374 if (op != pl) 381 if (op != pl && !op->client_visible ())
375 {
376 if (!LOOK_OBJ (op))
377 return; 382 return;
378 /* we remove the check for op->env, because in theory, the object
379 * is hopefully in the same place, so the client should preserve
380 * order.
381 */
382 }
383 383
384 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 384 client *ns = pl->contr->ns;
385 { 385 if (!ns)
386 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 386 return;
387 * this is happening - we can set a breakpoint here in the debugger
388 * and track back the call.
389 */
390 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
391 }
392 387
393 packet sl ("upditem"); 388 packet sl ("upditem");
394 389
395 sl << uint8 (flags); 390 sl << uint8 (flags);
396 391
397 if (op->head)
398 op = op->head; 392 op = op->head_ ();
399 393
400 sl << uint32 (op->count); 394 sl << uint32 (op->count);
401 395
402 if (flags & UPD_LOCATION) 396 if (flags & UPD_LOCATION)
403 sl << uint32 (op->env ? op->env->count : 0); 397 sl << uint32 (op->env ? op->env->count : 0);
… …
405 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
406 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
407 401
408 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
409 { 403 {
410 sint32 weight = WEIGHT (op); 404 sint32 weight = op->client_weight ();
411 405
412 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 406 if (op == pl)
413
414 if (pl == op)
415 op->contr->last_weight = weight; 407 ns->last_weight = weight;
408
409 sl << uint32 (weight);
416 } 410 }
417 411
418 if (flags & UPD_FACE) 412 if (flags & UPD_FACE)
419 { 413 {
420 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 414 ns->send_face (op->face, -50);
421 esrv_send_face (pl->contr->socket, op->face->number, 0); 415 ns->flush_fx ();
422
423 sl << uint32 (op->face->number); 416 sl << uint32 (op->face);
424 } 417 }
425 418
426 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
427 { 420 {
428 int len; 421 int len;
429 const char *item_p; 422 const char *item_p;
430 char item_n[MAX_BUF]; 423 char item_n[127 * 2];
431 424
432 if (!op->custom_name) 425 if (!op->custom_name)
433 { 426 {
434 strncpy (item_n, query_base_name (op, 0), 127); 427 len = assign (item_n, query_base_name (op, 0), 127);
435 item_n[127] = 0;
436 len = strlen (item_n);
437 item_p = query_base_name (op, 1); 428 item_p = query_base_name (op, 1);
438 } 429 }
439 else 430 else
440 { 431 {
441 strncpy (item_n, op->custom_name, 127); 432 len = assign (item_n, &op->custom_name, 127);
442 item_n[127] = 0;
443 len = strlen (item_n);
444 item_p = op->custom_name; 433 item_p = &op->custom_name;
445 } 434 }
446 435
447 strncpy (item_n + len + 1, item_p, 127); 436 len += assign (item_n + len, item_p, 127);
448 item_n[254] = 0;
449 len += strlen (item_n + 1 + len) + 1;
450 437
451 sl << data8 (item_n, len); 438 sl << data8 (item_n, len);
452 } 439 }
453 440
454 if (flags & UPD_ANIM) 441 if (flags & UPD_ANIM)
… …
462 { 449 {
463 if (op->anim_speed) 450 if (op->anim_speed)
464 anim_speed = op->anim_speed; 451 anim_speed = op->anim_speed;
465 else 452 else
466 { 453 {
467 if (FABS (op->speed) < 0.001) 454 if (fabs (op->speed) < 0.001)
468 anim_speed = 255; 455 anim_speed = 255;
469 else if (FABS (op->speed) >= 1.0) 456 else if (fabs (op->speed) >= 1.0)
470 anim_speed = 1; 457 anim_speed = 1;
471 else 458 else
472 anim_speed = (int) (1.0 / FABS (op->speed)); 459 anim_speed = (int) (1.0 / fabs (op->speed));
473 } 460 }
474 461
475 if (anim_speed > 255) 462 if (anim_speed > 255)
476 anim_speed = 255; 463 anim_speed = 255;
477 } 464 }
… …
480 } 467 }
481 468
482 if (flags & UPD_NROF) 469 if (flags & UPD_NROF)
483 sl << uint32 (op->nrof); 470 sl << uint32 (op->nrof);
484 471
485 pl->contr->socket->send_packet (sl); 472 pl->contr->ns->send_packet (sl);
486} 473}
487 474
488/** 475/**
489 * Sends item's info to player. 476 * Sends item's info to player.
490 */ 477 */
491void 478void
492esrv_send_item (object *pl, object *op) 479esrv_send_item (object *pl, object *op)
493{ 480{
494 /* If this is not the player object, do some more checks */ 481 if (!pl->contr->ns)
495 if (op != pl)
496 {
497 /* We only send 'visibile' objects to the client */
498 if (!LOOK_OBJ (op))
499 return; 482 return;
500 /* if the item is on the ground, mark that the look needs to 483
501 * be updated. 484 /* We only send 'visible' objects to the client, and sometimes the player */
502 */ 485 if (!op->client_visible () && op->type != PLAYER)
503 if (!op->env)
504 {
505 pl->contr->socket->floorbox_update ();
506 return; 486 return;
507 }
508 }
509 487
510 packet sl; 488 packet sl;
511 489
512 sl.printf ("item%d ", pl->contr->socket->itemcmd); 490 sl.printf ("item%d ", pl->contr->ns->itemcmd);
513 491
514 if (op->head)
515 op = op->head; 492 op = op->head_ ();
516 493
517 sl << uint32 (op->env ? op->env->count : 0); 494 sl << uint32 (op->env ? op->env->count : 0);
518 495
519 add_object_to_socklist (*pl->contr->socket, sl, op); 496 add_object_to_socklist (*pl->contr->ns, sl, op);
520 497
521 pl->contr->socket->send_packet (sl); 498 pl->contr->ns->send_packet (sl);
522 SET_FLAG (op, FLAG_CLIENT_SENT);
523} 499}
524 500
525/** 501/**
526 * Tells the client to delete an item. Uses the item 502 * Tells the client to delete an item.
527 * command with a -1 location.
528 */ 503 */
529
530void 504void
531esrv_del_item (player *pl, int tag) 505esrv_del_item (player *pl, int tag)
532{ 506{
507 if (!pl->ns)
508 return;
509
533 packet sl ("delitem"); 510 packet sl ("delitem");
534 511
535 sl << uint32 (tag); 512 sl << uint32 (tag);
536 513
537 pl->socket->send_packet (sl); 514 pl->ns->send_packet (sl);
538} 515}
539 516
540 517
541/******************************************************************************* 518/*******************************************************************************
542 * 519 *
… …
546 523
547/** 524/**
548 * Takes a player and object count (tag) and returns the actual object 525 * Takes a player and object count (tag) and returns the actual object
549 * pointer, or null if it can't be found. 526 * pointer, or null if it can't be found.
550 */ 527 */
551
552object * 528object *
553esrv_get_ob_from_count (object *pl, tag_t count) 529esrv_get_ob_from_count (object *pl, tag_t count)
554{ 530{
555 object *op, *tmp;
556
557 if (pl->count == count) 531 if (pl->count == count)
558 return pl; 532 return pl;
559 533
560 for (op = pl->inv; op; op = op->below) 534 for (object *op = pl->inv; op; op = op->below)
561 if (op->count == count) 535 if (op->count == count)
562 return op; 536 return op;
563 else if (op->type == CONTAINER && pl->container == op) 537 else if (op->type == CONTAINER && pl->container == op)
564 for (tmp = op->inv; tmp; tmp = tmp->below) 538 for (object *tmp = op->inv; tmp; tmp = tmp->below)
565 if (tmp->count == count) 539 if (tmp->count == count)
566 return tmp; 540 return tmp;
567 541
568 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 542 for (object *op = GET_MAP_OB (pl->map, pl->x, pl->y); op; op = op->above)
569 if (op->head && op->head->count == count) 543 if (op->head && op->head->count == count)
570 return op; 544 return op;
571 else if (op->count == count) 545 else if (op->count == count)
572 return op; 546 return op;
573 else if (op->type == CONTAINER && pl->container == op) 547 else if (op->type == CONTAINER && pl->container == op)
574 for (tmp = op->inv; tmp; tmp = tmp->below) 548 for (object *tmp = op->inv; tmp; tmp = tmp->below)
575 if (tmp->count == count) 549 if (tmp->count == count)
576 return tmp; 550 return tmp;
577 551
552#if 0
553 /* If the high bit is set, player examined a pseudo object. */
554 if (count & 0x80000000)
555 return 0;
556#endif
557
578 return 0; 558 return 0;
579} 559}
580 560
581
582/** Client wants to examine some object. So lets do so. */ 561/** Client wants to examine some object. So lets do so. */
583void 562void
584ExamineCmd (char *buf, int len, player *pl) 563ExamineCmd (char *buf, int len, player *pl)
585{ 564{
586 tag_t tag = atoi (buf); 565 tag_t tag = atoi (buf);
587
588 /* If the high bit is set, player examined a pseudo object. */
589 if (tag & 0x80000000)
590 return;
591
592 object *op = esrv_get_ob_from_count (pl->ob, tag);
593
594 if (!op)
595 {
596 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
597 return;
598 }
599
600 examine (pl->ob, op);
601}
602
603/** Client wants to apply some object. Lets do so. */
604void
605ApplyCmd (char *buf, int len, player *pl)
606{
607 tag_t tag = atoi (buf);
608
609 /* sort of a hack, but if the player saves and the player then manually
610 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
611 */
612 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
613 return;
614 566
615 /* If the high bit is set, player applied a pseudo object. */ 567 /* If the high bit is set, player applied a pseudo object. */
616 if (tag & 0x80000000) 568 if (tag & 0x80000000)
617 { 569 {
618 pl->socket->look_position = tag & 0x7fffffff; 570 pl->ns->look_position = tag & 0x7fffffff;
619 pl->socket->floorbox_update (); 571 pl->ns->floorbox_update ();
572 return;
573 }
574
575 object *op = esrv_get_ob_from_count (pl->ob, tag);
576
577 if (!op)
578 {
579 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
580 return;
581 }
582
583 examine (pl->ob, op);
584}
585
586/** Client wants to examine some object. So lets do so. */
587void
588ExCmd (char *buf, int len, player *pl)
589{
590 tag_t tag = atoi (buf);
591
592 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
593 {
594 std::string s = op->describe (pl->ob);
595
596 packet sl ("ex");
597 sl << ber32 (tag)
598 << data (*pl->expand_cfpod (s.c_str ()));
599
600 pl->ns->send_packet (sl);
601 }
602}
603
604/** Client wants to apply some object. Lets do so. */
605void
606ApplyCmd (char *buf, int len, player *pl)
607{
608 tag_t tag = atoi (buf);
609
610 /* If the high bit is set, player applied a pseudo object. */
611 if (tag & 0x80000000)
612 {
613 pl->ns->look_position = tag & 0x7fffffff;
614 pl->ns->floorbox_update ();
620 return; 615 return;
621 } 616 }
622 617
623 object *op = esrv_get_ob_from_count (pl->ob, tag); 618 object *op = esrv_get_ob_from_count (pl->ob, tag);
624 619
… …
639 tag_t tag = net_uint32 ((uint8 *)data + 1); 634 tag_t tag = net_uint32 ((uint8 *)data + 1);
640 object *op = esrv_get_ob_from_count (pl->ob, tag); 635 object *op = esrv_get_ob_from_count (pl->ob, tag);
641 636
642 if (!op) 637 if (!op)
643 { 638 {
644 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 639 pl->failmsg ("Could not find object to lock/unlock");
645 return; 640 return;
646 } 641 }
647 642
648 if (!flag) 643 if (!flag)
649 CLEAR_FLAG (op, FLAG_INV_LOCKED); 644 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
660 tag_t tag = net_uint32 ((uint8 *)data); 655 tag_t tag = net_uint32 ((uint8 *)data);
661 object *op = esrv_get_ob_from_count (pl->ob, tag); 656 object *op = esrv_get_ob_from_count (pl->ob, tag);
662 657
663 if (!op) 658 if (!op)
664 { 659 {
665 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 660 pl->failmsg ("Could not find object to mark");
666 return; 661 return;
667 } 662 }
668 663
669 pl->mark = op; 664 pl->mark = op;
670 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 665 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
671} 666}
672 667
673/** 668/**
674 * look_at prints items on the specified square. 669 * look_at prints items on the specified square.
675 * 670 *
676 * [ removed EARTHWALL check and added check for containers inventory. 671 * [ removed EARTHWALL check and added check for containers inventory.
677 * Tero.Haatanen@lut.fi ] 672 * Tero.Haatanen@lut.fi ]
678 */ 673 */
679void 674static void
680look_at (object *op, int dx, int dy) 675look_at (player *pl, int dx, int dy)
681{ 676{
682 object *tmp; 677 dynbuf_text buf;
683 int flag = 0; 678 object *ob = pl->ob;
684 sint16 x, y;
685 maptile *m;
686 679
687 x = op->x + dx; 680 if (!pl->observe->map)
688 y = op->y + dy;
689
690 if (out_of_map (op->map, x, y))
691 return; 681 return;
692 682
693 m = get_map_from_coord (op->map, &x, &y); 683 bool wiz = ob->flag [FLAG_WIZ] || ob->flag [FLAG_WIZLOOK];
694 if (!m) 684
685 mapxy pos (pl->observe);
686 pos.move (dx, dy);
687
688 if (wiz)
689 {
690 if (pos.normalise ())
691 {
692 mapspace &ms = *pos;
693 ms.update ();
694
695 buf.printf (" map: %s%+d%+d (%+d%+d)\n"
696 " smell %u/%u; flags %x; light %d; block %x; slow %x; on %x; off %x; volume %lld\n\n",
697 &pos.m->path, pos.x, pos.y, dx, dy,
698 (unsigned int)ms.smell, (unsigned int)mapspace::smellcount, ms.flags (), ms.light,
699 ms.move_block, ms.move_slow, ms.move_on, ms.move_off, (long long)ms.volume ()
700 );
701 }
702 else
703 buf << "off-map\n\n";
704 }
705
706 int darkness = pl->blocked_los (dx, dy);
707
708 if (darkness == LOS_BLOCKED)
709 buf << "You cannot see that place from your position. H<Something is in between or it is too far away.>";
710 else if (darkness == LOS_MAX)
711 buf << "That place is too dark to see anything. H<Move nearer or find better lighting.>";
712 else
713 {
714 if (pos.normalise ())
715 for (object *tmp = pos->top; tmp; tmp = tmp->below)
716 {
717 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
718 continue;
719
720 if (wiz)
721 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
722 else
723 buf.printf (" - %s.\n", query_name (tmp));
724
725 object *head = tmp->head_ ();
726
727 if (head->inv)
728 if ((head->type != CONTAINER && head->type != FLESH)
729 || QUERY_FLAG (ob, FLAG_WIZ))
730 buf << head->query_inventory (ob, " ");
731
732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !wiz) /* don't continue under the floor */
733 break;
734 }
735 }
736
737 if (buf.empty ())
738 buf << "You see nothing there.";
739
740 pl->infobox (MSG_CHANNEL ("lookat"), buf);
741}
742
743/** Client wants to look at some object. Lets do so. */
744void
745LookAt (char *buf, int len, player *pl)
746{
747 char *cp;
748
749 int dx = atoi (buf);
750 if (!(cp = strchr (buf, ' ')))
695 return; 751 return;
696 752
697 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
698
699 for (; tmp != NULL; tmp = tmp->below)
700 {
701 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
702 continue;
703
704 if (!flag)
705 {
706 if (dx || dy)
707 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
708 else
709 {
710 clear_win_info (op);
711 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
712 }
713 flag = 1;
714 }
715
716 if (QUERY_FLAG (op, FLAG_WIZ))
717 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
718 else
719 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
720
721 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
722 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
723 inventory (op, tmp->head == NULL ? tmp : tmp->head);
724
725 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
726 break;
727 }
728
729 if (!flag)
730 {
731 if (dx || dy)
732 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
733 else
734 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
735 }
736}
737
738
739
740/** Client wants to look at some object. Lets do so. */
741void
742LookAt (char *buf, int len, player *pl)
743{
744 int dx, dy;
745 char *cp;
746
747 dx = atoi (buf);
748 if (!(cp = strchr (buf, ' ')))
749 {
750 return;
751 }
752 dy = atoi (cp); 753 int dy = atoi (cp);
753 754
754 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2)
755 return;
756
757 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2])
758 return;
759
760 look_at (pl->ob, dx, dy); 755 look_at (pl, dx, dy);
761} 756}
762 757
763/** Move an object to a new location */ 758/** Move an object to a new location */
764void 759void
765esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 760esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
766{ 761{
767 object *op, *env;
768
769 op = esrv_get_ob_from_count (pl, tag); 762 object *op = esrv_get_ob_from_count (pl, tag);
770 if (!op) 763 if (!op)
771 { 764 {
772 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 765 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
773 return; 766 return;
774 } 767 }
… …
781 /* If it is an active container, then we should drop all objects 774 /* If it is an active container, then we should drop all objects
782 * in the container and not the container itself. 775 * in the container and not the container itself.
783 */ 776 */
784 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 777 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
785 { 778 {
786 object *current, *next; 779 int cnt = MAX_ITEM_PER_DROP;
787 780
788 for (current = op->inv; current != NULL; current = next) 781 for (object *current = op->inv; current && cnt--; )
789 { 782 {
790 next = current->below; 783 object *next = current->below;
791 drop_object (pl, current, 0); 784 drop_object (pl, current, 0);
785 current = next;
792 } 786 }
793 787
794 esrv_update_item (UPD_WEIGHT, pl, op); 788 if (cnt <= 0)
789 op->failmsg ("Only dropped some items, can't drop that many items at once.");
795 } 790 }
796 else 791 else
797 drop_object (pl, op, nrof); 792 drop_object (pl, op, nrof);
798 793
799 return; 794 return;
… …
807 pl->contr->count = nrof; 802 pl->contr->count = nrof;
808 pick_up (pl, op); 803 pick_up (pl, op);
809 return; 804 return;
810 } 805 }
811 806
812 env = esrv_get_ob_from_count (pl, to); 807 object *env = esrv_get_ob_from_count (pl, to);
813 if (!env) 808 if (!env)
814 { 809 {
815 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 810 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
816 return; 811 return;
817 } 812 }
… …
819 /* put_object_in_sack presumes that necessary sanity checking 814 /* put_object_in_sack presumes that necessary sanity checking
820 * has already been done (eg, it can be picked up and fits in 815 * has already been done (eg, it can be picked up and fits in
821 * in a sack, so check for those things. We should also check 816 * in a sack, so check for those things. We should also check
822 * an make sure env is in fact a container for that matter. 817 * an make sure env is in fact a container for that matter.
823 */ 818 */
824 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 819 if (env->type == CONTAINER
820 && can_pick (pl, op)
821 && sack_can_hold (pl, env, op, nrof))
825 put_object_in_sack (pl, env, op, nrof); 822 put_object_in_sack (pl, env, op, nrof);
826} 823}
827 824

Diff Legend

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