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.20 by root, Thu Dec 14 20:39:54 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 */
38#include <newclient.h> 36#include <object.h>
39#include <newserver.h>
40#include <sproto.h> 37#include <sproto.h>
41 38
42/** 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 */
43#define MAXITEMLEN 300 40#define MAXITEMLEN 300
44 41
… …
48 * 45 *
49 ******************************************************************************/ 46 ******************************************************************************/
50 47
51/** 48/**
52 * This is a similar to query_name, but returns flags 49 * This is a similar to query_name, but returns flags
53 * to be sended to client. 50 * to be sent to client.
54 */ 51 */
55unsigned int 52unsigned int
56query_flags (object *op) 53query_flags (object *op)
57{ 54{
58 unsigned int flags = 0; 55 unsigned int flags = 0;
59 56
60 if (QUERY_FLAG (op, FLAG_APPLIED)) 57 if (QUERY_FLAG (op, FLAG_APPLIED))
61 {
62 switch (op->type) 58 switch (op->type)
63 { 59 {
64 case BOW: 60 case BOW:
65 case WAND: 61 case WAND:
66 case ROD: 62 case ROD:
67 case HORN: 63 case HORN:
68 flags = a_readied; 64 flags = a_readied;
69 break; 65 break;
70 case WEAPON: 66 case WEAPON:
71 flags = a_wielded; 67 flags = a_wielded;
72 break; 68 break;
73 case SKILL: 69 case SKILL:
74 case ARMOUR: 70 case ARMOUR:
75 case HELMET: 71 case HELMET:
76 case SHIELD: 72 case SHIELD:
77 case RING: 73 case RING:
78 case BOOTS: 74 case BOOTS:
79 case GLOVES: 75 case GLOVES:
80 case AMULET: 76 case AMULET:
81 case GIRDLE: 77 case GIRDLE:
82 case BRACERS: 78 case BRACERS:
83 case CLOAK: 79 case CLOAK:
84 flags = a_worn; 80 flags = a_worn;
85 break; 81 break;
86 case CONTAINER: 82 case CONTAINER:
87 flags = a_active; 83 flags = a_active;
88 break; 84 break;
89 default: 85 default:
90 flags = a_applied; 86 flags = a_applied;
91 break; 87 break;
92 } 88 }
93 } 89
94 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))))
95 flags |= F_OPEN; 91 flags |= F_OPEN;
96 92
97 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED)) 93 if (QUERY_FLAG (op, FLAG_KNOWN_CURSED))
98 { 94 {
99 if (QUERY_FLAG (op, FLAG_DAMNED)) 95 if (QUERY_FLAG (op, FLAG_DAMNED))
100 flags |= F_DAMNED; 96 flags |= F_DAMNED;
101 else if (QUERY_FLAG (op, FLAG_CURSED)) 97 else if (QUERY_FLAG (op, FLAG_CURSED))
102 flags |= F_CURSED; 98 flags |= F_CURSED;
103 } 99 }
100
104 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))
105 flags |= F_MAGIC; 102 flags |= F_MAGIC;
106 if (QUERY_FLAG (op, FLAG_UNPAID)) 103 if (QUERY_FLAG (op, FLAG_UNPAID))
107 flags |= F_UNPAID; 104 flags |= F_UNPAID;
108 if (QUERY_FLAG (op, FLAG_INV_LOCKED)) 105 if (QUERY_FLAG (op, FLAG_INV_LOCKED))
… …
114/* Used in the send_look to put object head into packet 111/* Used in the send_look to put object head into packet
115 * sl for socket ns. Need socket to know if we need to send 112 * sl for socket ns. Need socket to know if we need to send
116 * animation of face to the client. 113 * animation of face to the client.
117 */ 114 */
118static void 115static void
119add_object_to_socklist (client_socket &ns, packet &sl, object *head) 116add_object_to_socklist (client &ns, packet &sl, object *head)
120{ 117{
121 int flags, len, anim_speed;
122 char item_n[MAX_BUF]; 118 char item_n[MAX_BUF];
123 const char *item_p; 119 const char *item_p;
124 120
125 flags = query_flags (head); 121 int flags = query_flags (head);
126 if (QUERY_FLAG (head, FLAG_NO_PICK)) 122 if (QUERY_FLAG (head, FLAG_NO_PICK))
127 flags |= F_NOPICK; 123 flags |= F_NOPICK;
128 124
129 if (!(ns.faces_sent[head->face->number] & NS_FACESENT_FACE)) 125 ns.send_face (head->face, -50);
130 esrv_send_face (&ns, head->face->number, 0); 126 ns.flush_fx ();
131 127
132 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])
133 esrv_send_animation (&ns, head->animation_id); 129 ns.send_animation (head->animation_id);
134 130
135 sl << uint32 (head->count) 131 sl << uint32 (head->count)
136 << uint32 (flags) 132 << uint32 (flags)
137 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head)) 133 << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
138 << uint32 (head->face->number); 134 << uint32 (head->face);
135
136 int len;
139 137
140 if (!head->custom_name) 138 if (!head->custom_name)
141 { 139 {
142 strncpy (item_n, query_base_name (head, 0), 127); 140 strncpy (item_n, query_base_name (head, 0), 127);
143 item_n[127] = 0; 141 item_n[127] = 0;
… …
157 len += strlen (item_n + 1 + len) + 1; 155 len += strlen (item_n + 1 + len) + 1;
158 156
159 sl << data8 (item_n, len) 157 sl << data8 (item_n, len)
160 << uint16 (head->animation_id); 158 << uint16 (head->animation_id);
161 159
162 anim_speed = 0; 160 int anim_speed = !head->flag [FLAG_ANIMATE] ? 0
163 if (QUERY_FLAG (head, FLAG_ANIMATE)) 161 : head->anim_speed ? clamp (head->anim_speed, 1, 255)
164 { 162 : 1. / clamp (fabs (head->speed), 1./255., 1./1.);
165 if (head->anim_speed)
166 anim_speed = head->anim_speed;
167 else
168 {
169 if (FABS (head->speed) < 0.001)
170 anim_speed = 255;
171 else if (FABS (head->speed) >= 1.0)
172 anim_speed = 1;
173 else
174 anim_speed = (int) (1.0 / FABS (head->speed));
175 }
176
177 if (anim_speed > 255)
178 anim_speed = 255;
179 }
180 163
181 sl << uint8 (anim_speed) 164 sl << uint8 (anim_speed)
182 << uint32 (head->nrof); 165 << uint32 (head->nrof);
183 166
184 if (ns.itemcmd == 2) 167 if (ns.itemcmd == 2)
185 sl << uint16 (head->client_type); 168 sl << uint16 (head->client_type);
186 169
187 SET_FLAG (head, FLAG_CLIENT_SENT); 170 SET_FLAG (head, FLAG_CLIENT_SENT);
188} 171}
189 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"
190 186
191/** 187/**
192 * Send the look window. Don't need to do animations here 188 * Send the look window. Don't need to do animations here
193 * 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
194 * because object ordering would otherwise be inconsistent 190 * because object ordering would otherwise be inconsistent.
195 */ 191 */
196
197void 192void
198esrv_draw_look (object *pl) 193esrv_draw_look (player *pl)
199{ 194{
200 object *tmp, *last; 195 object *ob = pl->ob;
201 int got_one = 0, start_look = 0, end_look = 0;
202 char buf[MAX_BUF];
203 196
204 if (!pl->contr->socket->update_look) 197 if (!pl->ns->update_look)
205 { 198 {
206 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);
207 return; 200 return;
208 } 201 }
209 else 202
210 pl->contr->socket->update_look = 0; 203 pl->ns->update_look = 0;
211 204
212 if (QUERY_FLAG (pl, FLAG_REMOVED) 205 if (QUERY_FLAG (ob, FLAG_REMOVED)
213 || !pl->map 206 || !ob->map
214 || pl->map->in_memory != MAP_IN_MEMORY 207 || ob->map->in_memory != MAP_ACTIVE
215 || out_of_map (pl->map, pl->x, pl->y)) 208 || out_of_map (ob->map, ob->x, ob->y))
216 return; 209 return;
217 210
218 for (tmp = get_map_ob (pl->map, pl->x, pl->y); tmp && tmp->above; tmp = tmp->above) 211 pl->ns->send_packet ("delinv 0");
219 ;
220 212
221 packet sl; 213 packet sl;
222
223 pl->contr->socket->send_packet ("delinv 0");
224
225 sl.printf ("item%d ", pl->contr->socket->itemcmd); 214 sl.printf ("item%d ", pl->ns->itemcmd);
226 215
227 sl << uint32 (0); 216 sl << uint32 (0);
228 217
229 if (!(pl->contr->socket->faces_sent[empty_face->number] & NS_FACESENT_FACE)) 218 int start_pos = pl->ns->look_position;
230 esrv_send_face (pl->contr->socket, empty_face->number, 0); 219 bool dirty = false;
231 220
232 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 }
233 { 251 }
234 sl << uint32 (0x80000000 | (pl->contr->socket->look_position - NUM_LOOK_OBJECTS)) 252
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))
260 << uint32 (0)
261 << uint32 ((uint32) - 1)
262 << uint32 (need_face_now (pl, FINGER_DOWN))
263 << data8 ("Apply this to see the items below")
264 << uint16 (0)
265 << uint8 (0)
266 << uint32 (0);
267
268 if (pl->ns->itemcmd == 2)
269 sl << uint16 (0);
270
271 dirty = true;
272 }
273
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)
287 {
288 pl->ns->send_packet (sl);
289
290 sl.reset ();
291 sl.printf ("item%d ", pl->ns->itemcmd);
292 sl << uint32 (0);
293
294 dirty = false;
295 }
296 }
297
298 if (start_pos)
299 {
300 sl << uint32 (0x80000000 | (start_pos - FLOORBOX_PAGESIZE))
235 << uint32 (0) 301 << uint32 (0)
236 << sint32 (-1) 302 << sint32 (-1)
237 << uint32 (empty_face->number); 303 << uint32 (need_face_now (pl, FINGER_UP))
238 304 << data8 ("Apply this to see the items higher up")
239 sl.printf ("Click here to see %d previous items", NUM_LOOK_OBJECTS);
240
241 sl << uint16 (0) 305 << uint16 (0)
242 << uint8 (0) 306 << uint8 (0)
243 << uint32 (0); 307 << uint32 (0);
244 308
245 if (pl->contr->socket->itemcmd == 2) 309 if (pl->ns->itemcmd == 2)
246 sl << uint16 (0); 310 sl << uint16 (0);
247 }
248 311
249 for (last = NULL; tmp != last; tmp = tmp->below) 312 dirty = true;
250 { 313 }
251 object *head;
252 314
253 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !last) 315 if (dirty)
254 {
255 last = tmp->below; /* assumes double floor mode */
256 if (last && QUERY_FLAG (last, FLAG_IS_FLOOR))
257 last = last->below;
258 }
259
260 if (LOOK_OBJ (tmp))
261 {
262 if (++start_look < pl->contr->socket->look_position)
263 continue;
264
265 end_look++;
266
267 if (end_look > NUM_LOOK_OBJECTS)
268 {
269 /* What we basically do is make a 'fake' object - when the user applies it,
270 * we notice the special tag the object has, and act accordingly.
271 */
272 sl << uint32 (0x80000000 | (pl->contr->socket->look_position + NUM_LOOK_OBJECTS))
273 << uint32 (0)
274 << uint32 ((uint32) - 1)
275 << uint32 (empty_face->number);
276
277 sl.printf ("Click here to see next group of items");
278
279 sl << uint16 (0)
280 << uint8 (0)
281 << uint32 (0);
282
283 if (pl->contr->socket->itemcmd == 2)
284 sl << uint16 (0);
285
286 break;
287 }
288
289 if (tmp->head)
290 head = tmp->head;
291 else
292 head = tmp;
293
294 add_object_to_socklist (*pl->contr->socket, sl, head);
295 got_one++;
296
297 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN))
298 {
299 pl->contr->socket->send_packet (sl);
300
301 sl.reset ();
302 sl.printf ("item%d ", pl->contr->socket->itemcmd);
303 sl << uint32 (0);
304 got_one = 0;
305 }
306 } /* If LOOK_OBJ() */
307 }
308
309 if (got_one)
310 pl->contr->socket->send_packet (sl); 316 pl->ns->send_packet (sl);
311
312} 317}
313 318
314/** 319/**
315 * Sends whole inventory. 320 * Sends whole inventory.
316 */ 321 */
317void 322void
318esrv_send_inventory (object *pl, object *op) 323esrv_send_inventory (object *pl, object *op)
319{ 324{
320 object *tmp; 325 if (!pl->contr->ns)//D
326 return;
327
321 int got_one = 0; 328 int got_one = 0;
322 329
330 pl->contr->ns->send_packet_printf ("delinv %d", op->count);
331
323 packet sl; 332 packet sl;
324
325 sl.printf ("delinv %d", op->count);
326 pl->contr->socket->send_packet (sl);
327
328 sl.reset ();
329 sl.printf ("item%d ", pl->contr->socket->itemcmd); 333 sl.printf ("item%d ", pl->contr->ns->itemcmd);
330 334
331 sl << uint32 (op->count); 335 sl << uint32 (op->count);
332 336
333 for (tmp = op->inv; tmp; tmp = tmp->below) 337 for (object *tmp = op->inv; tmp; tmp = tmp->below)
334 { 338 {
335 object *head; 339 object *head;
336 340
337 if (tmp->head) 341 if (tmp->head)
338 head = tmp->head; 342 head = tmp->head;
339 else 343 else
340 head = tmp; 344 head = tmp;
341 345
342 if (LOOK_OBJ (head)) 346 if (head->client_visible ())
343 { 347 {
344 add_object_to_socklist (*pl->contr->socket, sl, head); 348 add_object_to_socklist (*pl->contr->ns, sl, head);
345 349
346 got_one++; 350 got_one++;
347 351
348 /* IT is possible for players to accumulate a huge amount of 352 /* IT is possible for players to accumulate a huge amount of
349 * items (especially with some of the bags out there) to 353 * items (especially with some of the bags out there) to
350 * overflow the buffer. IF so, send multiple item commands. 354 * overflow the buffer. IF so, send multiple item commands.
351 */ 355 */
352 if (sl.length () >= (MAXSOCKBUF - MAXITEMLEN)) 356 if (sl.length () > MAXSOCKBUF - MAXITEMLEN)
353 { 357 {
354 pl->contr->socket->send_packet (sl); 358 pl->contr->ns->send_packet (sl);
355 359
356 sl.reset (); 360 sl.reset ();
357 sl.printf ("item%d ", pl->contr->socket->itemcmd); 361 sl.printf ("item%d ", pl->contr->ns->itemcmd);
358 sl << uint32 (op->count); 362 sl << uint32 (op->count);
359 got_one = 0; 363 got_one = 0;
360 } 364 }
361 } /* If LOOK_OBJ() */ 365 }
362 } 366 }
363 367
364 if (got_one) 368 if (got_one)
365 pl->contr->socket->send_packet (sl); 369 pl->contr->ns->send_packet (sl);
366
367} 370}
368 371
369/** 372/**
370 * Updates object *op for player *pl. 373 * Updates object *op for player *pl.
371 * 374 *
372 * flags is a list of values to update 375 * flags is a list of values to update
373 * 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
374 * same value both places. 377 * same value both places.
375 */ 378 */
376
377void 379void
378esrv_update_item (int flags, object *pl, object *op) 380esrv_update_item (int flags, object *pl, object *op)
379{ 381{
380 /* 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. */
381 if (op != pl) 383 if (op != pl && !op->client_visible ())
382 {
383 if (!LOOK_OBJ (op))
384 return; 384 return;
385 /* we remove the check for op->env, because in theory, the object 385
386 * is hopefully in the same place, so the client should preserve 386 client *ns = pl->contr->ns;
387 * order. 387 if (!ns)
388 */ 388 return;
389 }
390 389
391 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT)) 390 if (!QUERY_FLAG (op, FLAG_CLIENT_SENT))
392 {
393 /* 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
394 * 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
395 * and track back the call. 393 * and track back the call.
396 */ 394 */
397 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);
398 }
399 396
400 packet sl; 397 packet sl ("upditem");
401 398
402 sl << "upditem "
403 << uint8 (flags); 399 sl << uint8 (flags);
404 400
405 if (op->head)
406 op = op->head; 401 op = op->head_ ();
407 402
408 sl << uint32 (op->count); 403 sl << uint32 (op->count);
409 404
410 if (flags & UPD_LOCATION) 405 if (flags & UPD_LOCATION)
411 sl << uint32 (op->env ? op->env->count : 0); 406 sl << uint32 (op->env ? op->env->count : 0);
… …
413 if (flags & UPD_FLAGS) 408 if (flags & UPD_FLAGS)
414 sl << uint32 (query_flags (op)); 409 sl << uint32 (query_flags (op));
415 410
416 if (flags & UPD_WEIGHT) 411 if (flags & UPD_WEIGHT)
417 { 412 {
418 sint32 weight = WEIGHT (op); 413 sint32 weight = op->flag [FLAG_NO_PICK] ? -1 : op->client_weight ();
419 414
420 sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
421
422 if (pl == op) 415 if (op)
423 op->contr->last_weight = weight; 416 ns->last_weight = weight;
417
418 sl << uint32 (weight);
424 } 419 }
425 420
426 if (flags & UPD_FACE) 421 if (flags & UPD_FACE)
427 { 422 {
428 if (!(pl->contr->socket->faces_sent[op->face->number] & NS_FACESENT_FACE)) 423 ns->send_face (op->face, -50);
429 esrv_send_face (pl->contr->socket, op->face->number, 0); 424 ns->flush_fx ();
430
431 sl << uint32 (op->face->number); 425 sl << uint32 (op->face);
432 } 426 }
433 427
434 if (flags & UPD_NAME) 428 if (flags & UPD_NAME)
435 { 429 {
436 int len; 430 int len;
… …
470 { 464 {
471 if (op->anim_speed) 465 if (op->anim_speed)
472 anim_speed = op->anim_speed; 466 anim_speed = op->anim_speed;
473 else 467 else
474 { 468 {
475 if (FABS (op->speed) < 0.001) 469 if (fabs (op->speed) < 0.001)
476 anim_speed = 255; 470 anim_speed = 255;
477 else if (FABS (op->speed) >= 1.0) 471 else if (fabs (op->speed) >= 1.0)
478 anim_speed = 1; 472 anim_speed = 1;
479 else 473 else
480 anim_speed = (int) (1.0 / FABS (op->speed)); 474 anim_speed = (int) (1.0 / fabs (op->speed));
481 } 475 }
482 476
483 if (anim_speed > 255) 477 if (anim_speed > 255)
484 anim_speed = 255; 478 anim_speed = 255;
485 } 479 }
… …
488 } 482 }
489 483
490 if (flags & UPD_NROF) 484 if (flags & UPD_NROF)
491 sl << uint32 (op->nrof); 485 sl << uint32 (op->nrof);
492 486
493 pl->contr->socket->send_packet (sl); 487 pl->contr->ns->send_packet (sl);
494} 488}
495 489
496/** 490/**
497 * Sends item's info to player. 491 * Sends item's info to player.
498 */ 492 */
499void 493void
500esrv_send_item (object *pl, object *op) 494esrv_send_item (object *pl, object *op)
501{ 495{
502 /* If this is not the player object, do some more checks */ 496 if (!pl->contr->ns)
503 if (op != pl)
504 {
505 /* We only send 'visibile' objects to the client */
506 if (!LOOK_OBJ (op))
507 return; 497 return;
508 /* if the item is on the ground, mark that the look needs to 498
509 * be updated. 499 /* We only send 'visible' objects to the client, and sometimes the player */
510 */ 500 if (!op->client_visible () && op->type != PLAYER)
511 if (!op->env)
512 {
513 pl->contr->socket->update_look = 1;
514 return; 501 return;
515 }
516 }
517 502
518 packet sl; 503 packet sl;
519 504
520 sl.printf ("item%d ", pl->contr->socket->itemcmd); 505 sl.printf ("item%d ", pl->contr->ns->itemcmd);
521 506
522 if (op->head)
523 op = op->head; 507 op = op->head_ ();
524 508
525 sl << uint32 (op->env ? op->env->count : 0); 509 sl << uint32 (op->env ? op->env->count : 0);
526 510
527 add_object_to_socklist (*pl->contr->socket, sl, op); 511 add_object_to_socklist (*pl->contr->ns, sl, op);
528 512
529 pl->contr->socket->send_packet (sl); 513 pl->contr->ns->send_packet (sl);
530 SET_FLAG (op, FLAG_CLIENT_SENT); 514 SET_FLAG (op, FLAG_CLIENT_SENT);
531
532} 515}
533 516
534/** 517/**
535 * Tells the client to delete an item. Uses the item 518 * Tells the client to delete an item.
536 * command with a -1 location.
537 */ 519 */
538
539void 520void
540esrv_del_item (player *pl, int tag) 521esrv_del_item (player *pl, int tag)
541{ 522{
542 packet sl; 523 if (!pl->ns)
524 return;
543 525
544 sl << "delitem " 526 packet sl ("delitem");
527
545 << uint32 (tag); 528 sl << uint32 (tag);
546 529
547 pl->socket->send_packet (sl); 530 pl->ns->send_packet (sl);
548} 531}
549 532
550 533
551/******************************************************************************* 534/*******************************************************************************
552 * 535 *
… …
556 539
557/** 540/**
558 * 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
559 * pointer, or null if it can't be found. 542 * pointer, or null if it can't be found.
560 */ 543 */
561
562object * 544object *
563esrv_get_ob_from_count (object *pl, tag_t count) 545esrv_get_ob_from_count (object *pl, tag_t count)
564{ 546{
565 object *op, *tmp;
566
567 if (pl->count == count) 547 if (pl->count == count)
568 return pl; 548 return pl;
569 549
570 for (op = pl->inv; op; op = op->below) 550 for (object *op = pl->inv; op; op = op->below)
571 if (op->count == count) 551 if (op->count == count)
572 return op; 552 return op;
573 else if (op->type == CONTAINER && pl->container == op) 553 else if (op->type == CONTAINER && pl->container == op)
574 for (tmp = op->inv; tmp; tmp = tmp->below) 554 for (object *tmp = op->inv; tmp; tmp = tmp->below)
575 if (tmp->count == count) 555 if (tmp->count == count)
576 return tmp; 556 return tmp;
577 557
578 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)
579 if (op->head != NULL && op->head->count == count) 559 if (op->head && op->head->count == count)
580 return op; 560 return op;
581 else if (op->count == count) 561 else if (op->count == count)
582 return op; 562 return op;
583 else if (op->type == CONTAINER && pl->container == op) 563 else if (op->type == CONTAINER && pl->container == op)
584 for (tmp = op->inv; tmp; tmp = tmp->below) 564 for (object *tmp = op->inv; tmp; tmp = tmp->below)
585 if (tmp->count == count) 565 if (tmp->count == count)
586 return tmp; 566 return tmp;
587 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
588 return NULL; 574 return 0;
589} 575}
590
591 576
592/** Client wants to examine some object. So lets do so. */ 577/** Client wants to examine some object. So lets do so. */
593void 578void
594ExamineCmd (char *buf, int len, player *pl) 579ExamineCmd (char *buf, int len, player *pl)
595{ 580{
596 tag_t tag = atoi (buf); 581 tag_t tag = atoi (buf);
597
598 /* If the high bit is set, player examined a pseudo object. */
599 if (tag & 0x80000000)
600 return;
601
602 object *op = esrv_get_ob_from_count (pl->ob, tag);
603
604 if (!op)
605 {
606 LOG (llevDebug, "Player '%s' tried to examine the unknown object (%ld)\n", &pl->ob->name, tag);
607 return;
608 }
609
610 examine (pl->ob, op);
611}
612
613/** Client wants to apply some object. Lets do so. */
614void
615ApplyCmd (char *buf, int len, player *pl)
616{
617 tag_t tag = atoi (buf);
618
619 /* sort of a hack, but if the player saves and the player then manually
620 * applies a savebed (or otherwise tries to do stuff), we run into trouble.
621 */
622 if (QUERY_FLAG (pl->ob, FLAG_REMOVED))
623 return;
624 582
625 /* If the high bit is set, player applied a pseudo object. */ 583 /* If the high bit is set, player applied a pseudo object. */
626 if (tag & 0x80000000) 584 if (tag & 0x80000000)
627 { 585 {
628 pl->socket->look_position = tag & 0x7fffffff; 586 pl->ns->look_position = tag & 0x7fffffff;
629 pl->socket->update_look = 1; 587 pl->ns->floorbox_update ();
630 return; 588 return;
631 } 589 }
632 590
633 object *op = esrv_get_ob_from_count (pl->ob, tag); 591 object *op = esrv_get_ob_from_count (pl->ob, tag);
634 592
635 if (!op) 593 if (!op)
636 { 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 {
637 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);
638 return; 641 return;
639 } 642 }
640 643
641 player_apply (pl->ob, op, 0, 0); 644 player_apply (pl->ob, op, 0, 0);
642} 645}
643 646
644/** Client wants to apply some object. Lets do so. */ 647/** Client wants to lock some object. Lets do so. */
645void 648void
646LockItem (uint8 *data, int len, player *pl) 649LockItem (char *data, int len, player *pl)
647{ 650{
648 int flag = data[0]; 651 int flag = data[0];
649 tag_t tag = net_uint32 (data + 1); 652 tag_t tag = net_uint32 ((uint8 *)data + 1);
650 object *op = esrv_get_ob_from_count (pl->ob, tag); 653 object *op = esrv_get_ob_from_count (pl->ob, tag);
651 654
652 if (!op) 655 if (!op)
653 { 656 {
654 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");
655 return; 658 return;
656 } 659 }
657 660
658 if (!flag) 661 if (!flag)
659 CLEAR_FLAG (op, FLAG_INV_LOCKED); 662 CLEAR_FLAG (op, FLAG_INV_LOCKED);
… …
661 SET_FLAG (op, FLAG_INV_LOCKED); 664 SET_FLAG (op, FLAG_INV_LOCKED);
662 665
663 esrv_update_item (UPD_FLAGS, pl->ob, op); 666 esrv_update_item (UPD_FLAGS, pl->ob, op);
664} 667}
665 668
666/** Client wants to apply some object. Lets do so. */ 669/** Client wants to mark some object. Lets do so. */
667void 670void
668MarkItem (uint8 * data, int len, player *pl) 671MarkItem (char *data, int len, player *pl)
669{ 672{
670 tag_t tag = net_uint32 (data); 673 tag_t tag = net_uint32 ((uint8 *)data);
671 object *op = esrv_get_ob_from_count (pl->ob, tag); 674 object *op = esrv_get_ob_from_count (pl->ob, tag);
672 675
673 if (!op) 676 if (!op)
674 { 677 {
675 new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark"); 678 pl->failmsg ("Could not find object to mark");
676 return; 679 return;
677 } 680 }
678 681
679 pl->mark = op; 682 pl->mark = op;
680 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)));
681} 684}
682 685
683/** 686/**
684 * look_at prints items on the specified square. 687 * look_at prints items on the specified square.
685 * 688 *
686 * [ removed EARTHWALL check and added check for containers inventory. 689 * [ removed EARTHWALL check and added check for containers inventory.
687 * Tero.Haatanen@lut.fi ] 690 * Tero.Haatanen@lut.fi ]
688 */ 691 */
689void 692static void
690look_at (object *op, int dx, int dy) 693look_at (player *pl, int dx, int dy)
691{ 694{
692 object *tmp; 695 dynbuf_text buf;
693 int flag = 0; 696 object *ob = pl->ob;
694 sint16 x, y;
695 maptile *m;
696 697
697 x = op->x + dx; 698 if (!pl->observe->map)
698 y = op->y + dy;
699
700 if (out_of_map (op->map, x, y))
701 return; 699 return;
702 700
703 m = get_map_from_coord (op->map, &x, &y); 701 mapxy pos (pl->observe);
704 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, ' ')))
705 return; 740 return;
706 741
707 for (tmp = get_map_ob (m, x, y); tmp != NULL && tmp->above != NULL; tmp = tmp->above);
708
709 for (; tmp != NULL; tmp = tmp->below)
710 {
711 if (tmp->invisible && !QUERY_FLAG (op, FLAG_WIZ))
712 continue;
713
714 if (!flag)
715 {
716 if (dx || dy)
717 new_draw_info (NDI_UNIQUE, 0, op, "There you see:");
718 else
719 {
720 clear_win_info (op);
721 new_draw_info (NDI_UNIQUE, 0, op, "You see:");
722 }
723 flag = 1;
724 }
725
726 if (QUERY_FLAG (op, FLAG_WIZ))
727 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s (%d).", query_name (tmp), tmp->count);
728 else
729 new_draw_info_format (NDI_UNIQUE, 0, op, "- %s.", query_name (tmp));
730
731 if (((tmp->inv != NULL || (tmp->head && tmp->head->inv)) &&
732 (tmp->type != CONTAINER && tmp->type != FLESH)) || QUERY_FLAG (op, FLAG_WIZ))
733 inventory (op, tmp->head == NULL ? tmp : tmp->head);
734
735 if (QUERY_FLAG (tmp, FLAG_IS_FLOOR) && !QUERY_FLAG (op, FLAG_WIZ)) /* don't continue under the floor */
736 break;
737 }
738
739 if (!flag)
740 {
741 if (dx || dy)
742 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing there.");
743 else
744 new_draw_info (NDI_UNIQUE, 0, op, "You see nothing.");
745 }
746}
747
748
749
750/** Client wants to look at some object. Lets do so. */
751void
752LookAt (char *buf, int len, player *pl)
753{
754 int dx, dy;
755 char *cp;
756
757 dx = atoi (buf);
758 if (!(cp = strchr (buf, ' ')))
759 {
760 return;
761 }
762 dy = atoi (cp); 742 int dy = atoi (cp);
763 743
764 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)
765 return; 748 return;
766 749
767 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])
768 return; 751 return;
752 }
769 753
770 look_at (pl->ob, dx, dy); 754 look_at (pl, dx, dy);
771} 755}
772 756
773/** Move an object to a new location */ 757/** Move an object to a new location */
774void 758void
775esrv_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)
776{ 760{
777 object *op, *env;
778
779 op = esrv_get_ob_from_count (pl, tag); 761 object *op = esrv_get_ob_from_count (pl, tag);
780 if (!op) 762 if (!op)
781 { 763 {
782 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);
783 return; 765 return;
784 } 766 }
… …
791 /* 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
792 * in the container and not the container itself. 774 * in the container and not the container itself.
793 */ 775 */
794 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED)) 776 if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
795 { 777 {
796 object *current, *next; 778 int cnt = MAX_ITEM_PER_DROP;
797 779
798 for (current = op->inv; current != NULL; current = next) 780 for (object *current = op->inv; current && cnt--; )
799 { 781 {
800 next = current->below; 782 object *next = current->below;
801 drop_object (pl, current, 0); 783 drop_object (pl, current, 0);
784 current = next;
802 } 785 }
803 786
804 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.");
805 } 789 }
806 else 790 else
807 {
808 drop_object (pl, op, nrof); 791 drop_object (pl, op, nrof);
809 } 792
810 return; 793 return;
811 } 794 }
812 else if (to == pl->count) 795 else if (to == pl->count)
813 { /* pick it up to the inventory */ 796 { /* pick it up to the inventory */
814 /* return if player has already picked it up */ 797 /* return if player has already picked it up */
… …
818 pl->contr->count = nrof; 801 pl->contr->count = nrof;
819 pick_up (pl, op); 802 pick_up (pl, op);
820 return; 803 return;
821 } 804 }
822 805
823 env = esrv_get_ob_from_count (pl, to); 806 object *env = esrv_get_ob_from_count (pl, to);
824 if (!env) 807 if (!env)
825 { 808 {
826 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);
827 return; 810 return;
828 } 811 }
… …
830 /* put_object_in_sack presumes that necessary sanity checking 813 /* put_object_in_sack presumes that necessary sanity checking
831 * 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
832 * 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
833 * 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.
834 */ 817 */
835 if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof)) 818 if (env->type == CONTAINER
836 { 819 && can_pick (pl, op)
820 && sack_can_hold (pl, env, op, nrof))
837 put_object_in_sack (pl, env, op, nrof); 821 put_object_in_sack (pl, env, op, nrof);
838 }
839} 822}
840 823

Diff Legend

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