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.23 by root, Fri Dec 15 19:59:20 2006 UTC vs.
Revision 1.73 by root, Mon Dec 8 15:40:13 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
36#include <global.h> 35#include <global.h>
37#include <object.h> /* LOOK_OBJ */ 36#include <object.h>
38#include <sproto.h> 37#include <sproto.h>
39 38
40/** 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 */
41#define MAXITEMLEN 300 40#define MAXITEMLEN 300
42 41
… …
46 * 45 *
47 ******************************************************************************/ 46 ******************************************************************************/
48 47
49/** 48/**
50 * This is a similar to query_name, but returns flags 49 * This is a similar to query_name, but returns flags
51 * to be sended to client. 50 * to be sent to client.
52 */ 51 */
53unsigned int 52unsigned int
54query_flags (object *op) 53query_flags (object *op)
55{ 54{
56 unsigned int flags = 0; 55 unsigned int flags = 0;
57 56
58 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
59 {
60 switch (op->type) 58 switch (op->type)
61 { 59 {
62 case BOW: 60 case BOW:
63 case WAND: 61 case WAND:
64 case ROD: 62 case ROD:
65 case HORN: 63 case HORN:
66 flags = a_readied; 64 flags = a_readied;
67 break; 65 break;
68 case WEAPON: 66 case WEAPON:
69 flags = a_wielded; 67 flags = a_wielded;
70 break; 68 break;
71 case SKILL: 69 case SKILL:
72 case ARMOUR: 70 case ARMOUR:
73 case HELMET: 71 case HELMET:
74 case SHIELD: 72 case SHIELD:
75 case RING: 73 case RING:
76 case BOOTS: 74 case BOOTS:
77 case GLOVES: 75 case GLOVES:
78 case AMULET: 76 case AMULET:
79 case GIRDLE: 77 case GIRDLE:
80 case BRACERS: 78 case BRACERS:
81 case CLOAK: 79 case CLOAK:
82 flags = a_worn; 80 flags = a_worn;
83 break; 81 break;
84 case CONTAINER: 82 case CONTAINER:
85 flags = a_active; 83 flags = a_active;
86 break; 84 break;
87 default: 85 default:
88 flags = a_applied; 86 flags = a_applied;
89 break; 87 break;
90 } 88 }
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))
96 { 94 {
97 if (QUERY_FLAG (op, FLAG_DAMNED)) 95 if (QUERY_FLAG (op, FLAG_DAMNED))
98 flags |= F_DAMNED; 96 flags |= F_DAMNED;
99 else if (QUERY_FLAG (op, FLAG_CURSED)) 97 else if (QUERY_FLAG (op, FLAG_CURSED))
100 flags |= F_CURSED; 98 flags |= F_CURSED;
101 } 99 }
100
102 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED)) 101 if (QUERY_FLAG (op, FLAG_KNOWN_MAGICAL) && !QUERY_FLAG (op, FLAG_IDENTIFIED))
103 flags |= F_MAGIC; 102 flags |= F_MAGIC;
104 if (QUERY_FLAG (op, FLAG_UNPAID)) 103 if (QUERY_FLAG (op, FLAG_UNPAID))
105 flags |= F_UNPAID; 104 flags |= F_UNPAID;
106 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 105 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
114 * animation of face to the client. 113 * animation of face to the client.
115 */ 114 */
116static void 115static void
117add_object_to_socklist (client &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
118{ 117{
119 int flags, len, anim_speed;
120 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
121 const char *item_p; 119 const char *item_p;
122 120
123 flags = query_flags (head); 121 int flags = query_flags (head);
124 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
125 flags |= F_NOPICK; 123 flags |= F_NOPICK;
126 124
127 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 125 ns.send_face (head->face, -50);
128 esrv_send_face (&ns, head->face->number, 0); 126 ns.flush_fx ();
129 127
130 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])
131 esrv_send_animation (&ns, head->animation_id); 129 ns.send_animation (head->animation_id);
132 130
133 sl << uint32 (head->count) 131 sl << uint32 (head->count)
134 << uint32 (flags) 132 << uint32 (flags)
135 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
136 << uint32 (head->face->number); 134 << uint32 (head->face);
135
136 int len;
137 137
138 if (!head->custom_name) 138 if (!head->custom_name)
139 { 139 {
140 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
141 item_n[127] = 0; 141 item_n[127] = 0;
… …
155 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
156 156
157 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
158 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
159 159
160 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
161 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
162 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
163 if (head->anim_speed)
164 anim_speed = head->anim_speed;
165 else
166 {
167 if (FABS (head->speed) < 0.001)
168 anim_speed = 255;
169 else if (FABS (head->speed) >= 1.0)
170 anim_speed = 1;
171 else
172 anim_speed = (int) (1.0 / FABS (head->speed));
173 }
174
175 if (anim_speed > 255)
176 anim_speed = 255;
177 }
178 163
179 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
180 << uint32 (head->nrof); 165 << uint32 (head->nrof);
181 166
182 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
183 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
184
185 SET_FLAG (head, FLAG_CLIENT_SENT);
186} 169}
187 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"
188 184
189/** 185/**
190 * Send the look window. Don't need to do animations here 186 * Send the look window. Don't need to do animations here
191 * 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
192 * because object ordering would otherwise be inconsistent 188 * because object ordering would otherwise be inconsistent.
193 */ 189 */
194
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 } /* If LOOK_OBJ() */
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
364} 368}
365 369
366/** 370/**
367 * Updates object *op for player *pl. 371 * Updates object *op for player *pl.
368 * 372 *
369 * flags is a list of values to update 373 * flags is a list of values to update
370 * 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
371 * same value both places. 375 * same value both places.
372 */ 376 */
373
374void 377void
375esrv_update_item (int flags, object *pl, object *op) 378esrv_update_item (int flags, object *pl, object *op)
376{ 379{
377 /* 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. */
378 if (op != pl) 381 if (op != pl && !op->client_visible ())
379 {
380 if (!LOOK_OBJ (op))
381 return; 382 return;
382 /* we remove the check for op->env, because in theory, the object
383 * is hopefully in the same place, so the client should preserve
384 * order.
385 */
386 }
387 383
388 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 384 client *ns = pl->contr->ns;
389 { 385 if (!ns)
390 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 386 return;
391 * this is happening - we can set a breakpoint here in the debugger
392 * and track back the call.
393 */
394 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count);
395 }
396 387
397 packet sl; 388 packet sl ("upditem");
398 389
399 sl << "upditem "
400 << uint8 (flags); 390 sl << uint8 (flags);
401 391
402 if (op->head)
403 op = op->head; 392 op = op->head_ ();
404 393
405 sl << uint32 (op->count); 394 sl << uint32 (op->count);
406 395
407 if (flags & UPD_LOCATION) 396 if (flags & UPD_LOCATION)
408 sl << uint32 (op->env ? op->env->count : 0); 397 sl << uint32 (op->env ? op->env->count : 0);
… …
410 if (flags & UPD_FLAGS) 399 if (flags & UPD_FLAGS)
411 sl << uint32 (query_flags (op)); 400 sl << uint32 (query_flags (op));
412 401
413 if (flags & UPD_WEIGHT) 402 if (flags & UPD_WEIGHT)
414 { 403 {
415 sint32 weight = WEIGHT (op); 404 sint32 weight = op->client_weight ();
416 405
417 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight); 406 if (op == pl)
418
419 if (pl == op)
420 op->contr->last_weight = weight; 407 ns->last_weight = weight;
408
409 sl << uint32 (weight);
421 } 410 }
422 411
423 if (flags & UPD_FACE) 412 if (flags & UPD_FACE)
424 { 413 {
425 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 414 ns->send_face (op->face, -50);
426 esrv_send_face (pl->contr->socket, op->face->number, 0); 415 ns->flush_fx ();
427
428 sl << uint32 (op->face->number); 416 sl << uint32 (op->face);
429 } 417 }
430 418
431 if (flags & UPD_NAME) 419 if (flags & UPD_NAME)
432 { 420 {
433 int len; 421 int len;
… …
467 { 455 {
468 if (op->anim_speed) 456 if (op->anim_speed)
469 anim_speed = op->anim_speed; 457 anim_speed = op->anim_speed;
470 else 458 else
471 { 459 {
472 if (FABS (op->speed) < 0.001) 460 if (fabs (op->speed) < 0.001)
473 anim_speed = 255; 461 anim_speed = 255;
474 else if (FABS (op->speed) >= 1.0) 462 else if (fabs (op->speed) >= 1.0)
475 anim_speed = 1; 463 anim_speed = 1;
476 else 464 else
477 anim_speed = (int) (1.0 / FABS (op->speed)); 465 anim_speed = (int) (1.0 / fabs (op->speed));
478 } 466 }
479 467
480 if (anim_speed > 255) 468 if (anim_speed > 255)
481 anim_speed = 255; 469 anim_speed = 255;
482 } 470 }
… …
485 } 473 }
486 474
487 if (flags & UPD_NROF) 475 if (flags & UPD_NROF)
488 sl << uint32 (op->nrof); 476 sl << uint32 (op->nrof);
489 477
490 pl->contr->socket->send_packet (sl); 478 pl->contr->ns->send_packet (sl);
491} 479}
492 480
493/** 481/**
494 * Sends item's info to player. 482 * Sends item's info to player.
495 */ 483 */
496void 484void
497esrv_send_item (object *pl, object *op) 485esrv_send_item (object *pl, object *op)
498{ 486{
499 /* If this is not the player object, do some more checks */ 487 if (!pl->contr->ns)
500 if (op != pl)
501 {
502 /* We only send 'visibile' objects to the client */
503 if (!LOOK_OBJ (op))
504 return; 488 return;
505 /* if the item is on the ground, mark that the look needs to 489
506 * be updated. 490 /* We only send 'visible' objects to the client, and sometimes the player */
507 */ 491 if (!op->client_visible () && op->type != PLAYER)
508 if (!op->env)
509 {
510 pl->contr->socket->update_look = 1;
511 return; 492 return;
512 }
513 }
514 493
515 packet sl; 494 packet sl;
516 495
517 sl.printf ("item%d ", pl->contr->socket->itemcmd); 496 sl.printf ("item%d ", pl->contr->ns->itemcmd);
518 497
519 if (op->head)
520 op = op->head; 498 op = op->head_ ();
521 499
522 sl << uint32 (op->env ? op->env->count : 0); 500 sl << uint32 (op->env ? op->env->count : 0);
523 501
524 add_object_to_socklist (*pl->contr->socket, sl, op); 502 add_object_to_socklist (*pl->contr->ns, sl, op);
525 503
526 pl->contr->socket->send_packet (sl); 504 pl->contr->ns->send_packet (sl);
527 SET_FLAG (op, FLAG_CLIENT_SENT);
528
529} 505}
530 506
531/** 507/**
532 * Tells the client to delete an item. Uses the item 508 * Tells the client to delete an item.
533 * command with a -1 location.
534 */ 509 */
535
536void 510void
537esrv_del_item (player *pl, int tag) 511esrv_del_item (player *pl, int tag)
538{ 512{
539 packet sl; 513 if (!pl->ns)
514 return;
540 515
541 sl << "delitem " 516 packet sl ("delitem");
517
542 << uint32 (tag); 518 sl << uint32 (tag);
543 519
544 pl->socket->send_packet (sl); 520 pl->ns->send_packet (sl);
545} 521}
546 522
547 523
548/******************************************************************************* 524/*******************************************************************************
549 * 525 *
… …
553 529
554/** 530/**
555 * 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
556 * pointer, or null if it can't be found. 532 * pointer, or null if it can't be found.
557 */ 533 */
558
559object * 534object *
560esrv_get_ob_from_count (object *pl, tag_t count) 535esrv_get_ob_from_count (object *pl, tag_t count)
561{ 536{
562 object *op, *tmp;
563
564 if (pl->count == count) 537 if (pl->count == count)
565 return pl; 538 return pl;
566 539
567 for (op = pl->inv; op; op = op->below) 540 for (object *op = pl->inv; op; op = op->below)
568 if (op->count == count) 541 if (op->count == count)
569 return op; 542 return op;
570 else if (op->type == CONTAINER && pl->container == op) 543 else if (op->type == CONTAINER && pl->container == op)
571 for (tmp = op->inv; tmp; tmp = tmp->below) 544 for (object *tmp = op->inv; tmp; tmp = tmp->below)
572 if (tmp->count == count) 545 if (tmp->count == count)
573 return tmp; 546 return tmp;
574 547
575 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)
576 if (op->head != NULL && op->head->count == count) 549 if (op->head && op->head->count == count)
577 return op; 550 return op;
578 else if (op->count == count) 551 else if (op->count == count)
579 return op; 552 return op;
580 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container == op)
581 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
582 if (tmp->count == count) 555 if (tmp->count == count)
583 return tmp; 556 return tmp;
584 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
585 return NULL; 564 return 0;
586} 565}
587
588 566
589/** Client wants to examine some object. So lets do so. */ 567/** Client wants to examine some object. So lets do so. */
590void 568void
591ExamineCmd (char *buf, int len, player *pl) 569ExamineCmd (char *buf, int len, player *pl)
592{ 570{
593 tag_t tag = atoi (buf); 571 tag_t tag = atoi (buf);
594
595 /* If the high bit is set, player examined a pseudo object. */
596 if (tag & 0x80000000)
597 return;
598
599 object *op = esrv_get_ob_from_count (pl->ob, tag);
600
601 if (!op)
602 {
603 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
604 return;
605 }
606
607 examine (pl->ob, op);
608}
609
610/** Client wants to apply some object. Lets do so. */
611void
612ApplyCmd (char *buf, int len, player *pl)
613{
614 tag_t tag = atoi (buf);
615
616 /* sort of a hack, but if the player saves and the player then manually
617 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
618 */
619 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
620 return;
621 572
622 /* If the high bit is set, player applied a pseudo object. */ 573 /* If the high bit is set, player applied a pseudo object. */
623 if (tag & 0x80000000) 574 if (tag & 0x80000000)
624 { 575 {
625 pl->socket->look_position = tag & 0x7fffffff; 576 pl->ns->look_position = tag & 0x7fffffff;
626 pl->socket->update_look = 1; 577 pl->ns->floorbox_update ();
627 return; 578 return;
628 } 579 }
629 580
630 object *op = esrv_get_ob_from_count (pl->ob, tag); 581 object *op = esrv_get_ob_from_count (pl->ob, tag);
631 582
632 if (!op) 583 if (!op)
633 { 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 packet sl ("ex");
603 sl << ber32 (tag)
604 << data (*pl->expand_cfpod (s.c_str ()));
605
606 pl->ns->send_packet (sl);
607 }
608}
609
610/** Client wants to apply some object. Lets do so. */
611void
612ApplyCmd (char *buf, int len, player *pl)
613{
614 tag_t tag = atoi (buf);
615
616 /* If the high bit is set, player applied a pseudo object. */
617 if (tag & 0x80000000)
618 {
619 pl->ns->look_position = tag & 0x7fffffff;
620 pl->ns->floorbox_update ();
621 return;
622 }
623
624 object *op = esrv_get_ob_from_count (pl->ob, tag);
625
626 if (!op)
627 {
634 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 628 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
635 return; 629 return;
636 } 630 }
637 631
638 player_apply (pl->ob, op, 0, 0); 632 player_apply (pl->ob, op, 0, 0);
639} 633}
640 634
641/** Client wants to apply some object. Lets do so. */ 635/** Client wants to lock some object. Lets do so. */
642void 636void
643LockItem (char *data, int len, player *pl) 637LockItem (char *data, int len, player *pl)
644{ 638{
645 int flag = data[0]; 639 int flag = data[0];
646 tag_t tag = net_uint32 ((uint8 *)data + 1); 640 tag_t tag = net_uint32 ((uint8 *)data + 1);
647 object *op = esrv_get_ob_from_count (pl->ob, tag); 641 object *op = esrv_get_ob_from_count (pl->ob, tag);
648 642
649 if (!op) 643 if (!op)
650 { 644 {
651 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 645 pl->failmsg ("Could not find object to lock/unlock");
652 return; 646 return;
653 } 647 }
654 648
655 if (!flag) 649 if (!flag)
656 CLEAR_FLAG (op, FLAG_INV_LOCKED); 650 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
658 SET_FLAG (op, FLAG_INV_LOCKED); 652 SET_FLAG (op, FLAG_INV_LOCKED);
659 653
660 esrv_update_item (UPD_FLAGS, pl->ob, op); 654 esrv_update_item (UPD_FLAGS, pl->ob, op);
661} 655}
662 656
663/** Client wants to apply some object. Lets do so. */ 657/** Client wants to mark some object. Lets do so. */
664void 658void
665MarkItem (char *data, int len, player *pl) 659MarkItem (char *data, int len, player *pl)
666{ 660{
667 tag_t tag = net_uint32 ((uint8 *)data); 661 tag_t tag = net_uint32 ((uint8 *)data);
668 object *op = esrv_get_ob_from_count (pl->ob, tag); 662 object *op = esrv_get_ob_from_count (pl->ob, tag);
669 663
670 if (!op) 664 if (!op)
671 { 665 {
672 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 666 pl->failmsg ("Could not find object to mark");
673 return; 667 return;
674 } 668 }
675 669
676 pl->mark = op; 670 pl->mark = op;
677 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 671 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
678} 672}
679 673
680/** 674/**
681 * look_at prints items on the specified square. 675 * look_at prints items on the specified square.
682 * 676 *
683 * [ removed EARTHWALL check and added check for containers inventory. 677 * [ removed EARTHWALL check and added check for containers inventory.
684 * Tero.Haatanen@lut.fi ] 678 * Tero.Haatanen@lut.fi ]
685 */ 679 */
686void 680static void
687look_at (object *op, int dx, int dy) 681look_at (player *pl, int dx, int dy)
688{ 682{
689 object *tmp; 683 dynbuf_text buf;
690 int flag = 0; 684 object *ob = pl->ob;
691 sint16 x, y;
692 maptile *m;
693 685
694 x = op->x + dx; 686 if (!pl->observe->map)
695 y = op->y + dy;
696
697 if (out_of_map (op->map, x, y))
698 return; 687 return;
699 688
700 m = get_map_from_coord (op->map, &x, &y); 689 mapxy pos (pl->observe);
701 if (!m) 690 pos.move (dx, dy);
691
692 if (pos.normalise ())
693 for (object *tmp = pos->top; tmp; tmp = tmp->below)
694 {
695 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
696 continue;
697
698 if (QUERY_FLAG (ob, FLAG_WIZ))
699 buf.printf (" - %s (%d).\n", query_name (tmp), tmp->count);
700 else
701 buf.printf (" - %s.\n", query_name (tmp));
702
703 object *head = tmp->head_ ();
704
705 if (head->inv)
706 if ((head->type != CONTAINER && head->type != FLESH)
707 || QUERY_FLAG (ob, FLAG_WIZ))
708 buf << head->query_inventory (ob, " ");
709
710 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
711 break;
712 }
713
714 if (buf.empty ())
715 pl->failmsg ("You see nothing there.");
716 else
717 pl->infobox (MSG_CHANNEL ("lookat"), buf);
718}
719
720/** Client wants to look at some object. Lets do so. */
721void
722LookAt (char *buf, int len, player *pl)
723{
724 char *cp;
725
726 int dx = atoi (buf);
727 if (!(cp = strchr (buf, ' ')))
702 return; 728 return;
703 729
704 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
705
706 for (; tmp != NULL; tmp = tmp->below)
707 {
708 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
709 continue;
710
711 if (!flag)
712 {
713 if (dx || dy)
714 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
715 else
716 {
717 clear_win_info (op);
718 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
719 }
720 flag = 1;
721 }
722
723 if (QUERY_FLAG (op, FLAG_WIZ))
724 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
725 else
726 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
727
728 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
729 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
730 inventory (op, tmp->head == NULL ? tmp : tmp->head);
731
732 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
733 break;
734 }
735
736 if (!flag)
737 {
738 if (dx || dy)
739 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
740 else
741 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
742 }
743}
744
745
746
747/** Client wants to look at some object. Lets do so. */
748void
749LookAt (char *buf, int len, player *pl)
750{
751 int dx, dy;
752 char *cp;
753
754 dx = atoi (buf);
755 if (!(cp = strchr (buf, ' ')))
756 {
757 return;
758 }
759 dy = atoi (cp); 730 int dy = atoi (cp);
760 731
761 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 732 if (player *opl = pl->observe->contr)
733 if (client *ns = opl->ns)
734 {
735 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
762 return; 736 return;
763 737
764 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 738 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2] < LOS_MAX)
765 return; 739 return;
740 }
766 741
767 look_at (pl->ob, dx, dy); 742 look_at (pl, dx, dy);
768} 743}
769 744
770/** Move an object to a new location */ 745/** Move an object to a new location */
771void 746void
772esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 747esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
773{ 748{
774 object *op, *env;
775
776 op = esrv_get_ob_from_count (pl, tag); 749 object *op = esrv_get_ob_from_count (pl, tag);
777 if (!op) 750 if (!op)
778 { 751 {
779 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 752 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
780 return; 753 return;
781 } 754 }
… …
788 /* If it is an active container, then we should drop all objects 761 /* If it is an active container, then we should drop all objects
789 * in the container and not the container itself. 762 * in the container and not the container itself.
790 */ 763 */
791 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 764 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
792 { 765 {
793 object *current, *next; 766 int cnt = MAX_ITEM_PER_DROP;
794 767
795 for (current = op->inv; current != NULL; current = next) 768 for (object *current = op->inv; current && cnt--; )
796 { 769 {
797 next = current->below; 770 object *next = current->below;
798 drop_object (pl, current, 0); 771 drop_object (pl, current, 0);
772 current = next;
799 } 773 }
800 774
801 esrv_update_item (UPD_WEIGHT, pl, op); 775 if (cnt <= 0)
776 op->failmsg ("Only dropped some items, can't drop that many items at once.");
802 } 777 }
803 else 778 else
804 {
805 drop_object (pl, op, nrof); 779 drop_object (pl, op, nrof);
806 } 780
807 return; 781 return;
808 } 782 }
809 else if (to == pl->count) 783 else if (to == pl->count)
810 { /* pick it up to the inventory */ 784 { /* pick it up to the inventory */
811 /* return if player has already picked it up */ 785 /* return if player has already picked it up */
… …
815 pl->contr->count = nrof; 789 pl->contr->count = nrof;
816 pick_up (pl, op); 790 pick_up (pl, op);
817 return; 791 return;
818 } 792 }
819 793
820 env = esrv_get_ob_from_count (pl, to); 794 object *env = esrv_get_ob_from_count (pl, to);
821 if (!env) 795 if (!env)
822 { 796 {
823 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 797 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
824 return; 798 return;
825 } 799 }
… …
827 /* put_object_in_sack presumes that necessary sanity checking 801 /* put_object_in_sack presumes that necessary sanity checking
828 * has already been done (eg, it can be picked up and fits in 802 * has already been done (eg, it can be picked up and fits in
829 * in a sack, so check for those things. We should also check 803 * in a sack, so check for those things. We should also check
830 * an make sure env is in fact a container for that matter. 804 * an make sure env is in fact a container for that matter.
831 */ 805 */
832 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 806 if (env->type == CONTAINER
833 { 807 && can_pick (pl, op)
808 && sack_can_hold (pl, env, op, nrof))
834 put_object_in_sack (pl, env, op, nrof); 809 put_object_in_sack (pl, env, op, nrof);
835 }
836} 810}
837 811

Diff Legend

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