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

Diff Legend

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