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.69 by root, Mon Jul 14 23:47:06 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 169
185 SET_FLAG (head, FLAG_CLIENT_SENT); 170 SET_FLAG (head, FLAG_CLIENT_SENT);
186} 171}
187 172
173static faceidx
174need_face_now (player *pl, const char *name)
175{
176 faceidx face = face_find (name, empty_face);
177
178 pl->ns->send_face (face, -50);
179 pl->ns->flush_fx ();
180
181 return face;
182}
183
184#define FINGER_UP "finger_up.x11"
185#define FINGER_DOWN "finger_down.x11"
188 186
189/** 187/**
190 * Send the look window. Don't need to do animations here 188 * 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 189 * This sends all the faces to the client, not just updates. This is
192 * because object ordering would otherwise be inconsistent 190 * because object ordering would otherwise be inconsistent.
193 */ 191 */
194
195void 192void
196esrv_draw_look (object *pl) 193esrv_draw_look (player *pl)
197{ 194{
198 object *tmp, *last; 195 object *ob = pl->ob;
199 int got_one = 0, start_look = 0, end_look = 0;
200 char buf[MAX_BUF];
201 196
202 if (!pl->contr->socket->update_look) 197 if (!pl->ns->update_look)
203 { 198 {
204 LOG (llevDebug, "esrv_draw_look called when update_look was not set\n"); 199 LOG (llevDebug, "esrv_draw_look called when update_look was not set (player %s)\n", &ob->name);
205 return; 200 return;
206 } 201 }
207 else 202
208 pl->contr->socket->update_look = 0; 203 pl->ns->update_look = 0;
209 204
210 if (QUERY_FLAG (pl, FLAG_REMOVED) 205 if (QUERY_FLAG (ob, FLAG_REMOVED)
211 || !pl->map 206 || !ob->map
212 || pl->map->in_memory != MAP_IN_MEMORY 207 || ob->map->in_memory != MAP_ACTIVE
213 || out_of_map (pl->map, pl->x, pl->y)) 208 || out_of_map (ob->map, ob->x, ob->y))
214 return; 209 return;
215 210
216 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 211 pl->ns->send_packet ("delinv 0");
217 ;
218 212
219 packet sl; 213 packet sl;
220
221 pl->contr->socket->send_packet ("delinv 0");
222
223 sl.printf ("item%d ", pl->contr->socket->itemcmd); 214 sl.printf ("item%d ", pl->ns->itemcmd);
224 215
225 sl << uint32 (0); 216 sl << uint32 (0);
226 217
227 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 218 int start_pos = pl->ns->look_position;
228 esrv_send_face (pl->contr->socket, empty_face->number, 0); 219 bool dirty = false;
229 220
230 if (pl->contr->socket->look_position) 221 mapspace &ms = ob->ms ();
222
223 // manage a ring buffer of the "last FLOORBOX_PAGESIZE" items and
224 // start from the top
225 object *items [FLOORBOX_PAGESIZE];
226 int item_idx = 0, item_cnt = 0;
227 int pos = 0;
228
229 // find our items by walking down
230 object *item = ms.top;
231
232 for (; item && item_cnt < FLOORBOX_PAGESIZE; item = item->below)
233 {
234 if (!item->client_visible ())
235 continue;
236
237 if (++pos < start_pos)
238 continue;
239
240 // record item
241 items [item_idx] = item; item_idx = item_idx < FLOORBOX_PAGESIZE ? item_idx + 1 : 0;
242 item_cnt++;
243
244 // stop at first floor
245 if (item->flag [FLAG_IS_FLOOR])
246 {
247 // we are finished, don't append "next group of items"
248 // by setting item to ms.bot it becomes zero which is checked after the while loop
249 item = ms.bot;
250 }
231 { 251 }
232 char buf[80];
233 snprintf (buf, 80, "Apply this to see %d previous items", NUM_LOOK_OBJECTS);
234 252
235 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 253 // see if there are more if we cared - we ignore invisible objects
254 if (item)
255 {
256 /* What we basically do is make a 'fake' object - when the user applies it,
257 * we notice the special tag the object has, and act accordingly.
258 */
259 sl << uint32 (0x80000000 | (start_pos + FLOORBOX_PAGESIZE))
236 << uint32 (0) 260 << uint32 (0)
237 << sint32 (-1) 261 << uint32 ((uint32) - 1)
238 << uint32 (empty_face->number) 262 << uint32 (need_face_now (pl, FINGER_DOWN))
239 << data8 (buf) 263 << data8 ("Apply this to see the items below")
240 << uint16 (0) 264 << uint16 (0)
241 << uint8 (0) 265 << uint8 (0)
242 << uint32 (0); 266 << uint32 (0);
243 267
244 if (pl->contr->socket->itemcmd == 2) 268 if (pl->ns->itemcmd == 2)
245 sl << uint16 (0); 269 sl << uint16 (0);
246 }
247 270
248 for (last = NULL; tmp != last; tmp = tmp->below) 271 dirty = true;
249 { 272 }
250 object *head;
251 273
252 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 274 // now send out all items in the ring buffer in reverse order
275 while (item_cnt)
276 {
277 --item_cnt;
278 item_idx = (item_idx ? item_idx : FLOORBOX_PAGESIZE) - 1;
279 object *item = items [item_idx];
280
281 add_object_to_socklist (*pl->ns, sl, item->head_ ());
282
283 dirty = true;
284
285 // if packet got too large, send it and begin a new one
286 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
253 { 287 {
254 last = tmp->below; /* assumes double floor mode */ 288 pl->ns->send_packet (sl);
255 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR)) 289
256 last = last->below; 290 sl.reset ();
291 sl.printf ("item%d ", pl->ns->itemcmd);
292 sl << uint32 (0);
293
294 dirty = false;
257 } 295 }
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 } 296 }
305 297
306 if (got_one) 298 if (start_pos)
299 {
300 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
301 << uint32 (0)
302 << sint32 (-1)
303 << uint32 (need_face_now (pl, FINGER_UP))
304 << data8 ("Apply this to see the items higher up")
305 << uint16 (0)
306 << uint8 (0)
307 << uint32 (0);
308
309 if (pl->ns->itemcmd == 2)
310 sl << uint16 (0);
311
312 dirty = true;
313 }
314
315 if (dirty)
307 pl->contr->socket->send_packet (sl); 316 pl->ns->send_packet (sl);
308
309} 317}
310 318
311/** 319/**
312 * Sends whole inventory. 320 * Sends whole inventory.
313 */ 321 */
314void 322void
315esrv_send_inventory (object *pl, object *op) 323esrv_send_inventory (object *pl, object *op)
316{ 324{
317 object *tmp; 325 if (!pl->contr->ns)//D
326 return;
327
318 int got_one = 0; 328 int got_one = 0;
319 329
330 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
331
320 packet sl; 332 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); 333 sl.printf ("item%d ", pl->contr->ns->itemcmd);
327 334
328 sl << uint32 (op->count); 335 sl << uint32 (op->count);
329 336
330 for (tmp = op->inv; tmp; tmp = tmp->below) 337 for (object *tmp = op->inv; tmp; tmp = tmp->below)
331 { 338 {
332 object *head; 339 object *head;
333 340
334 if (tmp->head) 341 if (tmp->head)
335 head = tmp->head; 342 head = tmp->head;
336 else 343 else
337 head = tmp; 344 head = tmp;
338 345
339 if (LOOK_OBJ (head)) 346 if (head->client_visible ())
340 { 347 {
341 add_object_to_socklist (*pl->contr->socket, sl, head); 348 add_object_to_socklist (*pl->contr->ns, sl, head);
342 349
343 got_one++; 350 got_one++;
344 351
345 /* IT is possible for players to accumulate a huge amount of 352 /* IT is possible for players to accumulate a huge amount of
346 * items (especially with some of the bags out there) to 353 * items (especially with some of the bags out there) to
347 * overflow the buffer. IF so, send multiple item commands. 354 * overflow the buffer. IF so, send multiple item commands.
348 */ 355 */
349 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 356 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
350 { 357 {
351 pl->contr->socket->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
352 359
353 sl.reset (); 360 sl.reset ();
354 sl.printf ("item%d ", pl->contr->socket->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
355 sl << uint32 (op->count); 362 sl << uint32 (op->count);
356 got_one = 0; 363 got_one = 0;
357 } 364 }
358 } /* If LOOK_OBJ() */ 365 }
359 } 366 }
360 367
361 if (got_one) 368 if (got_one)
362 pl->contr->socket->send_packet (sl); 369 pl->contr->ns->send_packet (sl);
363
364} 370}
365 371
366/** 372/**
367 * Updates object *op for player *pl. 373 * Updates object *op for player *pl.
368 * 374 *
369 * flags is a list of values to update 375 * flags is a list of values to update
370 * to the client (as defined in newclient.h - might as well use the 376 * to the client (as defined in newclient.h - might as well use the
371 * same value both places. 377 * same value both places.
372 */ 378 */
373
374void 379void
375esrv_update_item (int flags, object *pl, object *op) 380esrv_update_item (int flags, object *pl, object *op)
376{ 381{
377 /* If we have a request to send the player item, skip a few checks. */ 382 /* If we have a request to send the player item, skip a few checks. */
378 if (op != pl) 383 if (op != pl && !op->client_visible ())
379 {
380 if (!LOOK_OBJ (op))
381 return; 384 return;
382 /* we remove the check for op->env, because in theory, the object 385
383 * is hopefully in the same place, so the client should preserve 386 client *ns = pl->contr->ns;
384 * order. 387 if (!ns)
385 */ 388 return;
386 }
387 389
388 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
389 {
390 /* FLAG_CLIENT_SENT is debug only. We are using it to see where 391 /* FLAG_CLIENT_SENT is debug only. We are using it to see where
391 * this is happening - we can set a breakpoint here in the debugger 392 * this is happening - we can set a breakpoint here in the debugger
392 * and track back the call. 393 * and track back the call.
393 */ 394 */
394 LOG (llevDebug, "We have not sent item %s (%d)\n", &op->name, op->count); 395 LOG (llevDebug | logBacktrace, "We have not sent item %s (%d)\n", &op->name, op->count);
395 }
396 396
397 packet sl; 397 packet sl ("upditem");
398 398
399 sl << "upditem "
400 << uint8 (flags); 399 sl << uint8 (flags);
401 400
402 if (op->head)
403 op = op->head; 401 op = op->head_ ();
404 402
405 sl << uint32 (op->count); 403 sl << uint32 (op->count);
406 404
407 if (flags & UPD_LOCATION) 405 if (flags & UPD_LOCATION)
408 sl << uint32 (op->env ? op->env->count : 0); 406 sl << uint32 (op->env ? op->env->count : 0);
… …
410 if (flags & UPD_FLAGS) 408 if (flags & UPD_FLAGS)
411 sl << uint32 (query_flags (op)); 409 sl << uint32 (query_flags (op));
412 410
413 if (flags & UPD_WEIGHT) 411 if (flags & UPD_WEIGHT)
414 { 412 {
415 sint32 weight = WEIGHT (op); 413 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
416 414
417 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
418
419 if (pl == op) 415 if (op)
420 op->contr->last_weight = weight; 416 ns->last_weight = weight;
417
418 sl << uint32 (weight);
421 } 419 }
422 420
423 if (flags & UPD_FACE) 421 if (flags & UPD_FACE)
424 { 422 {
425 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 423 ns->send_face (op->face, -50);
426 esrv_send_face (pl->contr->socket, op->face->number, 0); 424 ns->flush_fx ();
427
428 sl << uint32 (op->face->number); 425 sl << uint32 (op->face);
429 } 426 }
430 427
431 if (flags & UPD_NAME) 428 if (flags & UPD_NAME)
432 { 429 {
433 int len; 430 int len;
… …
467 { 464 {
468 if (op->anim_speed) 465 if (op->anim_speed)
469 anim_speed = op->anim_speed; 466 anim_speed = op->anim_speed;
470 else 467 else
471 { 468 {
472 if (FABS (op->speed) < 0.001) 469 if (fabs (op->speed) < 0.001)
473 anim_speed = 255; 470 anim_speed = 255;
474 else if (FABS (op->speed) >= 1.0) 471 else if (fabs (op->speed) >= 1.0)
475 anim_speed = 1; 472 anim_speed = 1;
476 else 473 else
477 anim_speed = (int) (1.0 / FABS (op->speed)); 474 anim_speed = (int) (1.0 / fabs (op->speed));
478 } 475 }
479 476
480 if (anim_speed > 255) 477 if (anim_speed > 255)
481 anim_speed = 255; 478 anim_speed = 255;
482 } 479 }
… …
485 } 482 }
486 483
487 if (flags & UPD_NROF) 484 if (flags & UPD_NROF)
488 sl << uint32 (op->nrof); 485 sl << uint32 (op->nrof);
489 486
490 pl->contr->socket->send_packet (sl); 487 pl->contr->ns->send_packet (sl);
491} 488}
492 489
493/** 490/**
494 * Sends item's info to player. 491 * Sends item's info to player.
495 */ 492 */
496void 493void
497esrv_send_item (object *pl, object *op) 494esrv_send_item (object *pl, object *op)
498{ 495{
499 /* If this is not the player object, do some more checks */ 496 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; 497 return;
505 /* if the item is on the ground, mark that the look needs to 498
506 * be updated. 499 /* We only send 'visible' objects to the client, and sometimes the player */
507 */ 500 if (!op->client_visible () && op->type != PLAYER)
508 if (!op->env)
509 {
510 pl->contr->socket->update_look = 1;
511 return; 501 return;
512 }
513 }
514 502
515 packet sl; 503 packet sl;
516 504
517 sl.printf ("item%d ", pl->contr->socket->itemcmd); 505 sl.printf ("item%d ", pl->contr->ns->itemcmd);
518 506
519 if (op->head)
520 op = op->head; 507 op = op->head_ ();
521 508
522 sl << uint32 (op->env ? op->env->count : 0); 509 sl << uint32 (op->env ? op->env->count : 0);
523 510
524 add_object_to_socklist (*pl->contr->socket, sl, op); 511 add_object_to_socklist (*pl->contr->ns, sl, op);
525 512
526 pl->contr->socket->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
527 SET_FLAG (op, FLAG_CLIENT_SENT); 514 SET_FLAG (op, FLAG_CLIENT_SENT);
528
529} 515}
530 516
531/** 517/**
532 * Tells the client to delete an item. Uses the item 518 * Tells the client to delete an item.
533 * command with a -1 location.
534 */ 519 */
535
536void 520void
537esrv_del_item (player *pl, int tag) 521esrv_del_item (player *pl, int tag)
538{ 522{
539 packet sl; 523 if (!pl->ns)
524 return;
540 525
541 sl << "delitem " 526 packet sl ("delitem");
527
542 << uint32 (tag); 528 sl << uint32 (tag);
543 529
544 pl->socket->send_packet (sl); 530 pl->ns->send_packet (sl);
545} 531}
546 532
547 533
548/******************************************************************************* 534/*******************************************************************************
549 * 535 *
… …
553 539
554/** 540/**
555 * Takes a player and object count (tag) and returns the actual object 541 * Takes a player and object count (tag) and returns the actual object
556 * pointer, or null if it can't be found. 542 * pointer, or null if it can't be found.
557 */ 543 */
558
559object * 544object *
560esrv_get_ob_from_count (object *pl, tag_t count) 545esrv_get_ob_from_count (object *pl, tag_t count)
561{ 546{
562 object *op, *tmp;
563
564 if (pl->count == count) 547 if (pl->count == count)
565 return pl; 548 return pl;
566 549
567 for (op = pl->inv; op; op = op->below) 550 for (object *op = pl->inv; op; op = op->below)
568 if (op->count == count) 551 if (op->count == count)
569 return op; 552 return op;
570 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container == op)
571 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
572 if (tmp->count == count) 555 if (tmp->count == count)
573 return tmp; 556 return tmp;
574 557
575 for (op = get_map_ob (pl->map, pl->x, pl->y); op; op = op->above) 558 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) 559 if (op->head && op->head->count == count)
577 return op; 560 return op;
578 else if (op->count == count) 561 else if (op->count == count)
579 return op; 562 return op;
580 else if (op->type == CONTAINER && pl->container == op) 563 else if (op->type == CONTAINER && pl->container == op)
581 for (tmp = op->inv; tmp; tmp = tmp->below) 564 for (object *tmp = op->inv; tmp; tmp = tmp->below)
582 if (tmp->count == count) 565 if (tmp->count == count)
583 return tmp; 566 return tmp;
584 567
568#if 0
569 /* If the high bit is set, player examined a pseudo object. */
570 if (count & 0x80000000)
571 return 0;
572#endif
573
585 return NULL; 574 return 0;
586} 575}
587
588 576
589/** Client wants to examine some object. So lets do so. */ 577/** Client wants to examine some object. So lets do so. */
590void 578void
591ExamineCmd (char *buf, int len, player *pl) 579ExamineCmd (char *buf, int len, player *pl)
592{ 580{
593 tag_t tag = atoi (buf); 581 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 582
622 /* If the high bit is set, player applied a pseudo object. */ 583 /* If the high bit is set, player applied a pseudo object. */
623 if (tag & 0x80000000) 584 if (tag & 0x80000000)
624 { 585 {
625 pl->socket->look_position = tag & 0x7fffffff; 586 pl->ns->look_position = tag & 0x7fffffff;
626 pl->socket->update_look = 1; 587 pl->ns->floorbox_update ();
627 return; 588 return;
628 } 589 }
629 590
630 object *op = esrv_get_ob_from_count (pl->ob, tag); 591 object *op = esrv_get_ob_from_count (pl->ob, tag);
631 592
632 if (!op) 593 if (!op)
633 { 594 {
595 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
596 return;
597 }
598
599 examine (pl->ob, op);
600}
601
602/** Client wants to examine some object. So lets do so. */
603void
604ExCmd (char *buf, int len, player *pl)
605{
606 tag_t tag = atoi (buf);
607
608 if (object *op = esrv_get_ob_from_count (pl->ob, tag))
609 {
610 std::string s = op->describe (pl->ob);
611
612 if (msg_is_special (s.c_str (), false))
613 cfperl_expand_cfpod (pl, s);
614
615 packet sl ("ex");
616 sl << ber32 (tag) << s.c_str ();
617
618 pl->ns->send_packet (sl);
619 }
620}
621
622/** Client wants to apply some object. Lets do so. */
623void
624ApplyCmd (char *buf, int len, player *pl)
625{
626 tag_t tag = atoi (buf);
627
628 /* If the high bit is set, player applied a pseudo object. */
629 if (tag & 0x80000000)
630 {
631 pl->ns->look_position = tag & 0x7fffffff;
632 pl->ns->floorbox_update ();
633 return;
634 }
635
636 object *op = esrv_get_ob_from_count (pl->ob, tag);
637
638 if (!op)
639 {
634 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag); 640 LOG (llevDebug, "Player '%s' tried to apply the unknown object (%d)\n", &pl->ob->name, tag);
635 return; 641 return;
636 } 642 }
637 643
638 player_apply (pl->ob, op, 0, 0); 644 player_apply (pl->ob, op, 0, 0);
639} 645}
640 646
641/** Client wants to apply some object. Lets do so. */ 647/** Client wants to lock some object. Lets do so. */
642void 648void
643LockItem (char *data, int len, player *pl) 649LockItem (char *data, int len, player *pl)
644{ 650{
645 int flag = data[0]; 651 int flag = data[0];
646 tag_t tag = net_uint32 ((uint8 *)data + 1); 652 tag_t tag = net_uint32 ((uint8 *)data + 1);
647 object *op = esrv_get_ob_from_count (pl->ob, tag); 653 object *op = esrv_get_ob_from_count (pl->ob, tag);
648 654
649 if (!op) 655 if (!op)
650 { 656 {
651 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock"); 657 pl->failmsg ("Could not find object to lock/unlock");
652 return; 658 return;
653 } 659 }
654 660
655 if (!flag) 661 if (!flag)
656 CLEAR_FLAG (op, FLAG_INV_LOCKED); 662 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
658 SET_FLAG (op, FLAG_INV_LOCKED); 664 SET_FLAG (op, FLAG_INV_LOCKED);
659 665
660 esrv_update_item (UPD_FLAGS, pl->ob, op); 666 esrv_update_item (UPD_FLAGS, pl->ob, op);
661} 667}
662 668
663/** Client wants to apply some object. Lets do so. */ 669/** Client wants to mark some object. Lets do so. */
664void 670void
665MarkItem (char *data, int len, player *pl) 671MarkItem (char *data, int len, player *pl)
666{ 672{
667 tag_t tag = net_uint32 ((uint8 *)data); 673 tag_t tag = net_uint32 ((uint8 *)data);
668 object *op = esrv_get_ob_from_count (pl->ob, tag); 674 object *op = esrv_get_ob_from_count (pl->ob, tag);
669 675
670 if (!op) 676 if (!op)
671 { 677 {
672 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 678 pl->failmsg ("Could not find object to mark");
673 return; 679 return;
674 } 680 }
675 681
676 pl->mark = op; 682 pl->mark = op;
677 new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op)); 683 pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
678} 684}
679 685
680/** 686/**
681 * look_at prints items on the specified square. 687 * look_at prints items on the specified square.
682 * 688 *
683 * [ removed EARTHWALL check and added check for containers inventory. 689 * [ removed EARTHWALL check and added check for containers inventory.
684 * Tero.Haatanen@lut.fi ] 690 * Tero.Haatanen@lut.fi ]
685 */ 691 */
686void 692static void
687look_at (object *op, int dx, int dy) 693look_at (player *pl, int dx, int dy)
688{ 694{
689 object *tmp; 695 dynbuf_text buf;
690 int flag = 0; 696 object *ob = pl->ob;
691 sint16 x, y;
692 maptile *m;
693 697
694 x = op->x + dx; 698 if (!pl->observe->map)
695 y = op->y + dy;
696
697 if (out_of_map (op->map, x, y))
698 return; 699 return;
699 700
700 m = get_map_from_coord (op->map, &x, &y); 701 mapxy pos (pl->observe);
701 if (!m) 702 pos.move (dx, dy);
703
704 if (pos.normalise ())
705 for (object *tmp = pos->top; tmp; tmp = tmp->below)
706 {
707 if (tmp->invisible && !QUERY_FLAG (ob, FLAG_WIZ))
708 continue;
709
710 if (QUERY_FLAG (ob, FLAG_WIZ))
711 buf.printf ("- %s (%d).\n", query_name (tmp), tmp->count);
712 else
713 buf.printf ("- %s.\n", query_name (tmp));
714
715 object *head = tmp->head_ ();
716
717 if (head->inv)
718 if ((head->type != CONTAINER && head->type != FLESH)
719 || QUERY_FLAG (ob, FLAG_WIZ))
720 buf << head->query_inventory (ob, " ");
721
722 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (ob, FLAG_WIZ)) /* don't continue under the floor */
723 break;
724 }
725
726 if (buf.empty ())
727 pl->failmsg ("You see nothing there.");
728 else
729 pl->infobox (MSG_CHANNEL ("lookat"), buf);
730}
731
732/** Client wants to look at some object. Lets do so. */
733void
734LookAt (char *buf, int len, player *pl)
735{
736 char *cp;
737
738 int dx = atoi (buf);
739 if (!(cp = strchr (buf, ' ')))
702 return; 740 return;
703 741
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); 742 int dy = atoi (cp);
760 743
761 if (FABS (dx) > pl->socket->mapx / 2 || FABS (dy) > pl->socket->mapy / 2) 744 if (player *opl = pl->observe->contr)
745 if (client *ns = opl->ns)
746 {
747 if (fabs (dx) > ns->mapx / 2 || fabs (dy) > ns->mapy / 2)
762 return; 748 return;
763 749
764 if (pl->blocked_los[dx + pl->socket->mapx / 2][dy + pl->socket->mapy / 2]) 750 if (opl->blocked_los[dx + ns->mapx / 2][dy + ns->mapy / 2])
765 return; 751 return;
752 }
766 753
767 look_at (pl->ob, dx, dy); 754 look_at (pl, dx, dy);
768} 755}
769 756
770/** Move an object to a new location */ 757/** Move an object to a new location */
771void 758void
772esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof) 759esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
773{ 760{
774 object *op, *env;
775
776 op = esrv_get_ob_from_count (pl, tag); 761 object *op = esrv_get_ob_from_count (pl, tag);
777 if (!op) 762 if (!op)
778 { 763 {
779 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag); 764 LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
780 return; 765 return;
781 } 766 }
… …
788 /* If it is an active container, then we should drop all objects 773 /* If it is an active container, then we should drop all objects
789 * in the container and not the container itself. 774 * in the container and not the container itself.
790 */ 775 */
791 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
792 { 777 {
793 object *current, *next; 778 int cnt = MAX_ITEM_PER_DROP;
794 779
795 for (current = op->inv; current != NULL; current = next) 780 for (object *current = op->inv; current && cnt--; )
796 { 781 {
797 next = current->below; 782 object *next = current->below;
798 drop_object (pl, current, 0); 783 drop_object (pl, current, 0);
784 current = next;
799 } 785 }
800 786
801 esrv_update_item (UPD_WEIGHT, pl, op); 787 if (cnt <= 0)
788 op->failmsg ("Only dropped some items, can't drop that many items at once.");
802 } 789 }
803 else 790 else
804 {
805 drop_object (pl, op, nrof); 791 drop_object (pl, op, nrof);
806 } 792
807 return; 793 return;
808 } 794 }
809 else if (to == pl->count) 795 else if (to == pl->count)
810 { /* pick it up to the inventory */ 796 { /* pick it up to the inventory */
811 /* return if player has already picked it up */ 797 /* return if player has already picked it up */
… …
815 pl->contr->count = nrof; 801 pl->contr->count = nrof;
816 pick_up (pl, op); 802 pick_up (pl, op);
817 return; 803 return;
818 } 804 }
819 805
820 env = esrv_get_ob_from_count (pl, to); 806 object *env = esrv_get_ob_from_count (pl, to);
821 if (!env) 807 if (!env)
822 { 808 {
823 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to); 809 LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
824 return; 810 return;
825 } 811 }
… …
827 /* put_object_in_sack presumes that necessary sanity checking 813 /* put_object_in_sack presumes that necessary sanity checking
828 * has already been done (eg, it can be picked up and fits in 814 * 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 815 * 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. 816 * an make sure env is in fact a container for that matter.
831 */ 817 */
832 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 818 if (env->type == CONTAINER
833 { 819 && can_pick (pl, op)
820 && sack_can_hold (pl, env, op, nrof))
834 put_object_in_sack (pl, env, op, nrof); 821 put_object_in_sack (pl, env, op, nrof);
835 }
836} 822}
837 823

Diff Legend

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